Mon May 24 16:25:29 2010 UTC ()
Specifically disable helpers if the according "SQUID_EXTERNAL_*_HELPERS"
variable is set to the empty string. We will otherwise end up building
all the helpers which is probably not what the user wanted.

This addresses the second halfof PR pkg/43347 by Bernd Ernesti.


(tron)
diff -r1.16 -r1.17 pkgsrc/www/squid/options.mk
cvs diff -r1.16 -r1.17 pkgsrc/www/squid/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/squid/Attic/options.mk 2010/02/19 17:22:13 1.16
+++ pkgsrc/www/squid/Attic/options.mk 2010/05/24 16:25:29 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.16 2010/02/19 17:22:13 tron Exp $ 1# $NetBSD: options.mk,v 1.17 2010/05/24 16:25:29 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squid 3PKG_OPTIONS_VAR= PKG_OPTIONS.squid
4PKG_SUPPORTED_OPTIONS= snmp ssl \ 4PKG_SUPPORTED_OPTIONS= snmp ssl \
5 squid-backend-aufs squid-backend-null \ 5 squid-backend-aufs squid-backend-null \
6 squid-backend-ufs squid-carp squid-unlinkd \ 6 squid-backend-ufs squid-carp squid-unlinkd \
7 squid-ldap-helper squid-pam-helper 7 squid-ldap-helper squid-pam-helper
8 8
9PKG_OPTIONS_LEGACY_OPTS= aufs:squid-backend-aufs \ 9PKG_OPTIONS_LEGACY_OPTS= aufs:squid-backend-aufs \
10 coss:squid-backend-coss diskd:squid-backend-diskd \ 10 coss:squid-backend-coss diskd:squid-backend-diskd \
11 null:squid-backend-null ufs:squid-backend-ufs \ 11 null:squid-backend-null ufs:squid-backend-ufs \
12 linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \ 12 linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \
13 pf-transparent:squid-pf unlinkd:squid-unlinkd \ 13 pf-transparent:squid-pf unlinkd:squid-unlinkd \
14 arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp 14 arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp
@@ -139,40 +139,48 @@ PLIST.coss= yes @@ -139,40 +139,48 @@ PLIST.coss= yes
139.endif 139.endif
140 140
141.if !empty(PKG_OPTIONS:Msquid-backend-diskd) 141.if !empty(PKG_OPTIONS:Msquid-backend-diskd)
142SQUID_BACKENDS+= diskd 142SQUID_BACKENDS+= diskd
143PLIST.diskd= yes 143PLIST.diskd= yes
144.endif 144.endif
145 145
146.if empty(PKG_OPTIONS:Msquid-unlinkd) 146.if empty(PKG_OPTIONS:Msquid-unlinkd)
147CONFIGURE_ARGS+= --disable-unlinkd 147CONFIGURE_ARGS+= --disable-unlinkd
148.else 148.else
149PLIST.unlinkd= yes 149PLIST.unlinkd= yes
150.endif 150.endif
151 151
152.if !empty(SQUID_BASIC_AUTH_HELPERS) 152.if empty(SQUID_BASIC_AUTH_HELPERS)
 153CONFIGURE_ARGS+= --enable-basic-auth-helpers=no
 154.else
153CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q} 155CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q}
154.for i in ${SQUID_BASIC_AUTH_HELPERS} 156.for i in ${SQUID_BASIC_AUTH_HELPERS}
155PLIST.ba_${i}= yes 157PLIST.ba_${i}= yes
156.endfor 158.endfor
157.endif 159.endif
158 160
159.if !empty(SQUID_DIGEST_AUTH_HELPERS) 161.if empty(SQUID_DIGEST_AUTH_HELPERS)
 162CONFIGURE_ARGS+= --enable-digest-auth-helpers=no
 163.else
160CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q} 164CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q}
161.for i in ${SQUID_DIGEST_AUTH_HELPERS} 165.for i in ${SQUID_DIGEST_AUTH_HELPERS}
162PLIST.da_${i}= yes 166PLIST.da_${i}= yes
163.endfor 167.endfor
164.endif 168.endif
165 169
166.if !empty(SQUID_NTLM_AUTH_HELPERS) 170.if empty(SQUID_NTLM_AUTH_HELPERS)
 171CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=no
 172.else
167CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q} 173CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q}
168.for i in ${SQUID_NTLM_AUTH_HELPERS} 174.for i in ${SQUID_NTLM_AUTH_HELPERS}
169PLIST.na_${i}= yes 175PLIST.na_${i}= yes
170.endfor 176.endfor
171.endif 177.endif
172 178
173.if !empty(SQUID_EXTERNAL_ACL_HELPERS) 179.if empty(SQUID_EXTERNAL_ACL_HELPERS)
 180CONFIGURE_ARGS+= --enable-external-acl-helpers=no
 181.else
174CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q} 182CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q}
175.for i in ${SQUID_EXTERNAL_ACL_HELPERS} 183.for i in ${SQUID_EXTERNAL_ACL_HELPERS}
176PLIST.eacl_${i}= yes 184PLIST.eacl_${i}= yes
177.endfor 185.endfor
178.endif 186.endif