[pkgsrc/trunk]: pkgsrc/security/openssl openssl: Unbreak Darwin installs afte...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff188ad29b54
branches:  trunk
changeset: 432579:ff188ad29b54
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sat May 23 10:32:06 2020 +0000

description:
openssl: Unbreak Darwin installs after --libdir change.

Adding --libdir seems innocuous enough, but due to OpenSSL's crazy complicated
build system actually results in LIBDIR becoming unset, which trickles down to
the Darwin -install_name being wrong.  This broke the 'openssl' command and
thus many many dependencies.

Switch to $(libdir) instead which appears to still be set correctly.

diffstat:

 security/openssl/distinfo                                    |   3 +-
 security/openssl/patches/patch-Configurations_shared-info.pl |  15 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 2c135a01691a -r ff188ad29b54 security/openssl/distinfo
--- a/security/openssl/distinfo Sat May 23 10:31:04 2020 +0000
+++ b/security/openssl/distinfo Sat May 23 10:32:06 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.141 2020/04/30 11:21:57 nia Exp $
+$NetBSD: distinfo,v 1.142 2020/05/23 10:32:06 jperkin Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
 SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
+SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
 SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956
diff -r 2c135a01691a -r ff188ad29b54 security/openssl/patches/patch-Configurations_shared-info.pl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-Configurations_shared-info.pl      Sat May 23 10:32:06 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Configurations_shared-info.pl,v 1.1 2020/05/23 10:32:06 jperkin Exp $
+
+Specifying --libdir makes LIBDIR empty and breaks library names.
+
+--- Configurations/shared-info.pl.orig 2020-04-21 12:22:39.000000000 +0000
++++ Configurations/shared-info.pl
+@@ -44,7 +44,7 @@ my %shared_info;
+     'darwin-shared' => {
+         module_ldflags        => '-bundle',
+         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',
+-        shared_sonameflag     => '-install_name $(INSTALLTOP)/$(LIBDIR)/',
++        shared_sonameflag     => '-install_name $(libdir)/',
+     },
+     'cygwin-shared' => {
+         shared_ldflag         => '-shared -Wl,--enable-auto-image-base',