diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-07 02:21:16 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-07 02:21:16 +0000 |
| commit | 4b90d17ed9ffbfecbcf61bcb280e4b6bb51aa68f (patch) | |
| tree | 9c8db98822fc70424580d580db896e062263c49e /security | |
| parent | 2102f9fcb1afa2782d2f9de35939cf98d563e9c4 (diff) | |
| download | pkgsrc-4b90d17ed9ffbfecbcf61bcb280e4b6bb51aa68f.tar.gz | |
From the log for rev. 1.1260 of bsd.pkg.mk:
"Package Makefiles should refer to PKG_SYSCONFBASEDIR instead of
PKG_SYSCONFBASE when they want PKG_SYSCONFDIR stripped of
PKG_SYSCONFSUBDIR. This makes PKG_SYSCONFBASE=/etc work with pkgviews by
installing all config files into /etc/packages/<pkg> instead of
occasionally putting some directly into /etc."
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/buildlink2.mk | 4 | ||||
| -rw-r--r-- | security/openssl/buildlink3.mk | 4 | ||||
| -rw-r--r-- | security/ssh2/Makefile.common | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk index 4b09750546f..ee7b802094b 100644 --- a/security/openssl/buildlink2.mk +++ b/security/openssl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.13 2003/11/27 05:19:58 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2004/01/07 02:21:16 jlam Exp $ .if !defined(OPENSSL_BUILDLINK2_MK) OPENSSL_BUILDLINK2_MK= # defined @@ -145,7 +145,7 @@ SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs .elif ${OPSYS} == "NetBSD" SSLCERTS= /etc/openssl/certs .else -SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs +SSLCERTS= ${PKG_SYSCONFBASEDIR}/openssl/certs .endif BUILD_DEFS+= SSLCERTS diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 7a8ce8508d3..6bc3747f75a 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/01/07 02:21:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -149,7 +149,7 @@ SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs . elif ${OPSYS} == "NetBSD" SSLCERTS= /etc/openssl/certs . else -SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs +SSLCERTS= ${PKG_SYSCONFBASEDIR}/openssl/certs . endif BUILD_DEFS+= SSLCERTS diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common index 92ea77dc517..9d53ffcf29c 100644 --- a/security/ssh2/Makefile.common +++ b/security/ssh2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2003/08/12 19:08:55 seb Exp $ +# $NetBSD: Makefile.common,v 1.6 2004/01/07 02:21:17 jlam Exp $ # DISTNAME= ssh-3.2.5 @@ -58,10 +58,10 @@ CONFIGURE_ARGS+= --without-ssh1-compat CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers} CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} -# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid +# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASEDIR may seem stupid # if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm... # -CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR} CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} MAKE_ENV+= PKGBASE=${PKGBASE} |