diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/ports/www/varnish/Portfile varnish/Portfile
old
|
new
|
|
3 | 3 | PortSystem 1.0 |
4 | 4 | |
5 | 5 | name varnish |
6 | | version 1.1.2 |
| 6 | version 2.0.1 |
7 | 7 | categories www |
8 | 8 | platforms darwin |
9 | 9 | maintainers pmq |
… |
… |
|
15 | 15 | homepage http://www.varnish-cache.org |
16 | 16 | master_sites sourceforge |
17 | 17 | |
18 | | checksums sha1 286da24d1048f6bea318cc2e061baa8c6d72392f \ |
19 | | rmd160 89bc574095d1c9e33a82e2626d5eb8b90a2caea5 |
| 18 | checksums sha1 3aa91adedd2b6519ae15e090cdc2452b4e93fc3d |
20 | 19 | |
21 | 20 | platform darwin 9 { |
22 | 21 | patchfiles patch-sendfile.diff |
diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/ports/www/varnish/files/patch-sendfile.diff varnish/files/patch-sendfile.diff
old
|
new
|
|
1 | | Index: bin/varnishd/cache_pool.c |
2 | | =================================================================== |
3 | | --- bin/varnishd/cache_pool.c (revision 2262) |
4 | | +++ bin/varnishd/cache_pool.c (working copy) |
5 | | @@ -35,7 +35,7 @@ |
6 | | #include <sys/uio.h> |
7 | | |
8 | | #ifdef HAVE_SENDFILE |
9 | | -#if defined(__FreeBSD__) |
10 | | +#if defined(__FreeBSD__) || defined(__APPLE__) |
11 | | #include <sys/socket.h> |
12 | | #elif defined(__linux__) |
13 | | #include <sys/sendfile.h> |
14 | | @@ -151,7 +151,7 @@ |
| 1 | --- bin/varnishd/cache_pool.c 2008-10-17 20:59:49.000000000 +0200 |
| 2 | +++ bin/varnishd/cache_pool.c 2008-11-03 11:27:17.000000000 +0100 |
| 3 | @@ -174,7 +174,7 @@ |
15 | 4 | assert(fd >= 0); |
16 | 5 | assert(len > 0); |
17 | 6 | |
… |
… |
|
20 | 9 | do { |
21 | 10 | struct sf_hdtr sfh; |
22 | 11 | memset(&sfh, 0, sizeof sfh); |
23 | | @@ -159,7 +159,7 @@ |
| 12 | @@ -182,7 +182,7 @@ |
24 | 13 | sfh.headers = w->iov; |
25 | 14 | sfh.hdr_cnt = w->niov; |
26 | 15 | } |