CVS commit: pkgsrc/security/bearssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Nov 16 07:43:26 UTC 2020

Modified Files:
        pkgsrc/security/bearssl: Makefile PLIST

Log Message:
Pre-create the build's OBJDIR, to be MAKE_JOBS_SAFE on at least Darwin.
(Otherwise a few objects fail pretty early in the build.) Install the
shared library as .dylib on Darwin. Set MASTER_SITES=${HOMEPAGE}. Sort
PLIST and chmod -x libbearssl.a to quell pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/bearssl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/bearssl/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/bearssl/Makefile
diff -u pkgsrc/security/bearssl/Makefile:1.7 pkgsrc/security/bearssl/Makefile:1.8
--- pkgsrc/security/bearssl/Makefile:1.7        Tue Jul 28 08:49:54 2020
+++ pkgsrc/security/bearssl/Makefile    Mon Nov 16 07:43:25 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2020/07/28 08:49:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/11/16 07:43:25 schmonz Exp $
 
 DISTNAME=      bearssl-0.6
 PKGREVISION=   1
 CATEGORIES=    security
-MASTER_SITES=  https://bearssl.org/
+MASTER_SITES=  ${HOMEPAGE}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://bearssl.org/
@@ -14,13 +14,16 @@ INSTALLATION_DIRS=  bin include lib
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+pre-build:
+       ${MKDIR} ${WRKSRC}/build/obj
+
 do-install:
        cd ${WRKSRC}/build && \
                ${INSTALL_PROGRAM} brssl ${DESTDIR}${PREFIX}/bin
        cd ${WRKSRC}/inc && \
                ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include
        cd ${WRKSRC}/build && \
-               ${INSTALL_LIB} libbearssl.* ${DESTDIR}${PREFIX}/lib
+               ${INSTALL_DATA} libbearssl.* ${DESTDIR}${PREFIX}/lib
 
 do-test:
        cd ${WRKSRC} && \
@@ -28,4 +31,22 @@ do-test:
                ./build/testspeed all && \
                ./build/testx509
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+
+SUBST_CLASSES+=                dylib
+SUBST_STAGE.dylib=     pre-configure
+SUBST_FILES.dylib=     conf/Unix.mk
+SUBST_SED.dylib=       -e 's|\.so|.dylib|g'
+
+.PHONY: fix-darwin-install-name
+post-install: fix-darwin-install-name
+fix-darwin-install-name:
+       for f in ${DESTDIR}${PREFIX}/lib/lib*.dylib; do \
+           install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
+       done
+
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/bearssl/PLIST
diff -u pkgsrc/security/bearssl/PLIST:1.3 pkgsrc/security/bearssl/PLIST:1.4
--- pkgsrc/security/bearssl/PLIST:1.3   Mon Jan 21 06:59:58 2019
+++ pkgsrc/security/bearssl/PLIST       Mon Nov 16 07:43:25 2020
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2019/01/21 06:59:58 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/11/16 07:43:25 schmonz Exp $
 bin/brssl
 include/bearssl.h
 include/bearssl_aead.h
 include/bearssl_block.h
 include/bearssl_ec.h
 include/bearssl_hash.h
-include/bearssl_kdf.h
 include/bearssl_hmac.h
+include/bearssl_kdf.h
 include/bearssl_pem.h
 include/bearssl_prf.h
 include/bearssl_rand.h