diff options
author | jlam <jlam> | 2001-01-13 18:39:44 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-01-13 18:39:44 +0000 |
commit | a9806afea532f421f8eed28657c9ad1afcae4002 (patch) | |
tree | 262c44c4a989b3df1f1e2a2e1ce8d3ecb38eb08d | |
parent | 1e442d5c78ecec83720f8cc7283488eadd76c096 (diff) | |
download | pkgsrc-a9806afea532f421f8eed28657c9ad1afcae4002.tar.gz |
Use SSLCERTS for location of OpenSSL certificates directory.
-rw-r--r-- | mail/imap-uw/Makefile | 18 | ||||
-rw-r--r-- | security/stunnel/Makefile | 18 |
2 files changed, 4 insertions, 32 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 9042717dbef..3f08ab69957 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/01/02 21:05:50 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/01/13 18:39:44 jlam Exp $ DISTNAME= imap-2000a PKGNAME= imap-uw-2000a @@ -30,7 +30,7 @@ NO_CONFIGURE= # defined USE_SSL= # defined MAKE_ENV+= SSLBASE="${SSLBASE}" -MAKE_ENV+= SSLCERTS="${SSL_CERT_DIR}" +MAKE_ENV+= SSLCERTS="${SSLCERTS}" ALL_TARGET+= CC="${LIBTOOL} ${CC}" ALL_TARGET+= EXTRACFLAGS="${CFLAGS}" ALL_TARGET+= SPECIALAUTHENTICATORS="ssl" @@ -68,17 +68,3 @@ do-install: done .include "../../mk/bsd.pkg.mk" - -# The in-tree OpenSSL uses /etc/openssl/certs as the default location for -# certificates, while the pkgsrc OpenSSL uses ${PREFIX}/certs. Define -# SSL_CERT_DIR appropriately using a shell expression, and make sure that -# it's only executed once to optimize the build. -# -.if !defined(SSL_CERT_DIR) -SSL_CERT_DIR!= if ${TEST} -d /etc/openssl/certs; then \ - ${ECHO} /etc/openssl/certs; \ - else \ - ${ECHO} ${PREFIX}/certs; \ - fi -MAKEFLAGS+= SSL_CERT_DIR="${SSL_CERT_DIR}" -.endif diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 71b11307b6c..9f259d11889 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/12/19 07:03:21 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/01/13 18:41:33 jlam Exp $ # DISTNAME= stunnel-3.9 @@ -14,23 +14,9 @@ DEPENDS+= pth>=1.3.5:../../devel/pth USE_SSL= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-ssl=${SSLBASE} -CONFIGURE_ARGS+= --with-cert-dir="${SSL_CERT_DIR}" +CONFIGURE_ARGS+= --with-cert-dir="${SSLCERTS}" pre-configure: cd ${WRKSRC} && autoreconf .include "../../mk/bsd.pkg.mk" - -# The in-tree OpenSSL uses /etc/openssl/certs as the default location for -# certificates, while the pkgsrc OpenSSL uses ${PREFIX}/certs. Define -# SSL_CERT_DIR appropriately using a shell expression, and make sure that -# it's only executed once to optimize the build. -# -.if !defined(SSL_CERT_DIR) -SSL_CERT_DIR!= if ${TEST} -d /etc/openssl/certs; then \ - ${ECHO} /etc/openssl/certs; \ - else \ - ${ECHO} ${PREFIX}/certs; \ - fi -MAKEFLAGS+= SSL_CERT_DIR="${SSL_CERT_DIR}" -.endif |