diff options
| author | wiz <wiz> | 2016-06-29 08:23:33 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-06-29 08:23:33 +0000 |
| commit | 49e266fd3dfe04d5cd35825820df46d9b926757d (patch) | |
| tree | da4c4f8a7e82fae86c919fc1f22bf9a1b02f8fd9 | |
| parent | a85a625abf48d716eb182dc4689a3c8abc961197 (diff) | |
| download | pkgsrc-49e266fd3dfe04d5cd35825820df46d9b926757d.tar.gz | |
Move pkgconfig files to default location, so they can be found by default.
Bump PKGREVISION.
ok jperkin
| -rw-r--r-- | security/libressl/Makefile | 8 | ||||
| -rw-r--r-- | security/libressl/PLIST | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 73f0409233d..a83293da3e2 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2016/06/28 13:10:51 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2016/06/29 08:23:33 wiz Exp $ DISTNAME= libressl-2.2.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_OPENBSD:=LibreSSL/} @@ -26,6 +26,8 @@ GNU_CONFIGURE_PREFIX= ${LIBRESSL_PREFIX} CONFIGURE_ARGS+= --with-openssldir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-enginesdir=${LIBRESSL_PREFIX}/lib/engines +INSTALLATION_DIRS+= ${EGDIR} lib + EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONFS= cert.pem openssl.cnf x509v3.cnf .for f in ${CONFS} @@ -46,7 +48,7 @@ PLIST.man= yes .endif post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} cd ${WRKSRC}/apps; ${INSTALL_DATA} ${CONFS} ${DESTDIR}${EGDIR} + mv ${DESTDIR}${PREFIX}/libressl/lib/pkgconfig ${DESTDIR}${PREFIX}/lib .include "../../mk/bsd.pkg.mk" diff --git a/security/libressl/PLIST b/security/libressl/PLIST index 4aebeb67e73..bcdf68975d1 100644 --- a/security/libressl/PLIST +++ b/security/libressl/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2016/03/01 01:49:48 sevan Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/06/29 08:23:33 wiz Exp $ +lib/pkgconfig/libcrypto.pc +lib/pkgconfig/libssl.pc +lib/pkgconfig/libtls.pc +lib/pkgconfig/openssl.pc libressl/bin/openssl libressl/include/openssl/aes.h libressl/include/openssl/asn1.h @@ -75,10 +79,6 @@ libressl/include/tls.h libressl/lib/libcrypto.la libressl/lib/libssl.la libressl/lib/libtls.la -libressl/lib/pkgconfig/libcrypto.pc -libressl/lib/pkgconfig/libssl.pc -libressl/lib/pkgconfig/libtls.pc -libressl/lib/pkgconfig/openssl.pc libressl/man/man1/openssl.1 libressl/man/man3/ASN1_OBJECT_free.3 libressl/man/man3/ASN1_OBJECT_new.3 |