13 files changed, 333 insertions, 152 deletions
diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index 5f4ce89a298..93049c50091 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.10 1998/10/02 22:02:25 tv Exp $
-# FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
-#
-#  Note that the config file goes in ${PREFIX}/lib; this cannot easily
-#  be changed to etc without modifing a bunch of code on the software
-#  itself, due to certain assumptions it makes. [cjs]
+# $NetBSD: Makefile,v 1.11 1998/12/03 17:29:58 tv Exp $
 #
 
 DISTNAME=		SSLeay-0.9.0b
+# Lower case differentiates the new (shared lib) pkg from the old one.
+# Since the directory name is lower case, it should stay this way.
+PKGNAME=		ssleay-0.9.0b
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
 MAINTAINER=		explorer@netbsd.org
 HOMEPAGE=		http://www.psy.uq.oz.au/~ftp/Crypto/
 
-ONLY_FOR_ARCHS=		alpha arm32 i386 m68k mips mipse[bl] ns32k powerpc \
-			sparc sparc64 vax
+CONFLICTS=		SSLeay-*
+
+NOT_FOR_ARCHS=		alpha *64
 
 USE_PERL5=		yes
 
 RESTRICTED=		"Crypto; export-controlled"
 MIRROR_DISTFILE=	no
 
+USE_LIBTOOL=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	util/NetBSD.sh
 CONFIGURE_ARGS=		${MACHINE_ARCH}
@@ -34,7 +34,7 @@ PLIST_SRC=	${PKGDIR}/PLIST
 DEPENDS=		rsaref-2.0:../../security/rsaref
 CONFIGURE_ENV+=		USE_RSAREF_DEF=-DRSAref
 MAKE_ENV+=		USE_RSAREF=YES
-PLIST_SRC+=		${PKGDIR}/PLIST.rsaref2
+LDFLAGS+=		-L${PREFIX}/lib -lrsaref
 .endif
 
 fetch-depends:
@@ -52,15 +52,42 @@ post-extract:
 	@${CP} -f ${FILESDIR}/NetBSD.sh ${WRKSRC}/util/
 	@chmod +x ${WRKSRC}/util/NetBSD.sh
 
-.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 post-configure:
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 	@${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
 .endif
+	@cd ${WRKSRC}/perl && PREFIX=${PREFIX} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/SSLeay
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/SSLeay
-.endif
+post-build:
+	@cd ${WRKSRC}/perl && ${MAKE}
+
+do-install:
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/apps/ssleay ${PREFIX}/bin/
+	@cd ${PREFIX}/bin && ${SH} ${WRKSRC}/apps/mklinks
+	cd ${WRKSRC}/tools && ${INSTALL_SCRIPT} \
+		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/
+	${INSTALL_SCRIPT} ${WRKSRC}/apps/CA.sh ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/apps/ssleay.cnf ${PREFIX}/etc/ssleay.cnf.example
+	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libcrypto.la ${PREFIX}/lib/
+	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libssl.la ${PREFIX}/lib/
+	${INSTALL_DATA_DIR} ${PREFIX}/include/ssleay
+	cd ${WRKSRC}/include && ${INSTALL_DATA} \
+		asn1.h asn1_mac.h bio.h blowfish.h bn.h bss_file.c \
+		buffer.h cast.h conf.h cryptall.h cryptlib.h crypto.h \
+		des.h dh.h dsa.h e_os.h err.h evp.h hmac.h idea.h lhash.h \
+		md2.h md5.h mdc2.h objects.h pem.h pkcs7.h rand.h rc2.h \
+		rc4.h rc5.h ripemd.h rsa.h sha.h ssl.h ssl2.h ssl23.h \
+		ssl3.h stack.h tls1.h txt_db.h x509.h x509_vfy.h \
+		${PREFIX}/include/ssleay/
+	${LN} -sf ../etc/ssleay.cnf ${PREFIX}/lib/ssleay.cnf
+	@cd ${WRKSRC}/perl && ${MAKE} install
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssleay
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/ssleay
+	${INSTALL_DATA_DIR} ${PREFIX}/certs ${PREFIX}/private
+	@if [ ! -f ${PREFIX}/etc/ssleay.cnf ]; then \
+		${CP} -p ${PREFIX}/etc/ssleay.cnf.example ${PREFIX}/etc/ssleay.cnf; \
+	fi
 
 .include  "../../mk/bsd.pkg.mk"
diff --git a/security/ssleay/patches/patch-aa b/security/ssleay/patches/patch-aa
new file mode 100644
index 00000000000..73cbbdad95c
--- /dev/null
+++ b/security/ssleay/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.5 1998/12/03 17:29:59 tv Exp $
+
+--- apps/mklinks.orig	Wed Dec  2 19:50:11 1998
++++ apps/mklinks	Wed Dec  2 19:50:16 1998
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-for i in verify asn1parse req dgst dh enc gendh errstr ca crl rsa dsa dsaparam x509 genrsa s_server s_client speed s_time version pkcs7 crl2pkcs7 sess_id ciphers md2 md5 sha sha1 mdc2 base64 des des3 desx idea rc4 rc2 bf cast rc5 des-ecb des-ede des-ede3 des-cbc des-ede-cbc des-ede3-cbc des-cfb des-ede-cfb des-ede3-cfb des-ofb des-ede-ofb des-ede3-ofb idea-cbc idea-ecb idea-cfb idea-ofb rc2-cbc rc2-ecb rc2-cfb rc2-ofb bf-cbc bf-ecb bf-cfb bf-ofb cast5-cbc cast5-ecb cast5-cfb cast5-ofb cast-cbc rc5-cbc rc5-ecb rc5-cfb rc5-ofb 
++for i in verify asn1parse req dgst dh enc gendh errstr ca crl rsa dsa dsaparam x509 genrsa s_server s_client speed s_time version pkcs7 crl2pkcs7 sess_id ciphers md2 sha sha1 mdc2 base64 des des3 desx idea rc4 rc2 bf cast rc5 des-ecb des-ede des-ede3 des-cbc des-ede-cbc des-ede3-cbc des-cfb des-ede-cfb des-ede3-cfb des-ofb des-ede-ofb des-ede3-ofb idea-cbc idea-ecb idea-cfb idea-ofb rc2-cbc rc2-ecb rc2-cfb rc2-ofb bf-cbc bf-ecb bf-cfb bf-ofb cast5-cbc cast5-ecb cast5-cfb cast5-ofb cast-cbc rc5-cbc rc5-ecb rc5-cfb rc5-ofb 
+ do
+ echo making symlink for $i
+ /bin/rm -f $i
diff --git a/security/ssleay/patches/patch-ab b/security/ssleay/patches/patch-ab
index 51eeb70bba7..fbb46ef5d80 100644
--- a/security/ssleay/patches/patch-ab
+++ b/security/ssleay/patches/patch-ab
@@ -1,31 +1,35 @@
-$NetBSD: patch-ab,v 1.7 1998/10/02 22:02:26 tv Exp $
+$NetBSD: patch-ab,v 1.8 1998/12/03 17:29:59 tv Exp $
 
 --- Makefile.ssl.orig	Fri Jun 26 04:25:25 1998
-+++ Makefile.ssl	Fri Oct  2 16:00:53 1998
-@@ -62,7 +62,7 @@
++++ Makefile.ssl	Thu Dec  3 07:37:42 1998
+@@ -1,6 +1,6 @@
+ #
+ # Makefile for all the SSL related library routines and utilities
+-VERSION = 0.9.0a
++VERSION = 0.9.0b
+ #
+ # make install will install:
+ #   libraries into $INSTALLTOP/lib
+@@ -62,9 +62,12 @@
  CC= cc
  #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
  CFLAG= -O -DNOPROTO
 -PEX_LIBS= -L. -L.. -L../.. -L../../..
-+PEX_LIBS= -L. -L.. -L../.. -L../../.. -L${PREFIX}/lib
++PEX_LIBS= 
  EX_LIBS= 
  AR=ar r
- 
-@@ -176,6 +176,10 @@
- 	MICROSOFT makevms.com config PATENTS
- WDIRS=  windows
- LIBS=   libcrypto.a libssl.a 
 +.if defined(USE_RSAREF)
-+LIBS+=	libRSAglue.a
-+EX_LIBS+=-lRSAglue -lrsaref
++EX_LIBS+=-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lrsaref
 +.endif
  
- GENERAL=        Makefile
- BASENAME=       SSLeay
-@@ -327,5 +331,6 @@
- 		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
- 		chmod 644 $(INSTALLTOP)/lib/$$i ); \
- 	done
-+	cp apps/ssleay.cnf $(INSTALLTOP)/lib/ssleay.cnf.eg
+ # Set BN_MULW to bn_mulw.o if you want to use the C version
+ BN_MULW= bn_mulw.o
+@@ -147,7 +150,7 @@
+ #RMD160_ASM_OBJ= asm/rm86-out.o       # a.out, FreeBSD
+ #RMD160_ASM_OBJ= asm/rm86bsdi.o       # bsdi
  
- # DO NOT DELETE THIS LINE -- make depend depends on it.
+-DIRS=   crypto ssl rsaref apps test tools
++DIRS=   rsaref crypto ssl apps test tools
+ # dirs in crypto to build
+ SDIRS=  \
+ 	md2 md5 sha mdc2 hmac ripemd \
diff --git a/security/ssleay/patches/patch-ac b/security/ssleay/patches/patch-ac
index 6ef8a757b8a..5a553a7f627 100644
--- a/security/ssleay/patches/patch-ac
+++ b/security/ssleay/patches/patch-ac
@@ -1,30 +1,31 @@
-$NetBSD: patch-ac,v 1.4 1998/10/02 22:02:26 tv Exp $
+$NetBSD: patch-ac,v 1.5 1998/12/03 17:29:59 tv Exp $
 
---- Configure.orig	Fri Oct  2 15:42:57 1998
-+++ Configure	Fri Oct  2 15:53:52 1998
-@@ -38,6 +38,8 @@
+--- Configure.orig	Tue Dec  1 10:49:58 1998
++++ Configure	Tue Dec  1 10:51:42 1998
+@@ -38,6 +38,9 @@
  # RMD160_ASM	use some extra ripemd160 assember,
  # BN_ASM	use some extra bn assember,
  
 +$use_rsaref_def=$ENV{'USE_RSAREF_DEF'};
++$LIBTOOL=$ENV{'LIBTOOL'};
 +
  $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
  
  # MD2_CHAR slags pentium pros
-@@ -129,9 +131,13 @@
+@@ -129,9 +132,13 @@
  "linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
  "debug-linux-elf","gcc:-DREF_CHECK -DBN_ASM -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-lefence:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
  "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 -"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 -"NetBSD-m86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 -"NetBSD-x86",	"gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-+"NetBSD-gbe32", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-gle32", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-alpha", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
-+"NetBSD-sparc", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-sparc64", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC1:::",
-+"NetBSD-m86", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-x86", "gcc:$use_rsaref_def -DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
++"NetBSD-gbe32", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-gle32", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-alpha", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC1:::",
++"NetBSD-sparc", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-sparc64", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC1:::",
++"NetBSD-m86", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-x86", "$LIBTOOL gcc:$use_rsaref_def -DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
  "FreeBSD",   "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
  #"bsdi-gcc",     "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
  "nextstep",	"cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
diff --git a/security/ssleay/patches/patch-ad b/security/ssleay/patches/patch-ad
index d529ac803fb..fc55f67cc84 100644
--- a/security/ssleay/patches/patch-ad
+++ b/security/ssleay/patches/patch-ad
@@ -1,4 +1,5 @@
-$NetBSD: patch-ad,v 1.1 1998/09/17 00:48:02 garbled Exp $
+$NetBSD: patch-ad,v 1.2 1998/12/03 17:29:59 tv Exp $
+
 --- crypto/bn/Makefile.ssl.orig	Wed Sep 16 15:46:15 1998
 +++ crypto/bn/Makefile.ssl	Wed Sep 16 15:50:42 1998
 @@ -74,6 +74,9 @@
diff --git a/security/ssleay/patches/patch-ae b/security/ssleay/patches/patch-ae
index 4f2f39df9ec..25f6403d9c6 100644
--- a/security/ssleay/patches/patch-ae
+++ b/security/ssleay/patches/patch-ae
@@ -1,4 +1,5 @@
-$NetBSD: patch-ae,v 1.1 1998/09/17 00:48:02 garbled Exp $
+$NetBSD: patch-ae,v 1.2 1998/12/03 17:29:59 tv Exp $
+
 --- crypto/bn/asm/alpha.s.orig	Wed Sep 16 15:41:18 1998
 +++ crypto/bn/asm/alpha.s	Wed Sep 16 15:41:28 1998
 @@ -195,7 +195,7 @@
diff --git a/security/ssleay/patches/patch-af b/security/ssleay/patches/patch-af
new file mode 100644
index 00000000000..9fb727ca1fc
--- /dev/null
+++ b/security/ssleay/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 1998/12/03 17:30:00 tv Exp $
+
+--- crypto/Makefile.ssl.orig	Thu Apr  9 11:47:17 1998
++++ crypto/Makefile.ssl	Wed Dec  2 19:31:29 1998
+@@ -52,7 +52,7 @@
+ top:
+ 	@(cd ..; $(MAKE) DIRS=$(DIR) all)
+ 
+-all: date.h lib subdirs
++all: date.h subdirs lib
+ 
+ date.h: ../Makefile.ssl ../VERSION
+ 	echo "#define DATE	\"`date`\"" >date.h
+@@ -85,9 +85,15 @@
+ 	$(MAKE) links ); \
+ 	done;
+ 
++OBJDIRS=crypto
++.if defined(USE_RSAREF)
++OBJDIRS+=rsaref
++.endif
++
+ lib:	$(LIBOBJ)
+-	$(AR) $(LIB) $(LIBOBJ)
+-	sh $(TOP)/util/ranlib.sh $(LIB)
++	rm -f ../libcrypto.a
++	(cd ..; ${CC} -o libcrypto.la `find ${OBJDIRS} -name '*.lo'|grep -v ctx_size` \
++		-version-info 0:0 -rpath ${PREFIX}/lib)
+ 	@touch lib
+ 
+ libs:
diff --git a/security/ssleay/patches/patch-ag b/security/ssleay/patches/patch-ag
new file mode 100644
index 00000000000..ce7f01cc961
--- /dev/null
+++ b/security/ssleay/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 1998/12/03 17:30:00 tv Exp $
+
+--- ssl/Makefile.ssl.orig	Tue Dec  1 12:11:18 1998
++++ ssl/Makefile.ssl	Tue Dec  1 12:26:31 1998
+@@ -54,8 +54,8 @@
+ all:	lib
+ 
+ lib:	$(LIBOBJ)
+-	$(AR) $(LIB) $(LIBOBJ)
+-	sh $(TOP)/util/ranlib.sh $(LIB)
++	(cd ..; ${CC} -o libssl.la ${LIBOBJ:S/^/ssl\//:S/.o$/.lo/} \
++		-version-info 0:0 -rpath ${PREFIX}/lib)
+ 	@touch lib
+ 
+ files:
diff --git a/security/ssleay/patches/patch-ah b/security/ssleay/patches/patch-ah
new file mode 100644
index 00000000000..28967ed10dc
--- /dev/null
+++ b/security/ssleay/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 1998/12/03 17:30:00 tv Exp $
+
+--- apps/Makefile.ssl.orig	Tue Dec  1 12:44:14 1998
++++ apps/Makefile.ssl	Tue Dec  1 12:44:44 1998
+@@ -22,8 +22,8 @@
+ 
+ DLIBCRYPTO=../libcrypto.a
+ DLIBSSL=../libssl.a
+-LIBCRYPTO=-L.. -lcrypto
+-LIBSSL=-L.. -lssl
++LIBCRYPTO=../libcrypto.la
++LIBSSL=../libssl.la
+ 
+ SSLEAY= ssleay
+ 
diff --git a/security/ssleay/patches/patch-ai b/security/ssleay/patches/patch-ai
new file mode 100644
index 00000000000..92c6ef358cc
--- /dev/null
+++ b/security/ssleay/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 1998/12/03 17:30:01 tv Exp $
+
+--- perl/Makefile.PL.orig	Wed Dec  2 19:59:49 1998
++++ perl/Makefile.PL	Wed Dec  2 20:18:14 1998
+@@ -1,12 +1,14 @@
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
++$libs = "-L../.libs -L$ENV{'PREFIX'}/lib -lssl -lcrypto";
++$libs .= "-lrsaref" if $ENV{'USE_RSAREF_DEF'} ne '';
+ WriteMakefile(
+ 	'OPTIMIZE'	=> '-g',
+ 	'DISTNAME'	=> 'SSLeay-perl5-0.8.5',
+ 	'NAME'		=> 'SSLeay',
+ 	'VERSION_FROM'	=> 'SSLeay.pm',
+-	'LIBS'		=> ['-L.. -lssl -lcrypto'],
++	'LIBS'		=> [$libs],
+ 	'DEFINE'	=> '',
+ 	'INC'		=> '-I../include',
+ 	'C'		=> ['callback.c'],
diff --git a/security/ssleay/patches/patch-aj b/security/ssleay/patches/patch-aj
new file mode 100644
index 00000000000..19ebfc12e7a
--- /dev/null
+++ b/security/ssleay/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 1998/12/03 17:30:01 tv Exp $
+
+--- test/Makefile.ssl.orig	Tue Dec  1 16:30:35 1998
++++ test/Makefile.ssl	Tue Dec  1 16:30:57 1998
+@@ -21,8 +21,8 @@
+ 
+ DLIBCRYPTO= ../libcrypto.a
+ DLIBSSL= ../libssl.a
+-LIBCRYPTO= -L.. -lcrypto
+-LIBSSL= -L.. -lssl
++LIBCRYPTO= ../libcrypto.la
++LIBSSL= ../libssl.la
+ 
+ BNTEST=		bntest
+ EXPTEST=	exptest
diff --git a/security/ssleay/pkg/PLIST b/security/ssleay/pkg/PLIST
index bbc07ecf80e..3016efe246d 100644
--- a/security/ssleay/pkg/PLIST
+++ b/security/ssleay/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 1998/10/02 22:02:26 tv Exp $
-bin/ssleay
+@comment $NetBSD: PLIST,v 1.7 1998/12/03 17:30:01 tv Exp $
+bin/CA.sh
 bin/asn1parse
 bin/base64
 bin/bf
@@ -7,6 +7,11 @@ bin/bf-cbc
 bin/bf-cfb
 bin/bf-ecb
 bin/bf-ofb
+bin/c_hash
+bin/c_info
+bin/c_issuer
+bin/c_name
+bin/c_rehash
 bin/ca
 bin/cast
 bin/cast-cbc
@@ -17,6 +22,7 @@ bin/cast5-ofb
 bin/ciphers
 bin/crl
 bin/crl2pkcs7
+bin/der_chop
 bin/des
 bin/des-cbc
 bin/des-cfb
@@ -46,7 +52,6 @@ bin/idea-cfb
 bin/idea-ecb
 bin/idea-ofb
 bin/md2
-bin/md5
 bin/mdc2
 bin/pkcs7
 bin/rc2
@@ -69,107 +74,144 @@ bin/sess_id
 bin/sha
 bin/sha1
 bin/speed
+bin/ssleay
 bin/verify
 bin/version
 bin/x509
-bin/CA.sh
-bin/der_chop
-bin/c_hash
-bin/c_info
-bin/c_issuer
-bin/c_name
-bin/c_rehash
-include/crypto.h
-include/cryptall.h
-include/md2.h
-include/md5.h
-include/sha.h
-include/mdc2.h
-include/hmac.h
-include/ripemd.h
-include/des.h
-include/rc2.h
-include/rc4.h
-include/rc5.h
-include/idea.h
-include/blowfish.h
-include/cast.h
-include/bn.h
-include/rsa.h
-include/dsa.h
-include/dh.h
-include/buffer.h
-include/bio.h
-include/bss_file.c
-include/stack.h
-include/lhash.h
-include/rand.h
-include/err.h
-include/objects.h
-include/evp.h
-include/pem.h
-include/asn1.h
-include/asn1_mac.h
-include/x509.h
-include/x509_vfy.h
-include/conf.h
-include/txt_db.h
-include/pkcs7.h
-include/ssl.h
-include/ssl2.h
-include/ssl3.h
-include/ssl23.h
-include/tls1.h
-lib/ssleay.cnf.eg
+etc/ssleay.cnf.example
+@exec if [ -f %D/etc/ssleay.cnf ]; then; else cp -p %D/%F %D/etc/ssleay.cnf; fi
+include/ssleay/asn1.h
+include/ssleay/asn1_mac.h
+include/ssleay/bio.h
+include/ssleay/blowfish.h
+include/ssleay/bn.h
+include/ssleay/bss_file.c
+include/ssleay/buffer.h
+include/ssleay/cast.h
+include/ssleay/conf.h
+include/ssleay/cryptall.h
+include/ssleay/cryptlib.h
+include/ssleay/crypto.h
+include/ssleay/des.h
+include/ssleay/dh.h
+include/ssleay/dsa.h
+include/ssleay/err.h
+include/ssleay/evp.h
+include/ssleay/e_os.h
+include/ssleay/hmac.h
+include/ssleay/idea.h
+include/ssleay/lhash.h
+include/ssleay/md2.h
+include/ssleay/md5.h
+include/ssleay/mdc2.h
+include/ssleay/objects.h
+include/ssleay/pem.h
+include/ssleay/pkcs7.h
+include/ssleay/rand.h
+include/ssleay/rc2.h
+include/ssleay/rc4.h
+include/ssleay/rc5.h
+include/ssleay/ripemd.h
+include/ssleay/rsa.h
+include/ssleay/sha.h
+include/ssleay/ssl.h
+include/ssleay/ssl2.h
+include/ssleay/ssl23.h
+include/ssleay/ssl3.h
+include/ssleay/stack.h
+include/ssleay/tls1.h
+include/ssleay/txt_db.h
+include/ssleay/x509.h
+include/ssleay/x509_vfy.h
 lib/libcrypto.a
+lib/libcrypto.so.0.0
 lib/libssl.a
-share/doc/SSLeay/API.doc
-share/doc/SSLeay/a_verify.doc
-share/doc/SSLeay/apps.doc
-share/doc/SSLeay/asn1.doc
-share/doc/SSLeay/bio.doc
-share/doc/SSLeay/blowfish.doc
-share/doc/SSLeay/bn.doc
-share/doc/SSLeay/ca.1
-share/doc/SSLeay/callback.doc
-share/doc/SSLeay/cipher.doc
-share/doc/SSLeay/cipher.m
-share/doc/SSLeay/conf.doc
-share/doc/SSLeay/des.doc
-share/doc/SSLeay/digest.doc
-share/doc/SSLeay/encode.doc
-share/doc/SSLeay/envelope.doc
-share/doc/SSLeay/error.doc
-share/doc/SSLeay/idea.doc
-share/doc/SSLeay/legal.doc
-share/doc/SSLeay/lhash.doc
-share/doc/SSLeay/md2.doc
-share/doc/SSLeay/md5.doc
-share/doc/SSLeay/memory.doc
-share/doc/SSLeay/ms3-ca.doc
-share/doc/SSLeay/ns-ca.doc
-share/doc/SSLeay/obj.doc
-share/doc/SSLeay/rand.doc
-share/doc/SSLeay/rc2.doc
-share/doc/SSLeay/rc4.doc
-share/doc/SSLeay/readme
-share/doc/SSLeay/ref.doc
-share/doc/SSLeay/req.1
-share/doc/SSLeay/rsa.doc
-share/doc/SSLeay/rsaref.doc
-share/doc/SSLeay/s_mult.doc
-share/doc/SSLeay/session.doc
-share/doc/SSLeay/sha.doc
-share/doc/SSLeay/speed.doc
-share/doc/SSLeay/ssl-ciph.doc
-share/doc/SSLeay/ssl.doc
-share/doc/SSLeay/ssl_ctx.doc
-share/doc/SSLeay/ssleay.doc
-share/doc/SSLeay/ssluse.doc
-share/doc/SSLeay/stack.doc
-share/doc/SSLeay/threads.doc
-share/doc/SSLeay/txt_db.doc
-share/doc/SSLeay/verify
-share/doc/SSLeay/why.doc
-@exec if [ ! -f %D/lib/ssleay.cnf ]; then echo "Installing ssleay.cnf in %D/lib." ; cp -p %D/lib/ssleay.cnf.eg %D/lib/ssleay.cnf; fi
-@dirrm share/doc/SSLeay
+lib/libssl.so.0.0
+lib/perl5/site_perl/SSLeay.pm
+lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/SSLeay/.packlist
+lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/SSLeay/SSLeay.bs
+lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/SSLeay/SSLeay.so
+lib/perl5/site_perl/b.pl
+lib/perl5/site_perl/bio.pl
+lib/perl5/site_perl/bn.pl
+lib/perl5/site_perl/cipher.pl
+lib/perl5/site_perl/dh.pl
+lib/perl5/site_perl/f.pl
+lib/perl5/site_perl/g.pl
+lib/perl5/site_perl/gen_rsa.pl
+lib/perl5/site_perl/mul.pl
+lib/perl5/site_perl/r.pl
+lib/perl5/site_perl/s.pl
+lib/perl5/site_perl/s2.pl
+lib/perl5/site_perl/ss.pl
+lib/perl5/site_perl/ssl.pl
+lib/perl5/site_perl/ssl_srvr.pl
+lib/perl5/site_perl/sslbio.pl
+lib/perl5/site_perl/t.pl
+lib/perl5/site_perl/test2.pl
+lib/perl5/site_perl/test3.pl
+lib/perl5/site_perl/test8.pl
+lib/perl5/site_perl/test9.pl
+lib/perl5/site_perl/testbn.pl
+lib/perl5/site_perl/testdec.pl
+lib/perl5/site_perl/testmd.pl
+lib/perl5/site_perl/tt.pl
+lib/perl5/site_perl/y.pl
+lib/perl5/site_perl/yy.pl
+lib/perl5/site_perl/z.pl
+lib/perl5/site_perl/zz.pl
+share/doc/ssleay/API.doc
+share/doc/ssleay/a_verify.doc
+share/doc/ssleay/apps.doc
+share/doc/ssleay/asn1.doc
+share/doc/ssleay/bio.doc
+share/doc/ssleay/blowfish.doc
+share/doc/ssleay/bn.doc
+share/doc/ssleay/ca.1
+share/doc/ssleay/callback.doc
+share/doc/ssleay/cipher.doc
+share/doc/ssleay/cipher.m
+share/doc/ssleay/conf.doc
+share/doc/ssleay/des.doc
+share/doc/ssleay/digest.doc
+share/doc/ssleay/encode.doc
+share/doc/ssleay/envelope.doc
+share/doc/ssleay/error.doc
+share/doc/ssleay/idea.doc
+share/doc/ssleay/legal.doc
+share/doc/ssleay/lhash.doc
+share/doc/ssleay/md2.doc
+share/doc/ssleay/md5.doc
+share/doc/ssleay/memory.doc
+share/doc/ssleay/ms3-ca.doc
+share/doc/ssleay/ns-ca.doc
+share/doc/ssleay/obj.doc
+share/doc/ssleay/rand.doc
+share/doc/ssleay/rc2.doc
+share/doc/ssleay/rc4.doc
+share/doc/ssleay/readme
+share/doc/ssleay/ref.doc
+share/doc/ssleay/req.1
+share/doc/ssleay/rsa.doc
+share/doc/ssleay/rsaref.doc
+share/doc/ssleay/s_mult.doc
+share/doc/ssleay/session.doc
+share/doc/ssleay/sha.doc
+share/doc/ssleay/speed.doc
+share/doc/ssleay/ssl-ciph.doc
+share/doc/ssleay/ssl.doc
+share/doc/ssleay/ssl_ctx.doc
+share/doc/ssleay/ssleay.doc
+share/doc/ssleay/ssluse.doc
+share/doc/ssleay/stack.doc
+share/doc/ssleay/threads.doc
+share/doc/ssleay/txt_db.doc
+share/doc/ssleay/verify
+share/doc/ssleay/why.doc
+@exec ln -sf ../etc/ssleay.cnf %D/lib/ssleay.cnf
+@unexec rm -f %D/lib/ssleay.cnf
+@exec mkdir -p %D/certs %D/private
+@dirrm certs
+@dirrm include/ssleay
+@dirrm private
+@dirrm share/doc/ssleay
diff --git a/security/ssleay/pkg/PLIST.rsaref2 b/security/ssleay/pkg/PLIST.rsaref2
deleted file mode 100644
index 6b0b70be9c8..00000000000
--- a/security/ssleay/pkg/PLIST.rsaref2
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.rsaref2,v 1.1 1998/09/30 20:08:22 cjs Exp $
-lib/libRSAglue.a