diff options
| author | dholland <dholland@pkgsrc.org> | 2015-07-05 19:02:04 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-07-05 19:02:04 +0000 |
| commit | 6bc35f0912da130e5b9dae26f6a934a53c36009e (patch) | |
| tree | a71c27a8adaf9063436c952653f9e8d963d5c8a6 /security | |
| parent | 6f0b4f1c4fff18df793019aad50a96ef7b1dc5c4 (diff) | |
| download | pkgsrc-6bc35f0912da130e5b9dae26f6a934a53c36009e.tar.gz | |
Make this work properly with pkgsrc openssl. I thought I'd tested that
case, but it seems to have been flagrantly broken, and hopefully now
it isn't.
Thanks to richard@ for testing.
Diffstat (limited to 'security')
| -rw-r--r-- | security/mozilla-rootcerts-openssl/Makefile | 14 | ||||
| -rw-r--r-- | security/mozilla-rootcerts-openssl/PLIST | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/security/mozilla-rootcerts-openssl/Makefile b/security/mozilla-rootcerts-openssl/Makefile index ef557d3124f..9d26be82183 100644 --- a/security/mozilla-rootcerts-openssl/Makefile +++ b/security/mozilla-rootcerts-openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/04/18 20:21:25 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2015/07/05 19:02:04 dholland Exp $ PKGNAME= mozilla-rootcerts-openssl-1 CATEGORIES= security @@ -28,6 +28,9 @@ CHECK_BUILTIN.openssl= no # # For native openssl this is in /etc outside of ${PREFIX}. Beware. # +# Update: even for pkgsrc openssl it's in /etc for SSLDIR, as per the +# mozilla-rootcerts script. +# .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) PLACE= /etc SET_PREFIX= yes @@ -36,13 +39,13 @@ CHECK_FILES_SUPPORTED= no NOT_FOR_UNPRIVILEGED= yes .else -PLACE= ${PKG_SYSCONFDIR} -SET_PREFIX= no -PLIST_SUBST+= ${PKG_SYSCONFDIR:S/^${PREFIX}//} +PLACE= ${MY_PKG_SYSCONFDIR} +SET_PREFIX= yes +PLIST_SUBST+= MYETCDIR=${MY_PKG_SYSCONFDIR:S/^${PREFIX}//} .endif OPENSSLDIR= ${PLACE}/openssl/certs -SSLDIR= ${PLACE}/ssl/certs +SSLDIR= /etc/ssl/certs do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${OPENSSLDIR} @@ -54,6 +57,7 @@ do-install: .include "../../mk/bsd.pkg.mk" # This must be after bsd.pkg.mk is included to work. +MY_PKG_SYSCONFDIR:= ${PKG_SYSCONFDIR} .if ${SET_PREFIX} == "yes" PREFIX= / .endif diff --git a/security/mozilla-rootcerts-openssl/PLIST b/security/mozilla-rootcerts-openssl/PLIST index 84515b6ab83..bc9802a95bb 100644 --- a/security/mozilla-rootcerts-openssl/PLIST +++ b/security/mozilla-rootcerts-openssl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/04/18 20:21:25 dholland Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/07/05 19:02:04 dholland Exp $ ${MYETCDIR}/openssl/certs/024dc131.0 ${MYETCDIR}/openssl/certs/034868d6.0 ${MYETCDIR}/openssl/certs/039c618a.0 @@ -353,4 +353,4 @@ ${MYETCDIR}/openssl/certs/mozilla-rootcert-96.pem ${MYETCDIR}/openssl/certs/mozilla-rootcert-97.pem ${MYETCDIR}/openssl/certs/mozilla-rootcert-98.pem ${MYETCDIR}/openssl/certs/mozilla-rootcert-99.pem -${MYETCDIR}/ssl/certs/ca-certificates.crt +etc/ssl/certs/ca-certificates.crt |