summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2002-08-26 06:42:10 +0000
committergrant <grant@pkgsrc.org>2002-08-26 06:42:10 +0000
commite2b0ec1e592d36d13509f477c51ecac355a9bb59 (patch)
tree2227453b651e4b7939c547ff1519ac3bf1f26b87 /mk
parentfaf92a14facf07cd0abbdbfe1645941033126fb8 (diff)
downloadpkgsrc-e2b0ec1e592d36d13509f477c51ecac355a9bb59.tar.gz
deprecate SQUID_SYSCONFDIR in favour of PKG_SYSCONFDIR.squid
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.defaults.mk7
-rw-r--r--mk/bsd.pkg.obsolete.mk7
2 files changed, 7 insertions, 7 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
+