deprecate SQUID_SYSCONFDIR in favour of PKG_SYSCONFDIR.squid

3 files changed, 16 insertions, 17 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 1bc8007f358..1f131d4ff77 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.82 2002/08/19 18:39:14 seb Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.83 2002/08/26 06:42:10 grant Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1280,11 +1280,6 @@ SDIST_PAWD?= pwd
 #          --enable-ipf-transparent
 #          --enable-snmp
 
-#SQUID_SYSCONFDIR=
-# Used in squid to set the configuration directory.
-# Possible: any valid directory
-# Default: ${PREFIX}/etc/squid
-
 SSH_RSHPATH?= /usr/bin/rsh
 # Used in ssh to specify standard rsh path
 # Possible: path to rsh binary
diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk
index e99881ea909..95088176452 100644
--- a/mk/bsd.pkg.obsolete.mk
+++ b/mk/bsd.pkg.obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.obsolete.mk,v 1.8 2002/02/05 04:12:07 jlam Exp $
+# $NetBSD: bsd.pkg.obsolete.mk,v 1.9 2002/08/26 06:42:11 grant Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -41,3 +41,8 @@ USE_SASL=				YES
 .if defined(SAMBA_WITH_CUPS)
 USE_CUPS=				YES
 .endif
+
+.if defined(SQUID_SYSCONFDIR)
+PKG_SYSCONFDIR.squid?=			${SQUID_SYSCONFDIR}
+.endif
+
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8bf55f7364e..98aaae102fb 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2002/07/24 19:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2002/08/26 06:42:12 grant Exp $
 
 DISTNAME=	squid-2.4.STABLE7-src
 PKGNAME=	squid-2.4.7
@@ -13,19 +13,22 @@ COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
 USE_PERL5=	build
 
+# Configuration directory location which can be overwritten by the user.
+PKG_SYSCONFSUBDIR?=	squid
+
 .include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+= --sysconfdir=${SQUID_SYSCONFDIR} \
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
 		--localstatedir=/var/squid \
 		${SQUID_CONFIGURE_ARGS}
 CONFIGURE_ENV+=	PERL=${PERL5}
 
-BUILD_DEFS+=	SQUID_CONFIGURE_ARGS SQUID_SYSCONFDIR
+BUILD_DEFS+=	SQUID_CONFIGURE_ARGS
 MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 INSTALL_FILE=	${WRKDIR}/INSTALL
 PLIST_SRC=	${WRKDIR}/PLIST
-PLIST_SUBST+=	SQUID_SYSCONFDIR=${SQUID_SYSCONFDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 # Configuration options which can be overwritten by the user.
@@ -38,19 +41,15 @@ SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
 			--enable-underscores \
 			--enable-storeio=ufs,diskd
 
-# Configuration directory location which can be overwritten by the user.
-PKG_SYSCONFSUBDIR?=	squid
-SQUID_SYSCONFDIR?=	${PKG_SYSCONFDIR}
-
 OPTIONAL_FILES=	libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh
-	${SED} s#@SYSCONFDIR@#${SQUID_SYSCONFDIR}#g <${PKGDIR}/INSTALL \
+	${SED} s#@SYSCONFDIR@#${PKG_SYSCONFDIR}#g <${PKGDIR}/INSTALL \
 	  >${WRKDIR}/INSTALL
 
 pre-install:
-	@${INSTALL_DATA_DIR} ${SQUID_SYSCONFDIR}
+	@${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors