- Install new include files so that this package can be used to build

  applications again.
- Fix patch sum for Solaris.

3 files changed, 22 insertions, 28 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index a82ca7c1bf5..72a18c2580d 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2001/04/09 04:29:23 fredb Exp $
-#
+# $NetBSD: Makefile,v 1.37 2001/04/09 13:32:01 tron Exp $
 
 DISTNAME=		openssl-0.9.6
 CATEGORIES=		security
@@ -37,10 +36,6 @@ PATCHDIR=		${WRKDIR}/.patches
 MAKE_ENV=		LD_LIBRARY_PATH=${WRKSRC} MAKELIB=${FILESDIR}/makelib
 .endif
 
-.if ${OPSYS} == "SunOS"
-PATCH_SUM_FILE=		${FILESDIR}/patch-sum.solaris
-.endif
-
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
 .if ${OPSYS} == "NetBSD" && !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
@@ -72,7 +67,7 @@ do-configure:
 #	@cd ${WRKSRC}/perl && ${MAKE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/apps/openssl ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/apps/openssl ${PREFIX}/bin
 	@cd ${PREFIX}/bin && \
 	for file in asn1parse base64 bf bf-cbc bf-cfb bf-ecb bf-ofb ca \
 	cast cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb ciphers crl \
@@ -87,14 +82,14 @@ do-install:
 		${LN} -sf openssl $$file; \
 	done
 	cd ${WRKSRC}/tools && ${INSTALL_SCRIPT} \
-		c_hash c_info c_issuer c_name c_rehash ${PREFIX}/bin/
+		c_hash c_info c_issuer c_name c_rehash ${PREFIX}/bin
 	${SED} -e s,/usr/local,${PREFIX}, ${WRKSRC}/apps/der_chop >${WRKDIR}/der_chop && \
-		${INSTALL_SCRIPT} ${WRKDIR}/der_chop ${PREFIX}/bin/
-	cd ${WRKSRC}/apps && ${INSTALL_SCRIPT} CA.sh CA.pl ${PREFIX}/bin/
+		${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.a libssl.a ${PREFIX}/lib/
+	cd ${WRKSRC} && ${INSTALL_DATA} libcrypto.a libssl.a ${PREFIX}/lib
 .if ${OPSYS} == "NetBSD"
-	cd ${WRKSRC} && ${INSTALL_DATA} libcrypto.so.1.0 libssl.so.1.0 ${PREFIX}/lib/
+	cd ${WRKSRC} && ${INSTALL_DATA} libcrypto.so.1.0 libssl.so.1.0 ${PREFIX}/lib
 .if ${OBJECT_FMT} == "ELF"
 .for shared_lib in libcrypto.so.1.0 libssl.so.1.0
 	cd ${PREFIX}/lib && ${LN} -s ${shared_lib} ${shared_lib:R} && \
@@ -108,18 +103,19 @@ do-install:
 .endif
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 	# libRSAglue.a is only useful if you are using the RSAREF2 library.
-	cd ${WRKSRC} && ${INSTALL_DATA} libRSAglue.a ${PREFIX}/lib/
+	cd ${WRKSRC} && ${INSTALL_DATA} libRSAglue.a ${PREFIX}/lib
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/include/openssl
 	cd ${WRKSRC}/include/openssl && \
 	for file in \
 	asn1.h asn1_mac.h bio.h blowfish.h bn.h buffer.h cast.h comp.h conf.h \
 	crypto.h des.h dh.h dsa.h e_os.h e_os2.h ebcdic.h err.h evp.h hmac.h \
-	idea.h lhash.h md2.h md5.h mdc2.h objects.h opensslconf.h opensslv.h \
-	pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h rc5.h ripemd.h rsa.h \
-	safestack.h sha.h ssl.h ssl2.h ssl23.h ssl3.h stack.h tls1.h tmdiff.h \
-	txt_db.h x509.h x509_vfy.h x509v3.h ; do \
-		${INSTALL_DATA} $$file ${PREFIX}/include/openssl/; \
+	idea.h lhash.h md2.h md4.h md5.h mdc2.h obj_mac.h objects.h \
+	opensslconf.h opensslv.h pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h \
+	rc4.h rc5.h ripemd.h rsa.h safestack.h sha.h ssl.h ssl2.h ssl23.h \
+	ssl3.h stack.h symhacks.h tls1.h tmdiff.h txt_db.h x509.h x509_vfy.h \
+	x509v3.h ; do \
+		${INSTALL_DATA} $$file ${PREFIX}/include/openssl; \
 	done
 #	@cd ${WRKSRC}/perl && ${MAKE} install
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl
@@ -127,15 +123,15 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl/crypto
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl/ssl
 	${INSTALL_DATA} ${WRKSRC}/doc/apps/* \
-		${PREFIX}/share/doc/openssl/apps/
+		${PREFIX}/share/doc/openssl/apps
 	${INSTALL_DATA} ${WRKSRC}/doc/crypto/* \
-		${PREFIX}/share/doc/openssl/crypto/
+		${PREFIX}/share/doc/openssl/crypto
 	${INSTALL_DATA} ${WRKSRC}/doc/ssl/* \
-		${PREFIX}/share/doc/openssl/ssl/
+		${PREFIX}/share/doc/openssl/ssl
 	for file in README c-indentation.el openssl.txt openssl_button.gif \
 	openssl_button.html ssleay.txt ; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$$file \
-			${PREFIX}/share/doc/openssl/; \
+			${PREFIX}/share/doc/openssl; \
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/certs
 	${INSTALL_DATA_DIR} ${PREFIX}/private
diff --git a/security/openssl/files/patch-sum.solaris b/security/openssl/files/patch-sum.solaris
deleted file mode 100644
index a0b79b0c0a2..00000000000
--- a/security/openssl/files/patch-sum.solaris
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: patch-sum.solaris,v 1.1 2001/01/17 10:46:31 wiz Exp $
-
-MD5 (patch-aa) = 650f90da97a7bfd8ab35438a73c5e5e7
-MD5 (patch-ai) = 854e5d35fe75cb8d892e1d05804b004b
-MD5 (patch-aj) = 983e690d8b9a0812741d42d62cf48b0e
diff --git a/security/openssl/pkg/PLIST.common b/security/openssl/pkg/PLIST.common
index 0675f18df5b..d27c07f7ae6 100644
--- a/security/openssl/pkg/PLIST.common
+++ b/security/openssl/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2001/04/09 04:29:24 fredb Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2001/04/09 13:32:01 tron Exp $
 bin/CA.pl
 bin/CA.sh
 bin/asn1parse
@@ -108,8 +108,10 @@ include/openssl/hmac.h
 include/openssl/idea.h
 include/openssl/lhash.h
 include/openssl/md2.h
+include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
+include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
@@ -130,6 +132,7 @@ include/openssl/ssl2.h
 include/openssl/ssl23.h
 include/openssl/ssl3.h
 include/openssl/stack.h
+include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h