If we have to choose if this works on Solaris or NetBSD, prefer NetBSD.

XXX: This needs some work. How to handle platform-dependent patches?
What's the problem with using the NetBSD patches on Solaris?

3 files changed, 40 insertions, 37 deletions

diff --git a/security/openssl/files/patch-sum b/security/openssl/files/patch-sum
index 76c0b1b5d40..8bf865a107c 100644
--- a/security/openssl/files/patch-sum
+++ b/security/openssl/files/patch-sum
@@ -1,5 +1,12 @@
-$NetBSD: patch-sum,v 1.9 2001/01/14 01:51:53 tron Exp $
+$NetBSD: patch-sum,v 1.10 2001/01/17 10:09:51 wiz Exp $
 
-MD5 (patch-aa) = c6b002717bebe0c6ddec2712b24af6e1
+MD5 (patch-aa) = 650f90da97a7bfd8ab35438a73c5e5e7
+MD5 (patch-ab) = f73f5683fed98a1f72f0ac3723b227cd
+MD5 (patch-ac) = d5a887ca7ddc1d41e133adc9a0f7656c
+MD5 (patch-ad) = c122f902d4a133643a921c9f653dfb8e
+MD5 (patch-ae) = c9f265f64112b3084724098a9fd067b3
+MD5 (patch-af) = 8e9d113f2eb57e38aa4a72e25b53bd12
+MD5 (patch-ag) = 7974ea53bbf2b6bc27d60759a51fa671
+MD5 (patch-ah) = 6aa582063a0c12937e8c8e5c866ac9f5
 MD5 (patch-ai) = 854e5d35fe75cb8d892e1d05804b004b
 MD5 (patch-aj) = 983e690d8b9a0812741d42d62cf48b0e
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 6d4517c354d..7f4f72fd4a3 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,7 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2001/01/14 01:51:12 tron Exp $
+$NetBSD: patch-aa,v 1.5 2001/01/17 10:09:51 wiz Exp $
 
---- config.orig	Tue Mar 14 00:52:44 2000
-+++ config	Sun Jan 14 02:10:07 2001
+--- config.orig	Mon Aug  9 05:16:51 1999
++++ config
+@@ -155,8 +155,12 @@
+         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
+         ;;
+ 
+-    NetBSD:*:*:*386*)
+-        echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-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:*)
 @@ -324,6 +324,7 @@
    CC=cc
  fi
@@ -18,3 +33,16 @@ $NetBSD: patch-aa,v 1.4 2001/01/14 01:51:12 tron Exp $
  fi
  
  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+@@ -404,9 +408,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.netbsd-aa b/security/openssl/patches/patch.netbsd-aa
deleted file mode 100644
index 67de59f53d9..00000000000
--- a/security/openssl/patches/patch.netbsd-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
-@@ -155,8 +155,12 @@
-         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
-         ;;
- 
--    NetBSD:*:*:*386*)
--        echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-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:*)
-@@ -404,9 +408,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" ;;