[pkgsrc/trunk]: pkgsrc/www/squid Specifically disable helpers if the accordin...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/250eb12b1c45
branches:  trunk
changeset: 575843:250eb12b1c45
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon May 24 16:25:29 2010 +0000

description:
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.

diffstat:

 www/squid/options.mk |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r cf39ec28205c -r 250eb12b1c45 www/squid/options.mk
--- a/www/squid/options.mk      Mon May 24 16:10:54 2010 +0000
+++ b/www/squid/options.mk      Mon May 24 16:25:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2010/02/19 17:22:13 tron Exp $
+# $NetBSD: options.mk,v 1.17 2010/05/24 16:25:29 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS= snmp ssl \
@@ -149,28 +149,36 @@
 PLIST.unlinkd=         yes
 .endif
 
-.if !empty(SQUID_BASIC_AUTH_HELPERS)
+.if empty(SQUID_BASIC_AUTH_HELPERS)
+CONFIGURE_ARGS+= --enable-basic-auth-helpers=no
+.else
 CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q}
 .for i in ${SQUID_BASIC_AUTH_HELPERS}
 PLIST.ba_${i}=         yes
 .endfor
 .endif
 
-.if !empty(SQUID_DIGEST_AUTH_HELPERS)
+.if empty(SQUID_DIGEST_AUTH_HELPERS)
+CONFIGURE_ARGS+= --enable-digest-auth-helpers=no
+.else
 CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q}
 .for i in ${SQUID_DIGEST_AUTH_HELPERS}
 PLIST.da_${i}=         yes
 .endfor
 .endif
 
-.if !empty(SQUID_NTLM_AUTH_HELPERS)
+.if empty(SQUID_NTLM_AUTH_HELPERS)
+CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=no
+.else
 CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q}
 .for i in ${SQUID_NTLM_AUTH_HELPERS}
 PLIST.na_${i}=         yes
 .endfor
 .endif
 
-.if !empty(SQUID_EXTERNAL_ACL_HELPERS)
+.if empty(SQUID_EXTERNAL_ACL_HELPERS)
+CONFIGURE_ARGS+= --enable-external-acl-helpers=no
+.else
 CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q}
 .for i in ${SQUID_EXTERNAL_ACL_HELPERS}
 PLIST.eacl_${i}=       yes