diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-18 11:35:37 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-18 11:35:37 +0000 |
commit | 0aa16ca4153e9e498876ba91c1897d5d52f8e241 (patch) | |
tree | fbc22957faa56cd57377ca0ce7e6deb6bed354f7 /www | |
parent | 5b77dbd76b5300830d2e59fb5a40dd74e20e153d (diff) | |
download | pkgsrc-0aa16ca4153e9e498876ba91c1897d5d52f8e241.tar.gz |
Fix pthread detection and build on DragonFly.
Diffstat (limited to 'www')
-rw-r--r-- | www/varnish/distinfo | 6 | ||||
-rw-r--r-- | www/varnish/patches/patch-aa | 16 | ||||
-rw-r--r-- | www/varnish/patches/patch-ac | 22 | ||||
-rw-r--r-- | www/varnish/patches/patch-ad | 12 |
4 files changed, 50 insertions, 6 deletions
diff --git a/www/varnish/distinfo b/www/varnish/distinfo index 5656df0eb0c..4b78ac0c2eb 100644 --- a/www/varnish/distinfo +++ b/www/varnish/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2006/12/18 11:35:37 joerg Exp $ SHA1 (varnish-1.0.2.tar.gz) = 88fa343be907088ac29be6fc9d899b352c91bf83 RMD160 (varnish-1.0.2.tar.gz) = 28aac4f266369c2a3ffb4233b1cd3fd0b3f6ade2 Size (varnish-1.0.2.tar.gz) = 539059 bytes -SHA1 (patch-aa) = 629a4b677355be2b2f47373d97bf9accfb44aa0b +SHA1 (patch-aa) = f49672e842cf01c58e2154a56271ce896a639161 SHA1 (patch-ab) = ef32cee26f2542a44f2ab117154b58bc69931237 +SHA1 (patch-ac) = f537e46216a67fdf68afe8f9451bdf2aaff89958 +SHA1 (patch-ad) = 5523cd5cbcc29f4f6c85014870356c44c462b8ef diff --git a/www/varnish/patches/patch-aa b/www/varnish/patches/patch-aa index 3e507f0c22b..1c99f90d22a 100644 --- a/www/varnish/patches/patch-aa +++ b/www/varnish/patches/patch-aa @@ -1,8 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/12/18 11:35:37 joerg Exp $ ---- configure.ac.orig 2006-11-07 13:38:11.000000000 +0100 -+++ configure.ac 2006-12-04 16:54:54.000000000 +0100 -@@ -45,6 +45,7 @@ +--- configure.ac.orig 2006-11-07 12:38:11.000000000 +0000 ++++ configure.ac +@@ -38,13 +38,14 @@ AC_PROG_MAKE_SET + AC_CHECK_LIB(rt, clock_gettime) + AC_CHECK_LIB(dl, dlopen) + #AC_SEARCH_LIBS(initscr, [curses ncurses]) +-AC_SEARCH_LIBS(pthread_create, [thr pthread c_r]) ++LIBS="${LIBS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + + # Checks for header files. + AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_CHECK_HEADERS([sys/socket.h]) diff --git a/www/varnish/patches/patch-ac b/www/varnish/patches/patch-ac new file mode 100644 index 00000000000..65485f10218 --- /dev/null +++ b/www/varnish/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2006/12/18 11:35:37 joerg Exp $ + +--- bin/varnishd/cache_pool.c.orig 2006-12-18 11:21:45.000000000 +0000 ++++ bin/varnishd/cache_pool.c +@@ -35,7 +35,7 @@ + #include <sys/uio.h> + + #ifdef HAVE_SENDFILE +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include <sys/socket.h> + #elif defined(__linux__) + #include <sys/sendfile.h> +@@ -148,7 +148,7 @@ WRK_Sendfile(struct worker *w, int fd, o + assert(fd >= 0); + assert(len > 0); + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + do { + struct sf_hdtr sfh; + memset(&sfh, 0, sizeof sfh); diff --git a/www/varnish/patches/patch-ad b/www/varnish/patches/patch-ad new file mode 100644 index 00000000000..34340dfd7ec --- /dev/null +++ b/www/varnish/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2006/12/18 11:35:37 joerg Exp $ + +--- bin/varnishhist/varnishhist.c.orig 2006-12-18 11:25:50.000000000 +0000 ++++ bin/varnishhist/varnishhist.c +@@ -31,6 +31,7 @@ + * Log tailer for Varnish + */ + ++#include <sys/types.h> + #include <curses.h> + #include <errno.h> + #include <math.h> |