[pkgsrc/trunk]: pkgsrc/security/libressl Everything except .pc files already ...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8af21fab71f0
branches:  trunk
changeset: 442598:8af21fab71f0
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Nov 26 15:49:58 2020 +0000

description:
Everything except .pc files already goes under the libressl/ hierarchy;
install .pc files there too, now fully avoiding conflicts with OpenSSL.
Add a buildlink3.mk hack for the .pc files to get found. Restore missing
${PLIST.man} to PLIST. Bump PKGREVISION.

diffstat:

 security/libressl/Makefile      |   4 ++--
 security/libressl/PLIST         |  12 ++++++------
 security/libressl/buildlink3.mk |  12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (80 lines):

diff -r c316bf82b9ec -r 8af21fab71f0 security/libressl/Makefile
--- a/security/libressl/Makefile        Thu Nov 26 15:45:01 2020 +0000
+++ b/security/libressl/Makefile        Thu Nov 26 15:49:58 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2020/11/02 08:17:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2020/11/26 15:49:58 schmonz Exp $
 
 DISTNAME=      libressl-2.7.4
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_OPENBSD:=LibreSSL/}
 
@@ -48,7 +49,6 @@
 
 post-install:
        cd ${WRKSRC}/apps/openssl; ${INSTALL_DATA} ${CONFS} ${DESTDIR}${EGDIR}
-       mv ${DESTDIR}${PREFIX}/libressl/lib/pkgconfig ${DESTDIR}${PREFIX}/lib
        ${RM} -r ${DESTDIR}${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r c316bf82b9ec -r 8af21fab71f0 security/libressl/PLIST
--- a/security/libressl/PLIST   Thu Nov 26 15:45:01 2020 +0000
+++ b/security/libressl/PLIST   Thu Nov 26 15:49:58 2020 +0000
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/06/21 23:10:50 ryoon Exp $
-lib/pkgconfig/libcrypto.pc
-lib/pkgconfig/libssl.pc
-lib/pkgconfig/libtls.pc
-lib/pkgconfig/openssl.pc
+@comment $NetBSD: PLIST,v 1.10 2020/11/26 15:49:58 schmonz Exp $
 libressl/bin/ocspcheck
 libressl/bin/openssl
 libressl/include/openssl/aes.h
@@ -79,6 +75,10 @@
 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/ACCESS_DESCRIPTION_free.3
 libressl/man/man3/ACCESS_DESCRIPTION_new.3
@@ -2331,7 +2331,7 @@
 libressl/man/man3/bn_mul_part_recursive.3
 libressl/man/man3/bn_mul_recursive.3
 libressl/man/man3/bn_mul_words.3
-libressl/man/man3/bn_print.3
+${PLIST.man}libressl/man/man3/bn_print.3
 libressl/man/man3/bn_set_high.3
 libressl/man/man3/bn_set_low.3
 libressl/man/man3/bn_set_max.3
diff -r c316bf82b9ec -r 8af21fab71f0 security/libressl/buildlink3.mk
--- a/security/libressl/buildlink3.mk   Thu Nov 26 15:45:01 2020 +0000
+++ b/security/libressl/buildlink3.mk   Thu Nov 26 15:49:58 2020 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:29 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/11/26 15:49:58 schmonz Exp $
 
 BUILDLINK_TREE+=       libressl
 
 .if !defined(LIBRESSL_BUILDLINK3_MK)
 LIBRESSL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libressl+=       libressl>=2.2.6
+BUILDLINK_API_DEPENDS.libressl+=       libressl>=2.7.4nb1
 BUILDLINK_PKGSRCDIR.libressl?=         ../../security/libressl
 
-BUILDLINK_PASSTHRU_DIRS+=      ${LOCALBASE}/libressl/include
-BUILDLINK_PASSTHRU_DIRS+=      ${LOCALBASE}/libressl/lib
-CPPFLAGS+=                     -I${PREFIX}/libressl/include
-LDFLAGS+=                      ${COMPILER_RPATH_FLAG}${PREFIX}/libressl/lib -L${PREFIX}/libressl/lib
+BUILDLINK_INCDIRS.libressl+=   libressl/include
+BUILDLINK_LIBDIRS.libressl+=   libressl/lib
+# XXX this overwrites all the other typical values
+_PKG_CONFIG_LIBDIR=            ${PREFIX}/libressl/lib/pkgconfig
 .endif # LIBRESSL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libressl