diff options
| -rw-r--r-- | www/squid/options.mk | 14 | ||||
| -rw-r--r-- | www/squid31/Makefile | 5 | ||||
| -rw-r--r-- | www/squid31/distinfo | 8 |
3 files changed, 17 insertions, 10 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) diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 8e2e5a1e79c..1cdbe1abdbd 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2010/06/11 13:41:34 tron Exp $ +# $NetBSD: Makefile,v 1.23 2010/07/28 10:16:14 adam Exp $ -DISTNAME= squid-3.1.4 +DISTNAME= squid-3.1.5.1 PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ \ @@ -32,4 +32,5 @@ post-build: ${CP} -pf ${WRKSRC}/src/squid.conf.documented \ ${WRKSRC}/src/squid.conf.default +.include "../../devel/libltdl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 6a3e13d6bb6..d74ad5ec76e 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.20 2010/06/11 13:41:34 tron Exp $ +$NetBSD: distinfo,v 1.21 2010/07/28 10:16:14 adam Exp $ -SHA1 (squid-3.1.4.tar.bz2) = bb83b865c081c25a5989adf689923935742315e0 -RMD160 (squid-3.1.4.tar.bz2) = f2b7e4ff5cf2ab082ae71defa289d7d703b41266 -Size (squid-3.1.4.tar.bz2) = 2391480 bytes +SHA1 (squid-3.1.5.1.tar.bz2) = b1b74ac837c71962f4ce79e005f9366e0af70994 +RMD160 (squid-3.1.5.1.tar.bz2) = d59c27e0f02e6bdcb0ffad5588285582b33c26f2 +Size (squid-3.1.5.1.tar.bz2) = 2419515 bytes SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589 SHA1 (patch-ae) = 88fbc7fb1a47b1baf48f7cd0f0b66cbf51e3b24b SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76 |