summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2002-02-05 04:12:07 +0000
committerjlam <jlam>2002-02-05 04:12:07 +0000
commiteeb15ddfc80428baa682683111fdf31288ecbdfa (patch)
tree93856680e896efdd6d09a922f39bbaf421117b34
parent49e37f4c18a76d10920d8b6d73423a4a5038984e (diff)
downloadpkgsrc-eeb15ddfc80428baa682683111fdf31288ecbdfa.tar.gz
Obsolete SSH_CONF_DIR in favor of PKG_SYSCONFDIR.
-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 47c1fa98d3d..1b89c15846a 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.36 2002/02/04 10:32:01 martti Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.37 2002/02/05 04:12:07 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -1124,11 +1124,6 @@ SDIST_PAWD?= pwd
# Possible: any valid directory
# Default: ${PREFIX}/etc/squid
-SSH_CONF_DIR?= /etc
-# Used in ssh and openssh to set the configuration directory.
-# Possible: any valid directory
-# Default: /etc
-
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 794b9d88450..e99881ea909 100644
--- a/mk/bsd.pkg.obsolete.mk
+++ b/mk/bsd.pkg.obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.obsolete.mk,v 1.7 2002/01/31 21:18:38 jlam Exp $
+# $NetBSD: bsd.pkg.obsolete.mk,v 1.8 2002/02/05 04:12:07 jlam 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
@@ -25,6 +25,11 @@ PKG_SYSCONFDIR.stripes?= ${APACHE_SYSCONFDIR}
PKG_SYSCONFDIR.php?= ${PHP_CONFDIR}
.endif
+.if defined(SSH_CONF_DIR)
+PKG_SYSCONFDIR.openssh?= ${SSH_CONF_DIR}
+PKG_SYSCONFDIR.ssh?= ${SSH_CONF_DIR}
+.endif
+
.if defined(VTUN_SYSCONFDIR)
PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR}
.endif