CVS commit: pkgsrc/security/libressl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun 29 08:23:33 UTC 2016

Modified Files:
        pkgsrc/security/libressl: Makefile PLIST

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

Bump PKGREVISION.

ok jperkin


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/libressl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/libressl/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libressl/Makefile
diff -u pkgsrc/security/libressl/Makefile:1.5 pkgsrc/security/libressl/Makefile:1.6
--- pkgsrc/security/libressl/Makefile:1.5       Tue Jun 28 13:10:51 2016
+++ pkgsrc/security/libressl/Makefile   Wed Jun 29 08:23:33 2016
@@ -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"

Index: pkgsrc/security/libressl/PLIST
diff -u pkgsrc/security/libressl/PLIST:1.3 pkgsrc/security/libressl/PLIST:1.4
--- pkgsrc/security/libressl/PLIST:1.3  Tue Mar  1 01:49:48 2016
+++ pkgsrc/security/libressl/PLIST      Wed Jun 29 08:23:33 2016
@@ -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