summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2002-06-28 09:05:16 +0000
committerseb <seb@pkgsrc.org>2002-06-28 09:05:16 +0000
commitb37de5b10e5155ca3e19df88296a41a8e587dcdb (patch)
treedf4d2958d0775357358a9ba1bd2e4377f395676b
parent7d5fe93d6e784041e198e1d217ed5fa3600b7a64 (diff)
downloadpkgsrc-b37de5b10e5155ca3e19df88296a41a8e587dcdb.tar.gz
Add PKG_SYSCONFDIR to BUILD_DEFS.
Note: it was already as part of CONFIGURE_ENV value, this change only makes it more "readable" IMHO. Remove explicit addition of PKG_SYSCONFDIR to BUILD_DEFS in a couple of Makefiles.
-rw-r--r--mk/bsd.pkg.mk3
-rw-r--r--security/openssh/Makefile3
-rw-r--r--security/racoon/Makefile3
-rw-r--r--security/ssh/Makefile4
4 files changed, 6 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 1b02d55fc7a..fbfaa0d1a31 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.996 2002/06/23 03:15:28 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.997 2002/06/28 09:05:20 seb Exp $
#
# This file is in the public domain.
#
@@ -997,6 +997,7 @@ PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}
CONFIGURE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+BUILD_DEFS+= PKG_SYSCONFDIR
# Passed to most of script invocations
SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 064c7d18f04..10fcdfe12cb 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2002/06/27 10:49:40 itojun Exp $
+# $NetBSD: Makefile,v 1.81 2002/06/28 09:05:16 seb Exp $
DISTNAME= openssh-3.4p1
PKGNAME= openssh-3.4.0.1
@@ -27,7 +27,6 @@ CRYPTO= yes
# retain the following line, for IPv6-ready pkgsrc webpage
BUILD_DEFS+= USE_INET6
#BUILD_DEFS+= KERBEROS
-BUILD_DEFS+= PKG_SYSCONFDIR
.include "../../mk/bsd.prefs.mk"
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 70e6eb5f6ee..42d0facce74 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2002/06/25 06:53:39 itojun Exp $
+# $NetBSD: Makefile,v 1.52 2002/06/28 09:05:18 seb Exp $
#
DISTNAME= racoon-20020507a
@@ -17,7 +17,6 @@ IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD"
.endif
BUILD_DEFS+= USE_INET6
-BUILD_DEFS+= PKG_SYSCONFDIR
.include "../../mk/bsd.prefs.mk"
USE_BUILDLINK_ONLY= yes
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 610342c6333..4f3ea2b0bef 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2002/06/15 21:20:04 cjep Exp $
+# $NetBSD: Makefile,v 1.100 2002/06/28 09:05:19 seb Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -195,7 +195,7 @@ post-install:
fi
${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd
-BUILD_DEFS+= USE_IDEA PKG_SYSCONFDIR SSH_SUID USE_RSAREF2
+BUILD_DEFS+= USE_IDEA SSH_SUID USE_RSAREF2
BUILD_DEFS+= LIBWRAP_FWD M68060 USE_SOCKS
.include "../../mk/bsd.pkg.mk"