pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/libressl
Module Name: pkgsrc
Committed By: schmonz
Date: Thu Nov 26 15:49:58 UTC 2020
Modified Files:
pkgsrc/security/libressl: Makefile PLIST buildlink3.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/libressl/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libressl/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/libressl/buildlink3.mk
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.15 pkgsrc/security/libressl/Makefile:1.16
--- pkgsrc/security/libressl/Makefile:1.15 Mon Nov 2 08:17:43 2020
+++ pkgsrc/security/libressl/Makefile Thu Nov 26 15:49:58 2020
@@ -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 @@ PLIST.man= yes
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"
Index: pkgsrc/security/libressl/PLIST
diff -u pkgsrc/security/libressl/PLIST:1.9 pkgsrc/security/libressl/PLIST:1.10
--- pkgsrc/security/libressl/PLIST:1.9 Thu Jun 21 23:10:50 2018
+++ pkgsrc/security/libressl/PLIST Thu Nov 26 15:49:58 2020
@@ -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/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/ACCESS_DESCRIPTION_free.3
libressl/man/man3/ACCESS_DESCRIPTION_new.3
@@ -2331,7 +2331,7 @@ libressl/man/man3/bn_mul_normal.3
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
Index: pkgsrc/security/libressl/buildlink3.mk
diff -u pkgsrc/security/libressl/buildlink3.mk:1.3 pkgsrc/security/libressl/buildlink3.mk:1.4
--- pkgsrc/security/libressl/buildlink3.mk:1.3 Sun Jan 7 13:04:29 2018
+++ pkgsrc/security/libressl/buildlink3.mk Thu Nov 26 15:49:58 2020
@@ -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
Home |
Main Index |
Thread Index |
Old Index