pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/libressl Move pkgconfig files to default loca...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/345b97cdd859
branches:  trunk
changeset: 349096:345b97cdd859
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 29 08:23:33 2016 +0000

description:
Move pkgconfig files to default location, so they can be found by default.

Bump PKGREVISION.

ok jperkin

diffstat:

 security/libressl/Makefile |   8 +++++---
 security/libressl/PLIST    |  10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r 69043b6c6573 -r 345b97cdd859 security/libressl/Makefile
--- a/security/libressl/Makefile        Tue Jun 28 16:57:51 2016 +0000
+++ b/security/libressl/Makefile        Wed Jun 29 08:23:33 2016 +0000
@@ -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 @@
 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 @@
 .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 -r 69043b6c6573 -r 345b97cdd859 security/libressl/PLIST
--- a/security/libressl/PLIST   Tue Jun 28 16:57:51 2016 +0000
+++ b/security/libressl/PLIST   Wed Jun 29 08:23:33 2016 +0000
@@ -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/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



Home | Main Index | Thread Index | Old Index