Convert all patches to unified output format.

6 files changed, 226 insertions, 305 deletions

diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index bc16c500dc7..a0b9287f153 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 19:32:16 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/11 22:14:09 tron Exp $
 
 SHA1 (openssl-0.9.6.tar.gz) = d69c964d58535343787a3b8ac38a48772704304c
 Size (openssl-0.9.6.tar.gz) = 2086131 bytes
-SHA1 (patch-aa) = 19566be10971160b5ff6b17a256313d95e7ab184
-SHA1 (patch-ab) = 1c74693ced6166d9c281678a4b45830de9bf9d33
+SHA1 (patch-aa) = c96fb67876b9bd8b5c0c091de209d8f60498126b
+SHA1 (patch-ab) = c41b5fe664f0cb068ca28de7621fed48452127a1
 SHA1 (patch-ac) = 22520298de1a32ebc3c148f0785a5e9d7782c998
-SHA1 (patch-ad) = 86fabb4b2e1dbeab20e1fb2f4d6cc6018cfd7ab7
+SHA1 (patch-ad) = be4e7f2f93316ada2c1c95b3113dbcd9543c904d
 SHA1 (patch-ae) = f445d79ecc6b210ba42db8baf18d02041c8016f8
 SHA1 (patch-af) = 5d063c0354fa242e9e21530fc9d5d07f5774171a
 SHA1 (patch-ag) = e1b67db5a18e600c09386e319af0dccfd239f3ca
 SHA1 (patch-ah) = a668804efc7402dd014804397af13f95a2f8b6da
 SHA1 (patch-ai) = d0f21b594a3343567f7cbea00e71c5319a877782
-SHA1 (patch-aj) = 3a6b1ebc20c72adf2157cf9dbc3560003bd10666
-SHA1 (patch-ak) = 5365aa7901418d6e171f713e7fd4531ca4926d2b
+SHA1 (patch-aj) = 157a09410949f85f4a7b0bb878a382c8cd76772c
+SHA1 (patch-ak) = 61d1db5f0c41563a4b2fd2409d59dc45a400bb12
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index b6d91eb1797..cc3f49486d0 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,70 +1,51 @@
-*** config.orig	Thu Sep 21 04:23:14 2000
---- config	Sat Apr  7 12:38:53 2001
-***************
-*** 167,176 ****
-          echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
-          ;;
-  
-!     NetBSD:*:*:*386*)
-!         echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
-  	;;
-! 
-      NetBSD:*)
-  	echo "${MACHINE}-whatever-netbsd"; exit 0
-  	;;
---- 167,180 ----
-          echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
-          ;;
-  
-!     NetBSD:*:*:i386)
-! 	if echo __ELF__ | cc -E - | grep -q __ELF__; then
-! 	    echo "i386-whatever-netbsd"; exit 0
-! 	else
-! 	    echo "i386elf-whatever-netbsd"; exit 0
-! 	fi
-  	;;
-!   
-      NetBSD:*)
-  	echo "${MACHINE}-whatever-netbsd"; exit 0
-  	;;
-***************
-*** 330,335 ****
---- 334,340 ----
-    CC=cc
-  fi
-  
-+ if false; then
-  if [ "$SYSTEM" = "SunOS" ]; then
-    # check for WorkShop C, expected output is "cc: blah-blah C x.x"
-    CCVER=`(cc -V 2>&1) 2>/dev/null | \
-***************
-*** 347,352 ****
---- 352,358 ----
-      CC=sc3
-    fi
-  fi
-+ fi
-  
-  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
-    # check for Compaq C, expected output is "blah-blah C Vx.x"
-***************
-*** 454,462 ****
-    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
-    *-freebsd[1-2]*) OUT="FreeBSD" ;;
-!   *86*-*-netbsd) OUT="NetBSD-x86" ;;
-!   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
-!   *-*-netbsd) OUT="NetBSD-sparc" ;;
-    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
-    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
---- 460,468 ----
-    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
-    *-freebsd[1-2]*) OUT="FreeBSD" ;;
-!   *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;;
-!   *86-*-netbsd) OUT="NetBSD-i386" ;;
-!   *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
-    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
-    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+$NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
+
+--- config.orig	Thu Sep 21 11:23:14 2000
++++ config	Sat May 12 00:03:27 2001
+@@ -167,10 +167,14 @@
+         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
+         ;;
+ 
+-    NetBSD:*:*:*386*)
+-        echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
++    NetBSD:*:*:i386)
++	if echo __ELF__ | cc -E - | grep -q __ELF__; then
++	    echo "i386-whatever-netbsd"; exit 0
++	else
++	    echo "i386elf-whatever-netbsd"; exit 0
++	fi
+ 	;;
+-
++  
+     NetBSD:*)
+ 	echo "${MACHINE}-whatever-netbsd"; exit 0
+ 	;;
+@@ -330,6 +334,7 @@
+   CC=cc
+ fi
+ 
++if false; then
+ if [ "$SYSTEM" = "SunOS" ]; then
+   # check for WorkShop C, expected output is "cc: blah-blah C x.x"
+   CCVER=`(cc -V 2>&1) 2>/dev/null | \
+@@ -347,6 +352,7 @@
+     CC=sc3
+   fi
+ fi
++fi
+ 
+ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+   # check for Compaq C, expected output is "blah-blah C Vx.x"
+@@ -454,9 +460,9 @@
+   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
+   *-freebsd[1-2]*) OUT="FreeBSD" ;;
+-  *86*-*-netbsd) OUT="NetBSD-x86" ;;
+-  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
+-  *-*-netbsd) OUT="NetBSD-sparc" ;;
++  *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;;
++  *86-*-netbsd) OUT="NetBSD-i386" ;;
++  *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
+   *86*-*-openbsd) OUT="OpenBSD-x86" ;;
+   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
+   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
diff --git a/security/openssl/patches/patch-aj b/security/openssl/patches/patch-aj
index bc70fc46a55..19faff6cc56 100644
--- a/security/openssl/patches/patch-aj
+++ b/security/openssl/patches/patch-aj
@@ -1,26 +1,18 @@
-*** e_os.h.orig	Thu Sep 21 04:23:14 2000
---- e_os.h	Sat Apr  7 13:19:47 2001
-***************
-*** 1,4 ****
-- /* e_os.h */
-  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-   * All rights reserved.
-   *
---- 1,3 ----
-***************
-*** 297,303 ****
-         typedef unsigned long clock_t;
-  #    endif
-  
-! #    define OPENSSL_CONF	"openssl.cnf"
-  #    define SSLEAY_CONF		OPENSSL_CONF
-  #    define RFILE		".rnd"
-  #    define LIST_SEPARATOR_CHAR ':'
---- 296,302 ----
-         typedef unsigned long clock_t;
-  #    endif
-  
-! #    define OPENSSL_CONF	"etc/openssl.cnf"
-  #    define SSLEAY_CONF		OPENSSL_CONF
-  #    define RFILE		".rnd"
-  #    define LIST_SEPARATOR_CHAR ':'
+$NetBSD: patch-aj,v 1.5 2001/05/11 22:14:11 tron Exp $
+
+--- e_os.h.orig	Thu Sep 21 11:23:14 2000
++++ e_os.h	Sat May 12 00:03:27 2001
+@@ -1,4 +1,3 @@
+-/* e_os.h */
+ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  * All rights reserved.
+  *
+@@ -297,7 +296,7 @@
+        typedef unsigned long clock_t;
+ #    endif
+ 
+-#    define OPENSSL_CONF	"openssl.cnf"
++#    define OPENSSL_CONF	"etc/openssl.cnf"
+ #    define SSLEAY_CONF		OPENSSL_CONF
+ #    define RFILE		".rnd"
+ #    define LIST_SEPARATOR_CHAR ':'
diff --git a/security/openssl/patches/patch_netbsd-ab b/security/openssl/patches/patch_netbsd-ab
index a5d9ad9f4fd..523ae97a5cd 100644
--- a/security/openssl/patches/patch_netbsd-ab
+++ b/security/openssl/patches/patch_netbsd-ab
@@ -1,138 +1,108 @@
-*** Configure.orig	Sun Sep 24 10:27:37 2000
---- Configure	Sat Apr  7 12:56:24 2001
-***************
-*** 298,306 ****
-  "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
-  "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
-  "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
-- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
-  "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-  "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-  "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
---- 298,303 ----
-***************
-*** 327,332 ****
---- 324,343 ----
-  "aix-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown)::BN_LLONG RC4_CHAR:::",
-  "aix-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
-  
-+ # NetBSD
-+ "NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:",
-+ "NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-i386", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm:",
-+ "NetBSD-i386elf", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm:",
-+ "NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ "NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:",
-+ "NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+ 
-  #
-  # Cray T90 (SDSC)
-  # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
-***************
-*** 458,463 ****
---- 469,475 ----
-  my $openssl_other_defines;
-  my $libs;
-  my $target;
-+ my $xmakelib="";
-  my $options;
-  my $symlink;
-  
-***************
-*** 548,558 ****
-  			{
-  			$libs.= "-lRSAglue -lrsaref ";
-  			$flags.= "-DRSAref ";
-  			$openssl_other_defines .= "#define RSAref\n";
-  			}
-  		elsif (/^[-+]/)
-  			{
-! 			if (/^-[lL](.*)$/)
-  				{
-  				$libs.=$_." ";
-  				}
---- 560,571 ----
-  			{
-  			$libs.= "-lRSAglue -lrsaref ";
-  			$flags.= "-DRSAref ";
-+ 			$xmakelib=" libRSAglue.a";
-  			$openssl_other_defines .= "#define RSAref\n";
-  			}
-  		elsif (/^[-+]/)
-  			{
-!  			if (/^-([lLR]|Wl,)(.*)$/)
-  				{
-  				$libs.=$_." ";
-  				}
-***************
-*** 768,775 ****
-  
-  if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
-  	{
-! 	$major=$1;
-! 	$minor=$2;
-  	}
-  
-  if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
---- 781,789 ----
-  
-  if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
-  	{
-! 	# XXX Openssl version is 0.9, not 1.0
-! 	$major=1;
-! 	$minor=0;
-  	}
-  
-  if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
-***************
-*** 782,787 ****
---- 796,805 ----
-  open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
-  print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
-  my $sdirs=0;
-+ my $is_elf="0";
-+ if ($target =~ /.*elf.*/) {
-+ 	$is_elf="1";
-+ }
-  while (<IN>)
-  	{
-  	chop;
-***************
-*** 793,798 ****
---- 811,817 ----
-  			}
-  		}
-  	$sdirs = 0 unless /\\$/;
-+ 	s/^IS_ELF=.*/IS_ELF=$is_elf/;
-  	s/^VERSION=.*/VERSION=$version/;
-  	s/^MAJOR=.*/MAJOR=$major/;
-  	s/^MINOR=.*/MINOR=$minor/;
-***************
-*** 826,831 ****
---- 845,863 ----
-  	s/^SHLIB_MARK1=.*/SHLIB_MARK1=$shared_mark1/;
-  	s/^SHLIB_MARK2=.*/SHLIB_MARK2=$shared_mark2/;
-  	s/^LIBS=.*/LIBS=libcrypto\.so\* libssl\.so\*/ if (!$no_shared);
-+ 	print OUT $_."\n";
-+ 	}
-+ close(IN);
-+ close(OUT);
-+ 
-+ rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org";
-+ open(IN, '<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n";
-+ open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n";
-+ 
-+ while (<IN>)
-+ 	{
-+ 	chop;
-+ 	s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/;
-  	print OUT $_."\n";
-  	}
-  close(IN);
+$NetBSD: patch_netbsd-ab,v 1.3 2001/05/11 22:14:11 tron Exp $
+
+--- Configure.orig	Sun Sep 24 17:27:37 2000
++++ Configure	Sat May 12 00:03:27 2001
+@@ -298,9 +298,6 @@
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+ "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
+-"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+-"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+-"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+@@ -327,6 +324,20 @@
+ "aix-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown)::BN_LLONG RC4_CHAR:::",
+ "aix-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
+ 
++# NetBSD
++"NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:",
++"NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-i386", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm:",
++"NetBSD-i386elf", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm:",
++"NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++"NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:",
++"NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++
+ #
+ # Cray T90 (SDSC)
+ # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
+@@ -458,6 +469,7 @@
+ my $openssl_other_defines;
+ my $libs;
+ my $target;
++my $xmakelib="";
+ my $options;
+ my $symlink;
+ 
+@@ -548,11 +560,12 @@
+ 			{
+ 			$libs.= "-lRSAglue -lrsaref ";
+ 			$flags.= "-DRSAref ";
++			$xmakelib=" libRSAglue.a";
+ 			$openssl_other_defines .= "#define RSAref\n";
+ 			}
+ 		elsif (/^[-+]/)
+ 			{
+-			if (/^-[lL](.*)$/)
++ 			if (/^-([lLR]|Wl,)(.*)$/)
+ 				{
+ 				$libs.=$_." ";
+ 				}
+@@ -768,8 +781,9 @@
+ 
+ if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
+ 	{
+-	$major=$1;
+-	$minor=$2;
++	# XXX Openssl version is 0.9, not 1.0
++	$major=1;
++	$minor=0;
+ 	}
+ 
+ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
+@@ -782,6 +796,10 @@
+ open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
+ print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
+ my $sdirs=0;
++my $is_elf="0";
++if ($target =~ /.*elf.*/) {
++	$is_elf="1";
++}
+ while (<IN>)
+ 	{
+ 	chop;
+@@ -793,6 +811,7 @@
+ 			}
+ 		}
+ 	$sdirs = 0 unless /\\$/;
++	s/^IS_ELF=.*/IS_ELF=$is_elf/;
+ 	s/^VERSION=.*/VERSION=$version/;
+ 	s/^MAJOR=.*/MAJOR=$major/;
+ 	s/^MINOR=.*/MINOR=$minor/;
+@@ -826,6 +845,19 @@
+ 	s/^SHLIB_MARK1=.*/SHLIB_MARK1=$shared_mark1/;
+ 	s/^SHLIB_MARK2=.*/SHLIB_MARK2=$shared_mark2/;
+ 	s/^LIBS=.*/LIBS=libcrypto\.so\* libssl\.so\*/ if (!$no_shared);
++	print OUT $_."\n";
++	}
++close(IN);
++close(OUT);
++
++rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org";
++open(IN, '<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n";
++open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n";
++
++while (<IN>)
++	{
++	chop;
++	s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/;
+ 	print OUT $_."\n";
+ 	}
+ close(IN);
diff --git a/security/openssl/patches/patch_netbsd-ad b/security/openssl/patches/patch_netbsd-ad
index a10069db560..231086c686e 100644
--- a/security/openssl/patches/patch_netbsd-ad
+++ b/security/openssl/patches/patch_netbsd-ad
@@ -1,46 +1,30 @@
-*** Makefile.org.orig	Thu Sep 21 04:23:13 2000
---- Makefile.org	Sat Apr  7 13:13:26 2001
-***************
-*** 55,60 ****
---- 55,61 ----
-  CC= gcc
-  #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-  CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+ IS_ELF=0
-  DEPFLAG= 
-  PEX_LIBS= -L. -L.. -L../.. -L../../..
-  EX_LIBS= 
-***************
-*** 156,162 ****
-  SHLIB_MARK1=.shlib-clean.
-  SHLIB_MARK2=.shlib.
-  
-! DIRS=   crypto ssl rsaref $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
-  SHLIBDIRS= crypto ssl
-  
-  # dirs in crypto to build
---- 157,163 ----
-  SHLIB_MARK1=.shlib-clean.
-  SHLIB_MARK2=.shlib.
-  
-! DIRS=   rsaref crypto ssl $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
-  SHLIBDIRS= crypto ssl
-  
-  # dirs in crypto to build
-***************
-*** 205,211 ****
-  		need_shlib=false; \
-  	else \
-  		(cd $$i && echo "making all in $$i..." && \
-! 		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-  	fi; \
-  	done; \
-  	if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
---- 206,212 ----
-  		need_shlib=false; \
-  	else \
-  		(cd $$i && echo "making all in $$i..." && \
-!  		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' MAJOR='${MAJOR}' MINOR='${MINOR}' IS_ELF='${IS_ELF}' all ) || exit 1; \
-  	fi; \
-  	done; \
-  	if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
+$NetBSD: patch_netbsd-ad,v 1.3 2001/05/11 22:14:11 tron Exp $
+
+--- Makefile.org.orig	Thu Sep 21 11:23:13 2000
++++ Makefile.org	Sat May 12 00:03:27 2001
+@@ -55,6 +55,7 @@
+ CC= gcc
+ #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+ CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
++IS_ELF=0
+ DEPFLAG= 
+ PEX_LIBS= -L. -L.. -L../.. -L../../..
+ EX_LIBS= 
+@@ -156,7 +157,7 @@
+ SHLIB_MARK1=.shlib-clean.
+ SHLIB_MARK2=.shlib.
+ 
+-DIRS=   crypto ssl rsaref $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
++DIRS=   rsaref crypto ssl $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+@@ -205,7 +206,7 @@
+ 		need_shlib=false; \
+ 	else \
+ 		(cd $$i && echo "making all in $$i..." && \
+-		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
++ 		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' MAJOR='${MAJOR}' MINOR='${MINOR}' IS_ELF='${IS_ELF}' all ) || exit 1; \
+ 	fi; \
+ 	done; \
+ 	if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
diff --git a/security/openssl/patches/patch_netbsd-ak b/security/openssl/patches/patch_netbsd-ak
index db51e853795..2c847042f08 100644
--- a/security/openssl/patches/patch_netbsd-ak
+++ b/security/openssl/patches/patch_netbsd-ak
@@ -1,19 +1,13 @@
-*** apps/speed.c.orig	Sat Apr  7 13:33:11 2001
---- apps/speed.c	Sat Apr  7 13:32:37 2001
-***************
-*** 82,88 ****
-  #include <openssl/rand.h>
-  #include <openssl/err.h>
-  
-! #if defined(__FreeBSD__)
-  # define USE_TOD
-  #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
-  # define TIMES
---- 82,88 ----
-  #include <openssl/rand.h>
-  #include <openssl/err.h>
-  
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
-  # define USE_TOD
-  #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
-  # define TIMES
+$NetBSD: patch_netbsd-ak,v 1.2 2001/05/11 22:14:12 tron Exp $
+
+--- apps/speed.c.orig	Sun Sep 24 17:27:42 2000
++++ apps/speed.c	Sat May 12 00:03:27 2001
+@@ -82,7 +82,7 @@
+ #include <openssl/rand.h>
+ #include <openssl/err.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ # define USE_TOD
+ #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
+ # define TIMES