summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2013-03-05 01:59:51 +0000
committertaca <taca@pkgsrc.org>2013-03-05 01:59:51 +0000
commit470cbc2eee7e05fde21664e130f880b3ae4caa66 (patch)
tree07cb828c51a8fb4b30cc8b898af96eb3cfaee385 /www
parent2dbedf679f49ba1c735495f8f8a6d250bf501fae (diff)
downloadpkgsrc-470cbc2eee7e05fde21664e130f880b3ae4caa66.tar.gz
Fix build problem with squid-ldap-helper PKG_OPTIONS enabled.
Diffstat (limited to 'www')
-rw-r--r--www/squid3/PLIST8
-rw-r--r--www/squid3/options.mk10
2 files changed, 9 insertions, 9 deletions
diff --git a/www/squid3/PLIST b/www/squid3/PLIST
index f71a6ee8293..c072408f32f 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/02/13 18:20:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/03/05 01:59:51 taca Exp $
bin/purge
bin/squidclient
${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -8,9 +8,9 @@ ${PLIST.ba_NCSA}libexec/basic_ncsa_auth
${PLIST.ba_NIS}libexec/basic_nis_auth
${PLIST.ba_PAM}libexec/basic_pam_auth
libexec/cachemgr.cgi
-${PLIST.da_ldap}libexec/digest_ldap_auth
+${PLIST.da_LDAP}libexec/digest_ldap_auth
${PLIST.diskd}libexec/diskd
-${PLIST.eacl_ldap_group}libexec/ext_ldap_group_acl
+${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
libexec/helper-mux.pl
libexec/log_db_daemon
@@ -28,7 +28,7 @@ ${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8
${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8
${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
${PLIST.ba_PAM}man/man8/basic_pam_auth.8
-${PLIST.eacl_ldap_group}man/man8/ext_ldap_group_acl.8
+${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
man/man8/log_db_daemon.8
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index 1e98f178c99..792ad5e0c75 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2013/02/19 19:38:27 adam Exp $
+# $NetBSD: options.mk,v 1.3 2013/03/05 01:59:51 taca Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-backend-null \
@@ -12,10 +12,10 @@ PKG_OPTIONS_LEGACY_OPTS= diskd:squid-backend-diskd \
PLIST_VARS+= diskd snmp unlinkd
PLIST_VARS+= ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam
-PLIST_VARS+= da_ldap
+PLIST_VARS+= da_LDAP
PLIST_VARS+= na_SMB
PLIST_VARS+= ta_kerberos
-PLIST_VARS+= eacl_ip_user eacl_ldap_group eacl_unix_group
+PLIST_VARS+= eacl_ip_user eacl_LDAP_group eacl_unix_group
PKG_SUGGESTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-carp \
squid-pam-helper squid-unlinkd
@@ -96,8 +96,8 @@ SQUID_NEGOTIATE_AUTH_HELPERS+= kerberos
.if !empty(PKG_OPTIONS:Msquid-ldap-helper)
.include "../../databases/openldap-client/buildlink3.mk"
SQUID_BASIC_AUTH_HELPERS+= LDAP
-SQUID_DIGEST_AUTH_HELPERS+= ldap
-SQUID_EXTERNAL_ACL_HELPERS+= ldap_group
+SQUID_DIGEST_AUTH_HELPERS+= LDAP
+SQUID_EXTERNAL_ACL_HELPERS+= LDAP_group
.endif
.if !empty(PKG_OPTIONS:Msquid-pam-helper)