summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoradam <adam>2015-01-17 10:20:57 +0000
committeradam <adam>2015-01-17 10:20:57 +0000
commit1b266f3e0bdeaa36564aa76fa5ed69fb8ff932dd (patch)
treefef1a7a8b921c5684e57844ffd8692b7aae1e5d4 /www
parentf594581256e7bfb2220d8b5be9ff1c1ab2b001ec (diff)
downloadpkgsrc-1b266f3e0bdeaa36564aa76fa5ed69fb8ff932dd.tar.gz
Fix buidling when IPF is turned on
Diffstat (limited to 'www')
-rw-r--r--www/squid3/distinfo3
-rw-r--r--www/squid3/patches/patch-compat_compat.h15
2 files changed, 17 insertions, 1 deletions
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 0f55818a9d3..2ff36845c98 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.27 2015/01/16 11:41:11 adam Exp $
+$NetBSD: distinfo,v 1.28 2015/01/17 10:20:57 adam Exp $
SHA1 (squid-3.4.11.tar.xz) = 7de0949714cda4d3f19073aa846f00768a6f841b
RMD160 (squid-3.4.11.tar.xz) = f8d643d4cecdee382d90152afd50cf0db121328c
Size (squid-3.4.11.tar.xz) = 2162148 bytes
+SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
diff --git a/www/squid3/patches/patch-compat_compat.h b/www/squid3/patches/patch-compat_compat.h
new file mode 100644
index 00000000000..c529485f1a9
--- /dev/null
+++ b/www/squid3/patches/patch-compat_compat.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-compat_compat.h,v 1.1 2015/01/17 10:20:58 adam Exp $
+
+Fix building.
+
+--- compat/compat.h.orig 2015-01-17 10:10:23.000000000 +0000
++++ compat/compat.h
+@@ -38,7 +38,7 @@
+ * We must pre-define before doing anything with OS headers so the OS
+ * do not. Then un-define it before using the IPFilter *_compat.h headers.
+ */
+-#if IPF_TRANSPARENT && USE_SOLARIS_IPFILTER_MINOR_T_HACK
++#if IPF_TRANSPARENT && defined(USE_SOLARIS_IPFILTER_MINOR_T_HACK)
+ /* But we only need do this nasty thing for src/ip/Intercept.cc */
+ #if BUILDING_SQUID_IP_INTERCEPT_CC
+ #define minor_t solaris_minor_t_fubar