From 853315dca9d28660cfd5edd094d14b3eafa2fde6 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 18 Mar 2017 21:26:31 +0000
Subject: Let 'purge' find correct config file by default.

---
 www/squid3/Makefile | 7 ++++---
 www/squid3/PLIST    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 86eb2acf38a..3ef5f0aeaca 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2017/02/10 08:41:25 sborrill Exp $
+# $NetBSD: Makefile,v 1.74 2017/03/18 21:26:31 adam Exp $
 
 DISTNAME=	squid-3.5.24
 PKGREVISION=	1
@@ -19,6 +19,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${SQUID_DATADIR}
 CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/squid
+CONFIGURE_ARGS+=	--disable-arch-native
 CONFIGURE_ARGS+=	--disable-strict-error-checking
 CONFIGURE_ARGS+=	--enable-auth
 CONFIGURE_ARGS+=	--enable-cachemgr-hostname=localhost
@@ -32,8 +33,8 @@ CONFIGURE_ARGS+=	--with-aio
 CONFIGURE_ARGS+=	--with-default-user=${SQUID_USER}
 CONFIGURE_ARGS+=	--with-pidfile=${VARBASE}/run/squid.pid
 
-# Explicitly disable using CPU optimized instruction
-CONFIGURE_ARGS+=	--disable-arch-native
+# Let 'purge' find correct config file by default.
+CPPFLAGS+=		-DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\"
 
 BUILD_DEFS+=		VARBASE
 MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
diff --git a/www/squid3/PLIST b/www/squid3/PLIST
index 23568473c25..cb634f98ab0 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/02/10 08:41:25 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/03/18 21:26:31 adam Exp $
 bin/purge
 bin/squidclient
 ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -7,7 +7,6 @@ ${PLIST.ba_NCSA}libexec/basic_ncsa_auth
 ${PLIST.ba_PAM}libexec/basic_pam_auth
 libexec/cachemgr.cgi
 ${PLIST.ssl}libexec/cert_valid.pl
-${PLIST.ssl}libexec/ssl_crtd
 ${PLIST.da_file}libexec/digest_file_auth
 ${PLIST.da_LDAP}libexec/digest_ldap_auth
 ${PLIST.diskd}libexec/diskd
@@ -22,6 +21,7 @@ ${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
 libexec/ntlm_fake_auth
 libexec/ntlm_smb_lm_auth
 libexec/pinger
+${PLIST.ssl}libexec/ssl_crtd
 libexec/storeid_file_rewrite
 ${PLIST.unlinkd}libexec/unlinkd
 libexec/url_fake_rewrite
@@ -38,8 +38,8 @@ ${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
 ${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
 man/man8/log_db_daemon.8
 ${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
-${PLIST.ssl}man/man8/ssl_crtd.8
 man/man8/squid.8
+${PLIST.ssl}man/man8/ssl_crtd.8
 man/man8/storeid_file_rewrite.8
 sbin/squid
 share/examples/squid/cachemgr.conf
-- 
cgit v1.2.3