CVS commit: pkgsrc/security/openssl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec 14 09:18:47 UTC 2017

Modified Files:
        pkgsrc/security/openssl: Makefile PLIST.common

Log Message:
openssl: Avoid case-sensitive issue on Darwin.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/openssl/PLIST.common

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

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.234 pkgsrc/security/openssl/Makefile:1.235
--- pkgsrc/security/openssl/Makefile:1.234      Sat Dec  9 18:02:02 2017
+++ pkgsrc/security/openssl/Makefile    Thu Dec 14 09:18:47 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.234 2017/12/09 18:02:02 fhajny Exp $
+# $NetBSD: Makefile,v 1.235 2017/12/14 09:18:47 jperkin Exp $
 
 DISTNAME=      openssl-1.0.2n
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://www.openssl.org/source/
 
@@ -171,5 +172,15 @@ INSTALLATION_DIRS+=        share/examples/opens
 pre-configure:
        cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
 
+# BN_print.3 and bn_print.3 cannot co-exist on Darwin, we choose to remove
+# bn_print.3 simply because it has more aliases to the same manual page.
+PLIST_VARS+=   notmac
+.if ${OPSYS} == "Darwin"
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/bn_print.3*
+.else
+PLIST.notmac=  yes
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/openssl/PLIST.common
diff -u pkgsrc/security/openssl/PLIST.common:1.31 pkgsrc/security/openssl/PLIST.common:1.32
--- pkgsrc/security/openssl/PLIST.common:1.31   Fri Nov 24 20:34:23 2017
+++ pkgsrc/security/openssl/PLIST.common        Thu Dec 14 09:18:47 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.31 2017/11/24 20:34:23 bsiegert Exp $
+@comment $NetBSD: PLIST.common,v 1.32 2017/12/14 09:18:47 jperkin Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -1648,7 +1648,7 @@ man/man3/bn_mul_normal.3
 man/man3/bn_mul_part_recursive.3
 man/man3/bn_mul_recursive.3
 man/man3/bn_mul_words.3
-man/man3/bn_print.3
+${PLIST.notmac}man/man3/bn_print.3
 man/man3/bn_set_high.3
 man/man3/bn_set_low.3
 man/man3/bn_set_max.3