Support to build it on Solaris.

It would be easier to make that change if we support patches for one OPSYS
but someone removed that from out tree.

12 files changed, 42 insertions, 22 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 97e6e3f490e..47b0da31c4e 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/04/21 02:15:37 explorer Exp $
+# $NetBSD: Makefile,v 1.14 2000/05/10 12:28:37 veego Exp $
 #
 
 DISTNAME=		openssl-0.9.5a
@@ -18,26 +18,30 @@ MIRROR_DISTFILE=	no
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-m68k NetBSD-*-mips NetBSD-*-mipseb \
 			NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-powerpc \
-			NetBSD-*-sparc NetBSD-*-vax
+			NetBSD-*-sparc NetBSD-*-vax \
+			SunOS-*
 
 CONFIGURE_ARGS=		-fPIC -DPIC --openssldir=${PREFIX} --prefix=${PREFIX} \
 			${LDFLAGS}
 #CONFIGURE_ENV=		PREFIX=${PREFIX}
+
+.include "../../mk/bsd.prefs.mk"
+
+PATCHDIR=		${WRKDIR}/.patches
+.if ${OPSYS} == "NetBSD"
 MAKE_ENV=		LD_LIBRARY_PATH=${WRKSRC} MAKELIB=${FILESDIR}/makelib
+.endif
 
-# Note, this list gets bigger if using the RSAref library
-PLIST_SRC=		pkg/PLIST
+PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
-.if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
+.if ${OPSYS} == "NetBSD" && !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
 IGNORE=			requires shared object support
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 DEPENDS=		rsaref-2.0p3:../../security/rsaref
 CONFIGURE_ARGS+=	rsaref
-PLIST_SRC+=		pkg/PLIST.rsaref
+PLIST_RSAREF=		${PKGDIR}/PLIST.rsaref
 .endif
 
 fetch-depends:
@@ -51,6 +55,15 @@ fetch-depends:
 	@${FALSE}
 .endif
 
+pre-patch:
+	${MKDIR} ${WRKDIR}/.patches
+	@${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches
+.if ${OPSYS} == "NetBSD"
+	for FILE in ${.CURDIR}/patches/patch.netbsd-*; do \
+		@${CP} $$FILE ${PATCHDIR}/patches-$${FILE##-}; \
+	done
+.endif
+
 # The Perl stuff doesn't work yet (nor did it work properly in SSLeay...)
 do-configure:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/perlpath.pl ${LOCALBASE}/bin
@@ -81,9 +94,10 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKDIR}/der_chop ${PREFIX}/bin/
 	cd ${WRKSRC}/apps && ${INSTALL_SCRIPT} CA.sh CA.pl ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/apps/openssl.cnf ${PREFIX}/etc/openssl.cnf.example
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} libcrypto.so.?.0 libssl.so.?.0 ${PREFIX}/lib/; \
-		${INSTALL_DATA} libcrypto.a libssl.a ${PREFIX}/lib/
+	cd ${WRKSRC} && ${INSTALL_DATA} libcrypto.a libssl.a ${PREFIX}/lib/
+.if ${OPSYS} == "NetBSD"
+	cd ${WRKSRC} && ${INSTALL_DATA} libcrypto.so.?.0 libssl.so.?.0 ${PREFIX}/lib/
+.endif
 .if exists(/usr/bin/ranlib)
 	/usr/bin/ranlib ${PREFIX}/lib/libcrypto.a
 	/usr/bin/ranlib ${PREFIX}/lib/libssl.a
@@ -119,11 +133,16 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/doc/$$file \
 			${PREFIX}/share/doc/openssl/; \
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/certs ${PREFIX}/private
+	${INSTALL_DATA_DIR} ${PREFIX}/certs
+	${INSTALL_DATA_DIR} ${PREFIX}/private
 	@if [ ! -f ${PREFIX}/etc/openssl.cnf ]; then \
 		${CP} -p ${PREFIX}/etc/openssl.cnf.example ${PREFIX}/etc/openssl.cnf; \
 	fi
 
+post-install:
+	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} \
+		${PLIST_RSAREF} > ${PLIST_SRC}
+
 .include  "../../mk/bsd.pkg.mk"
 
 test: all
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch.netbsd-aa
index ad1cd9e81f9..67de59f53d9 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch.netbsd-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-aa,v 1.1 2000/05/10 12:28:42 veego Exp $
 
 --- config.orig	Mon Aug  9 05:16:51 1999
 +++ config	Wed Oct 20 17:12:32 1999
diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch.netbsd-ab
index 1b120005a42..1b120005a42 100644
--- a/security/openssl/patches/patch-ab
+++ b/security/openssl/patches/patch.netbsd-ab
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch.netbsd-ac
index bede19e4b7d..d8beb7b68fe 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch.netbsd-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-ac,v 1.1 2000/05/10 12:28:43 veego Exp $
 
 --- crypto/bn/Makefile.ssl.orig	Sun Jul 25 17:25:11 1999
 +++ crypto/bn/Makefile.ssl	Wed Oct 20 17:12:41 1999
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch.netbsd-ad
index c8836e69230..b8b4e99d8d8 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch.netbsd-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2000/04/22 05:07:03 fredb Exp $
+$NetBSD: patch.netbsd-ad,v 1.1 2000/05/10 12:28:43 veego Exp $
 
 --- Makefile.org.orig	Thu Mar 16 13:46:20 2000
 +++ Makefile.org	Fri Apr 21 23:43:06 2000
diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch.netbsd-ae
index 7a3776129e8..60e75112e7a 100644
--- a/security/openssl/patches/patch-ae
+++ b/security/openssl/patches/patch.netbsd-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-ae,v 1.1 2000/05/10 12:28:44 veego Exp $
 
 --- crypto/Makefile.ssl.orig	Mon Aug  2 16:44:47 1999
 +++ crypto/Makefile.ssl	Wed Oct 20 17:31:16 1999
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch.netbsd-af
index 73dff8cc22d..b67a18e36fb 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch.netbsd-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-af,v 1.1 2000/05/10 12:28:44 veego Exp $
 
 --- ssl/Makefile.ssl.orig	Fri May 21 06:16:45 1999
 +++ ssl/Makefile.ssl	Wed Oct 20 17:31:33 1999
diff --git a/security/openssl/patches/patch-ag b/security/openssl/patches/patch.netbsd-ag
index 0a32e455cbe..9158b2c34cf 100644
--- a/security/openssl/patches/patch-ag
+++ b/security/openssl/patches/patch.netbsd-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-ag,v 1.1 2000/05/10 12:28:44 veego Exp $
 
 --- apps/Makefile.ssl.orig	Mon Jun 21 05:04:37 1999
 +++ apps/Makefile.ssl	Thu Oct 21 00:09:56 1999
diff --git a/security/openssl/patches/patch-ah b/security/openssl/patches/patch.netbsd-ah
index 72e9ff765c2..46f602894c9 100644
--- a/security/openssl/patches/patch-ah
+++ b/security/openssl/patches/patch.netbsd-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 1999/11/25 18:51:47 erh Exp $
+$NetBSD: patch.netbsd-ah,v 1.1 2000/05/10 12:28:44 veego Exp $
 
 --- test/Makefile.ssl.orig	Thu Aug  5 06:50:18 1999
 +++ test/Makefile.ssl	Thu Oct 21 00:09:58 1999
diff --git a/security/openssl/pkg/PLIST b/security/openssl/pkg/PLIST.common
index 6b99578bc01..e13d04e3021 100644
--- a/security/openssl/pkg/PLIST
+++ b/security/openssl/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/04/24 13:54:41 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2000/05/10 12:28:45 veego Exp $
 bin/CA.pl
 bin/CA.sh
 bin/asn1parse
@@ -137,9 +137,7 @@ include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 lib/libcrypto.a
-lib/libcrypto.so.1.0
 lib/libssl.a
-lib/libssl.so.1.0
 share/doc/openssl/README
 share/doc/openssl/apps/CA.pl.pod
 share/doc/openssl/apps/crl.pod
diff --git a/security/openssl/pkg/PLIST.netbsd b/security/openssl/pkg/PLIST.netbsd
new file mode 100644
index 00000000000..bd49117dd15
--- /dev/null
+++ b/security/openssl/pkg/PLIST.netbsd
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.netbsd,v 1.1 2000/05/10 12:28:45 veego Exp $
+lib/libcrypto.so.1.0
+lib/libssl.so.1.0
diff --git a/security/openssl/pkg/PLIST.solaris b/security/openssl/pkg/PLIST.solaris
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/security/openssl/pkg/PLIST.solaris