CVS commit: pkgsrc/www/squid4

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan 23 14:47:56 UTC 2020

Modified Files:
        pkgsrc/www/squid4: options.mk

Log Message:
squid4: Don't unconditionally enable the ldap helper.

There is a package option for it, use it so that openldap is correctly
pulled in when enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/squid4/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid4/options.mk
diff -u pkgsrc/www/squid4/options.mk:1.1 pkgsrc/www/squid4/options.mk:1.2
--- pkgsrc/www/squid4/options.mk:1.1    Sat Jan  4 10:57:18 2020
+++ pkgsrc/www/squid4/options.mk        Thu Jan 23 14:47:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/01/04 10:57:18 taca Exp $
+# $NetBSD: options.mk,v 1.2 2020/01/23 14:47:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.squid4
 PKG_SUPPORTED_OPTIONS= ecap gnutls inet6 snmp openssl squid-backend-aufs \
@@ -58,8 +58,8 @@ PKG_SUPPORTED_OPTIONS+=       squid-arp-acl
 .include "../../mk/bsd.options.mk"
 
 # Note: NIS helper cannot be build; it requires crypt.h header file.
-SQUID_BASIC_AUTH_HELPERS?=     DB LDAP NCSA PAM fake getpwnam
-SQUID_DIGEST_AUTH_HELPERS?=    LDAP file
+SQUID_BASIC_AUTH_HELPERS?=     DB NCSA PAM fake getpwnam
+SQUID_DIGEST_AUTH_HELPERS?=    file
 SQUID_NTLM_AUTH_HELPERS?=      SMB_LM fake
 SQUID_EXTERNAL_ACL_HELPERS?=   file_userip unix_group