summaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-02-06 22:06:32 +0000
committerjoerg <joerg@pkgsrc.org>2007-02-06 22:06:32 +0000
commit0d25576d5d7c4923a3fa9ead7728c3be336b5fb3 (patch)
tree89237815afc6bfac96ac32a8d982e74c4754d015 /www/squid
parent41c21dc03313af8d82c84ebe67ca2974bff3f331 (diff)
downloadpkgsrc-0d25576d5d7c4923a3fa9ead7728c3be336b5fb3.tar.gz
don't complain if the location of the DragonFly header exists.
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/distinfo4
-rw-r--r--www/squid/patches/patch-ag21
2 files changed, 17 insertions, 8 deletions
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 3efd06625bd..46e3051815c 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.127 2007/02/06 20:22:14 joerg Exp $
+$NetBSD: distinfo,v 1.128 2007/02/06 22:06:32 joerg Exp $
SHA1 (squid-2.6.STABLE9.tar.bz2) = d3ada8a02b2a9fe5bf50c4caa33e2f051262fa7d
RMD160 (squid-2.6.STABLE9.tar.bz2) = 3e591107daf6d6f0dd32a2909c598b41f2e5e89f
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
SHA1 (patch-ad) = 8dc230430b9030951232c6881100234caffdd0d9
SHA1 (patch-ae) = 5af05ae0ec09b7a6f3af61201f60357909b9e6c8
SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
-SHA1 (patch-ag) = 8e140c39f53764299fd8b753a4cc4c89424321b2
+SHA1 (patch-ag) = 158cf7aa07b54cf022d6f000426213009b73f863
SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index cf5778e32f7..0d15e3f095e 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
+$NetBSD: patch-ag,v 1.26 2007/02/06 22:06:32 joerg Exp $
---- configure.orig 2006-11-03 22:20:14.000000000 +0900
+--- configure.orig 2007-01-24 02:07:43.000000000 +0000
+++ configure
-@@ -7321,6 +7321,7 @@ for ac_header in sys/types.h \
+@@ -7323,6 +7323,7 @@ for ac_header in sys/types.h \
linux/netfilter_ipv4.h \
linux/netfilter_ipv4/ip_tproxy.h \
malloc.h \
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
math.h \
memory.h \
mount.h \
-@@ -13789,9 +13790,9 @@ _ACEOF
+@@ -13791,9 +13792,9 @@ _ACEOF
fi
@@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -13820,26 +13821,63 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13822,26 +13823,63 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/bitypes.h>
#endif
@@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
echo "$as_me:$LINENO: checking size of off_t" >&5
echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-@@ -15807,8 +15845,8 @@ if test "$GCC" = "yes"; then
+@@ -15809,8 +15847,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
2.95.[123])
@@ -111,3 +111,12 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
;;
esac
fi
+@@ -16743,7 +16781,7 @@ if test "$PF_TRANSPARENT" ; then
+ echo "$as_me:$LINENO: checking if PF header file is installed" >&5
+ echo $ECHO_N "checking if PF header file is installed... $ECHO_C" >&6
+ # hold on to your hats...
+- if test "$ac_cv_header_net_pfvar_h" = "yes"; then
++ if test "$ac_cv_header_net_pfvar_h" = "yes" || test -f /usr/include/net/pf/pfvar.h; then
+ PF_TRANSPARENT="yes"
+
+ cat >>confdefs.h <<\_ACEOF