[pkgsrc/trunk]: pkgsrc/security/openssl Use all necessary means to convince O...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e07ed9f3d79
branches:  trunk
changeset: 528194:5e07ed9f3d79
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Apr 24 14:10:37 2007 +0000

description:
Use all necessary means to convince OpenSSL's "special" build system
to link with the "dl" library under Mac OS X if necessary.
This should finally fix PR pkg/36086.

diffstat:

 security/openssl/Makefile |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r be36bdf7fdd9 -r 5e07ed9f3d79 security/openssl/Makefile
--- a/security/openssl/Makefile Tue Apr 24 12:32:23 2007 +0000
+++ b/security/openssl/Makefile Tue Apr 24 14:10:37 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/04/18 14:11:33 tron Exp $
+# $NetBSD: Makefile,v 1.123 2007/04/24 14:10:37 tron Exp $
 
 OPENSSL_SNAPSHOT?=     # empty
 OPENSSL_STABLE?=       # empty
@@ -77,6 +77,15 @@
 CONFIGURE_ARGS+=       irix64-mips4-cc
 .    endif
 .  endif
+.elif ${OPSYS} == "Darwin"
+.include "../../mk/dlopen.buildlink3.mk"
+
+SUBST_CLASSES+=                dl
+SUBST_MESSAGE.dl=      Adding dynmamic link compatibility library.
+SUBST_STAGE.dl=                post-configure
+SUBST_FILES.dl=                Makefile apps/Makefile crypto/Makefile \
+                       crypto/pkcs7/Makefile fips/Makefile test/Makefile
+SUBST_SED.dl=          -e "s,^EX_LIBS=,EX_LIBS=${BUILDLINK_LDFLAGS.dlcompat} ,g"
 .endif
 
 .include "../../security/openssl/options.mk"
@@ -104,8 +113,6 @@
                        ${PKG_SYSCONFDIR}/openssl.cnf
 OWN_DIRS=              ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
 
-DL_AUTO_VARS=          yes
-
 # Some shells don't accept empty word lists in for loops.  For those
 # Makefiles where this occurs, edit the file so that we avoid running
 # the loop.
@@ -124,5 +131,4 @@
        done
        cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
 
-.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"