summaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authoradam <adam>2010-07-28 10:16:14 +0000
committeradam <adam>2010-07-28 10:16:14 +0000
commit9ac63dae1be2b03bf8e9e8c113d3238c926f2fdf (patch)
tree5a1b2bc2dcd5f41556f64bef8ac769a8eb1b245f /www/squid
parentc9316d96afdc2dada5d3aeb3a05cf652416d06a7 (diff)
downloadpkgsrc-9ac63dae1be2b03bf8e9e8c113d3238c926f2fdf.tar.gz
Changes 3.1.5.1:
* SourceFormat Enforcement * Replace most USE_IPV6 with run-time support probing * Translations: sync with 3.HEAD language updates * Split-Stack enable DNS and http(s)_port sockets. * Bug: --with-valgrind-debug failures ignored * Fixed comm.cc:377: "fd_table[fd].halfClosedReader != NULL" assertion * Kludge: try to detect system acinclude path, to fix libtool brokenness. * Bug: search scope for digest_ldap_auth didn't work * Update libtool autoconf macros to libtool2 style * Correction documentation of QoS disable-preserve-miss * Remove .so from SASL build checks * Bug: AIX support: c only c++ style comments test case * Bug: AIX support: check libm for log() * Do not stop accepting just because we got COMM_NOMESSAGE. * Bug: AIX support: uchar is already define (more) * Bug: AIX support: uchar is already define * Bug: crash handling NULL write callback * Correct Joomla DB auth handling * Fixed memory leak related to retried requests. * Prevent memory leaks when cloning Range requests. * Fixed memory leaks related to Range requests. Changes 3.1.5: * Bug: Fix context leak in HttpStateData::processReplyHeader * Bug: raw-IPv6 address URL with append_domain broken * Bug: does not send indirect X-Client-Ip in ICAP respmod * Fix free memory corruption and off-by-on error when comparing SNMP OIDs * Restart DNS retransmission count when restarting the query as an A lookup * Bug: HTTP responses with no Date, L-M or Expires can now be cached * Maintenance: Formater skip libltdl dirs * SourceFormat Enforcement * Bug: Fails to detect chunked encoding if not given in all lower case * Port from 2.7: max_filedescriptor config option * persistent_connection_after_error is meant to be on by default * kFreeBSD does not have linux headers. Wrap properly. * Maintenance: Use system MD5 instead of hard-coded python paths * Bug: ICAP tokens not logged when using multiple access * SourceFormat Enforcement * OpenBSD: Fix build mem.cc warning: converting of negative value
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/options.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/www/squid/options.mk b/www/squid/options.mk
index f8f05b21502..656ac753710 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2010/06/24 07:51:37 tron Exp $
+# $NetBSD: options.mk,v 1.20 2010/07/28 10:16:14 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= snmp ssl \
@@ -64,11 +64,15 @@ PKG_SUGGESTED_OPTIONS+= squid-ipf
PKG_SUGGESTED_OPTIONS+= squid-pf
.endif
-# Darwin dosen't support System V IPC support.
-.if empty(OPSYS:MDarwin)
+.if ${OPSYS} == "Darwin"
+PKG_SUPPORTED_OPTIONS+= squid-ipfw
+PKG_SUGGESTED_OPTIONS+= squid-ipfw
+.endif
+
+# Darwin doesn't support System V IPC support.
+.if empty(PKGNAME:Msquid-[0-2].*) || empty(OPSYS:MDarwin)
PKG_SUPPORTED_OPTIONS+= squid-backend-diskd
PKG_SUGGESTED_OPTIONS+= squid-backend-diskd
-PLIST.diskd= yes
.endif
# limited platform support squid-arp-acl
@@ -96,6 +100,8 @@ CONFIGURE_ARGS+= --enable-linux-netfilter
CONFIGURE_ARGS+= --enable-pf-transparent
.elif !empty(PKG_OPTIONS:Msquid-ipf)
CONFIGURE_ARGS+= --enable-ipf-transparent
+.elif !empty(PKG_OPTIONS:Msquid-ipfw)
+CONFIGURE_ARGS+= --enable-ipfw-transparent
.endif
.if !empty(PKG_OPTIONS:Msquid-arp-acl)