Allow the rehash of the certs database to not error out during the build

due to libssl.so.300 not being found by correctly setting LD_LIBRARY_PATH.

3 files changed, 23 insertions, 14 deletions

diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 9523e9ae55b..7b46c2acff0 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/26 02:22:38 wiz Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/26 06:54:30 jlam Exp $
 
 _OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.6m
 _OPENSSL_OPENSSLV_H=		/usr/include/openssl/opensslv.h
@@ -74,15 +74,10 @@ _OPENSSL_HAS_FIX!=							\
 .    if !empty(_OPENSSL_VERSION:M0\.9\.6g) && (${_OPENSSL_HAS_FIX} == "yes")
 BUILTIN_PKG.openssl=	openssl-0.9.6l
 .    endif
-MAKEFLAGS+=	BUILTIN_PKG.openssl=${BUILTIN_PKG.openssl}
+BUILDLINK_VARS+=	BUILTIN_PKG.openssl
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.openssl=${IS_BUILTIN.openssl}
-.endif
-
-CHECK_BUILTIN.openssl?=	no
-.if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS])
-USE_BUILTIN.openssl=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.openssl
+.endif	# IS_BUILTIN.openssl
 
 .if !defined(USE_BUILTIN.openssl)
 USE_BUILTIN.openssl?=	${IS_BUILTIN.openssl}
@@ -102,6 +97,9 @@ USE_BUILTIN.openssl!=	\
 .  endif
 .endif	# USE_BUILTIN.openssl
 
+CHECK_BUILTIN.openssl?=	no
+.if !empty(CHECK_BUILTIN.openssl:M[nN][oO])
+
 .if !defined(_NEED_NEWER_OPENSSL)
 _NEED_NEWER_OPENSSL?=	no
 .  for _depend_ in ${BUILDLINK_DEPENDS.openssl}
@@ -114,7 +112,7 @@ _NEED_NEWER_OPENSSL!=	\
 	fi
 .    endif
 .  endfor
-MAKEFLAGS+=	_NEED_NEWER_OPENSSL=${_NEED_NEWER_OPENSSL}
+BUILDLINK_VARS+=	_NEED_NEWER_OPENSSL
 .endif
 
 .if !empty(USE_BUILTIN.openssl:M[nN][oO]) && \
@@ -133,3 +131,5 @@ SSLCERTS=	/etc/ssl/certs		# likely place where certs live
 SSLCERTS=	${PKG_SYSCONFBASEDIR}/openssl/certs
 .endif
 BUILD_DEFS+=	SSLCERTS
+
+.endif	# CHECK_BUILTIN.openssl
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 51ba149c988..43cf6341f66 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2004/03/26 02:22:38 wiz Exp $
+$NetBSD: distinfo,v 1.27 2004/03/26 06:54:30 jlam Exp $
 
 SHA1 (openssl-0.9.6m.tar.gz) = 52414b8867944e2c35940142d38052544dab1358
 Size (openssl-0.9.6m.tar.gz) = 2184918 bytes
 SHA1 (patch-aa) = be92618c7288abe45ed08afe77db2c2a263bc353
 SHA1 (patch-ab) = cfbcaa52bec88987b8a63725b84adfd58b324032
 SHA1 (patch-ac) = e0a6c1b2923e75e87fae54631240d5dce7afd017
-SHA1 (patch-ad) = 09de004a5cb65b7b990ef1e1ff1bd8f425aedf55
+SHA1 (patch-ad) = 44acd3ba563095511267b09a7b56774bb3b90b1d
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
 SHA1 (patch-af) = 1f8bfdad878808a05d5597adba5112090568cf19
 SHA1 (patch-aj) = e300ae91c19214faf3419e7499214a1b536aac18
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index 9bb3adfe483..7f552227fb4 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.10 2004/03/26 02:22:38 wiz Exp $
+$NetBSD: patch-ad,v 1.11 2004/03/26 06:54:30 jlam Exp $
 
---- apps/Makefile.ssl.orig	Thu Aug 14 08:30:31 2003
+--- apps/Makefile.ssl.orig	Thu Aug 14 02:30:31 2003
 +++ apps/Makefile.ssl
 @@ -100,11 +100,11 @@ install:
  	@for i in $(SCRIPTS); \
@@ -19,3 +19,12 @@ $NetBSD: patch-ad,v 1.10 2004/03/26 02:22:38 wiz Exp $
  
  tags:
  	ctags $(SRC)
+@@ -138,7 +138,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).
+ 	$(RM) $(PROGRAM)
+ 	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ 	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+-	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
++	-(cd ..; LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
+ 
+ progs.h: progs.pl
+ 	$(PERL) progs.pl $(E_EXE) >progs.h