diff options
| author | obache <obache@pkgsrc.org> | 2014-02-28 12:28:32 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-02-28 12:28:32 +0000 |
| commit | f0b2b495e88a9309f2f8e1078fcb813e873c6387 (patch) | |
| tree | 639959498caa8f41efb35cca0adf14e8315c0ef8 /www | |
| parent | 056170a10a19db8a2c8560ca78cad4c8a68ca6c1 (diff) | |
| download | pkgsrc-f0b2b495e88a9309f2f8e1078fcb813e873c6387.tar.gz | |
Exactly disable krb5 if option is off, otherwise specify wanted krb5-config.
Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid3/Makefile | 4 | ||||
| -rw-r--r-- | www/squid3/options.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www/squid3/Makefile b/www/squid3/Makefile index 106e401983b..a8121dfa57e 100644 --- a/www/squid3/Makefile +++ b/www/squid3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:47 tron Exp $ +# $NetBSD: Makefile,v 1.29 2014/02/28 12:28:32 obache Exp $ DISTNAME= squid-3.4.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ ftp://ftp.squid-cache.org/pub/squid/ \ diff --git a/www/squid3/options.mk b/www/squid3/options.mk index 8ffeb06f1a3..3b6dfa6dd3d 100644 --- a/www/squid3/options.mk +++ b/www/squid3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2013/12/28 19:50:34 hauke Exp $ +# $NetBSD: options.mk,v 1.12 2014/02/28 12:28:32 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \ @@ -91,7 +91,10 @@ CONFIGURE_ARGS+= --disable-ipv6 .if !empty(PKG_OPTIONS:Msquid-kerberos-helper) .include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --with-krb5-config=${KRB5_CONFIG:Q} SQUID_NEGOTIATE_AUTH_HELPERS+= kerberos +.else +CONFIGURE_ARGS+= --with-krb5-config=no .endif .if !empty(PKG_OPTIONS:Msquid-ldap-helper) |