Move NetBSD only patches to a distribution patch file to avoid ugly

conditional patch hack.

8 files changed, 0 insertions, 215 deletions

diff --git a/security/openssl/patches/patch_netbsd-ab b/security/openssl/patches/patch_netbsd-ab
deleted file mode 100644
index 523ae97a5cd..00000000000
--- a/security/openssl/patches/patch_netbsd-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$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-ac b/security/openssl/patches/patch_netbsd-ac
deleted file mode 100644
index f6295facd2d..00000000000
--- a/security/openssl/patches/patch_netbsd-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch_netbsd-ac,v 1.1 2001/04/05 14:01:00 wiz Exp $
-
---- crypto/bn/Makefile.ssl.orig	Sun Jul 25 17:25:11 1999
-+++ crypto/bn/Makefile.ssl	Wed Oct 20 17:12:41 1999
-@@ -82,6 +82,9 @@
- # a.out
- asm/bn86-out.o: asm/bn86unix.cpp
- 	$(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o
-+# alpha
-+asm/alpha.o: asm/alpha.s
-+	as asm/alpha.s -o asm/alpha.o
- 
- asm/co86-out.o: asm/co86unix.cpp
- 	$(CPP) -DOUT asm/co86unix.cpp | as -o asm/co86-out.o
diff --git a/security/openssl/patches/patch_netbsd-ad b/security/openssl/patches/patch_netbsd-ad
deleted file mode 100644
index 231086c686e..00000000000
--- a/security/openssl/patches/patch_netbsd-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$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-ae b/security/openssl/patches/patch_netbsd-ae
deleted file mode 100644
index a36ff5660f9..00000000000
--- a/security/openssl/patches/patch_netbsd-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch_netbsd-ae,v 1.1 2001/04/05 14:01:00 wiz Exp $
-
---- crypto/Makefile.ssl.orig	Mon Aug  2 16:44:47 1999
-+++ crypto/Makefile.ssl	Wed Oct 20 17:31:16 1999
-@@ -48,6 +48,7 @@
- 	@(cd ..; $(MAKE) DIRS=$(DIR) all)
- 
- all: buildinf.h lib subdirs
-+	cd ${TOP} && csh ${MAKELIB} ${IS_ELF} libcrypto.so.${MAJOR}.${MINOR} libcrypto.a
- 
- buildinf.h: ../Makefile.ssl
- 	( echo "#ifndef MK1MF_BUILD"; \
diff --git a/security/openssl/patches/patch_netbsd-af b/security/openssl/patches/patch_netbsd-af
deleted file mode 100644
index 3353fb575dc..00000000000
--- a/security/openssl/patches/patch_netbsd-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch_netbsd-af,v 1.1 2001/04/05 14:01:01 wiz Exp $
-
---- ssl/Makefile.ssl.orig	Fri May 21 06:16:45 1999
-+++ ssl/Makefile.ssl	Wed Oct 20 17:31:33 1999
-@@ -52,6 +52,7 @@
- 	(cd ..; $(MAKE) DIRS=$(DIR) all)
- 
- all:	lib
-+	cd ${TOP} && csh ${MAKELIB} ${IS_ELF} libssl.so.${MAJOR}.${MINOR} libssl.a
- 
- lib:	$(LIBOBJ)
- 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/security/openssl/patches/patch_netbsd-ag b/security/openssl/patches/patch_netbsd-ag
deleted file mode 100644
index 4ddc5810c24..00000000000
--- a/security/openssl/patches/patch_netbsd-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch_netbsd-ag,v 1.1 2001/04/05 14:01:01 wiz Exp $
-
---- apps/Makefile.ssl.orig	Mon Jun 21 05:04:37 1999
-+++ apps/Makefile.ssl	Thu Oct 21 00:09:56 1999
-@@ -18,7 +18,7 @@
- PEX_LIBS=
- EX_LIBS= 
- 
--CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
-+CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG:N*PIC)
- 
- GENERAL=Makefile makeapps.com install.com
- 
diff --git a/security/openssl/patches/patch_netbsd-ah b/security/openssl/patches/patch_netbsd-ah
deleted file mode 100644
index a91c0f55c9a..00000000000
--- a/security/openssl/patches/patch_netbsd-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch_netbsd-ah,v 1.1 2001/04/05 14:01:02 wiz Exp $
-
---- test/Makefile.ssl.orig	Thu Aug  5 06:50:18 1999
-+++ test/Makefile.ssl	Thu Oct 21 00:09:58 1999
-@@ -17,7 +17,7 @@
- PEX_LIBS=
- EX_LIBS= #-lnsl -lsocket
- 
--CFLAGS= $(INCLUDES) $(CFLAG)
-+CFLAGS= $(INCLUDES) $(CFLAG:N*PIC)
- 
- GENERAL=Makefile.ssl maketests.com \
- 	tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \
diff --git a/security/openssl/patches/patch_netbsd-ak b/security/openssl/patches/patch_netbsd-ak
deleted file mode 100644
index 2c847042f08..00000000000
--- a/security/openssl/patches/patch_netbsd-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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