diff options
| author | taca <taca> | 2013-04-02 15:42:21 +0000 |
|---|---|---|
| committer | taca <taca> | 2013-04-02 15:42:21 +0000 |
| commit | 0286920a9f38e5bf81cf790f95977fc66234cc28 (patch) | |
| tree | 0b3ba0d5e628c0f80a2a191c2fe7d97a26aeac3b /www | |
| parent | a633eb2c89a70fbfdbf7106bc771d6ce412cff3f (diff) | |
| download | pkgsrc-0286920a9f38e5bf81cf790f95977fc66234cc28.tar.gz | |
Move squid/options.mk to squid27/options.mk since squid/options.mk isn't
shared by multiple packages any more.
No functional change.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid27/Makefile | 4 | ||||
| -rw-r--r-- | www/squid27/options.mk (renamed from www/squid/options.mk) | 25 |
2 files changed, 7 insertions, 22 deletions
diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 3aa3e9bef38..2f19cbb7945 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/12/17 13:36:21 taca Exp $ +# $NetBSD: Makefile,v 1.21 2013/04/02 15:42:22 taca Exp $ DISTNAME= squid-2.7.STABLE9 PKGREVISION= 5 @@ -22,5 +22,5 @@ MESSAGE_SRC= ../squid/MESSAGE MESSAGE CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm -.include "../../www/squid/options.mk" +.include "options.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/squid/options.mk b/www/squid27/options.mk index 656ac753710..8673dc0aafb 100644 --- a/www/squid/options.mk +++ b/www/squid27/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.20 2010/07/28 10:16:14 adam Exp $ +# $NetBSD: options.mk,v 1.1 2013/04/02 15:42:22 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= snmp ssl \ - squid-backend-aufs squid-backend-null \ + squid-backend-aufs squid-backend-coss squid-backend-null \ squid-backend-ufs squid-carp squid-unlinkd \ squid-ldap-helper squid-pam-helper @@ -22,26 +22,11 @@ PLIST_VARS+= eacl_ip_user eacl_ldap_group eacl_unix_group # # most of options are enabled by default except aufs. aufs backend isn't # tested well. -PKG_SUGGESTED_OPTIONS= squid-carp snmp ssl squid-pam-helper squid-unlinkd +PKG_SUGGESTED_OPTIONS= squid-backend-coss squid-carp snmp ssl \ + squid-pam-helper squid-unlinkd .include "../../mk/bsd.prefs.mk" -# -# Squid 3.1 and above include IPv6 support -# -.if empty(PKGNAME:Msquid-[0-2].*) && empty(PKGNAME:Msquid-3.0.*) -PKG_SUPPORTED_OPTIONS+= inet6 -PKG_SUGGESTED_OPTIONS+= inet6 -.endif - -# -# Squid 3.0's COSS support is not stable now. -# -.if !empty(PKGNAME:Msquid-2.[0-9]*.[0-9]*) -PKG_SUPPORTED_OPTIONS+= squid-backend-coss -PKG_SUGGESTED_OPTIONS+= squid-backend-coss -.endif - .if !empty(OPSYS:MLinux) PKG_SUPPORTED_OPTIONS+= squid-netfilter .endif @@ -70,7 +55,7 @@ PKG_SUGGESTED_OPTIONS+= squid-ipfw .endif # Darwin doesn't support System V IPC support. -.if empty(PKGNAME:Msquid-[0-2].*) || empty(OPSYS:MDarwin) +.if empty(OPSYS:MDarwin) PKG_SUPPORTED_OPTIONS+= squid-backend-diskd PKG_SUGGESTED_OPTIONS+= squid-backend-diskd .endif |