Make compile on Interix. No-op change for other platforms, so no PKGREVISION

bump.  (Main MI change:  -soname -> -h, as some GNU ld(1) wants --soname
instead of -soname, but -h works on all GNU ld(1) versions.)

4 files changed, 36 insertions, 13 deletions

diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 57b3bd9875f..4bedb5d9298 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2004/03/29 13:49:42 seb Exp $
+$NetBSD: distinfo,v 1.30 2004/04/25 20:36:11 tv Exp $
 
 SHA1 (openssl-0.9.6m.tar.gz) = 52414b8867944e2c35940142d38052544dab1358
 Size (openssl-0.9.6m.tar.gz) = 2184918 bytes
-SHA1 (patch-aa) = be92618c7288abe45ed08afe77db2c2a263bc353
+SHA1 (patch-aa) = 52276d38e21e625832be89064a5325b1ed4ceba4
 SHA1 (patch-ab) = cfbcaa52bec88987b8a63725b84adfd58b324032
-SHA1 (patch-ac) = e0a6c1b2923e75e87fae54631240d5dce7afd017
+SHA1 (patch-ac) = 51079a3a9a1e489f337d66d08f10cfc956a689b1
 SHA1 (patch-ad) = 44acd3ba563095511267b09a7b56774bb3b90b1d
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
-SHA1 (patch-af) = f37700c5fc04e2e59e525b5fb37986ba27c0080a
+SHA1 (patch-af) = 44fc5a1eee74128a66d98e195a490b88d69958de
 SHA1 (patch-aj) = e300ae91c19214faf3419e7499214a1b536aac18
 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index e9bf6b8e825..0f05e1734b6 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.13 2004/03/26 02:22:38 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2004/04/25 20:36:11 tv Exp $
 
---- config.orig	Thu Nov 14 17:30:29 2002
+--- config.orig	Thu Nov 14 11:30:29 2002
 +++ config
-@@ -588,8 +588,8 @@ EOF
+@@ -139,6 +139,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+ 	echo "mips4-sgi-irix64"; exit 0
+ 	;;
+ 
++    Interix:3.*)
++	echo "i386-pc-interix3"; exit 0
++	;;
++
+     Linux:[2-9].*)
+ 	echo "${MACHINE}-whatever-linux2"; exit 0
+ 	;;
+@@ -588,8 +592,9 @@ EOF
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
    *86*-*-netbsd) OUT="NetBSD-x86" ;;
@@ -10,6 +21,7 @@ $NetBSD: patch-aa,v 1.13 2004/03/26 02:22:38 wiz Exp $
 -  *-*-netbsd) OUT="NetBSD-sparc" ;;
 +  sun3*-*-netbsd) OUT="NetBSD-m68k" ;;
 +  *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
++  *-*-interix3) OUT="Interix3" ;;
    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 7ca8b00cacb..6db2aecd968 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.16 2004/03/26 02:22:38 wiz Exp $
+$NetBSD: patch-ac,v 1.17 2004/04/25 20:36:11 tv Exp $
 
---- Configure.orig	Thu Jan 29 00:59:17 2004
+--- Configure.orig	Sun Apr 25 13:07:42 2004
 +++ Configure
 @@ -129,55 +129,6 @@ my %table=(
  "gcc",		"gcc:-O3::(unknown)::BN_LLONG:::",
@@ -89,7 +89,7 @@ $NetBSD: patch-ac,v 1.16 2004/03/26 02:22:38 wiz Exp $
  "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "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}",
-@@ -507,6 +441,89 @@ my %table=(
+@@ -507,6 +441,91 @@ my %table=(
  ##### Compaq Non-Stop Kernel (Tandem)
  "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown)::THIRTY_TWO_BIT:::",
  
@@ -108,6 +108,8 @@ $NetBSD: patch-ac,v 1.16 2004/03/26 02:22:38 wiz Exp $
 + "NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 + "NetBSD-x86",	"gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
++"Interix3","gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM %64/2*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
 +##### Solaris (pkgsrc)
 +
 +#### Solaris x86 setups
@@ -179,7 +181,7 @@ $NetBSD: patch-ac,v 1.16 2004/03/26 02:22:38 wiz Exp $
  );
  
  my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
-@@ -680,7 +697,7 @@ PROCESS_ARGS:
+@@ -680,7 +699,7 @@ PROCESS_ARGS:
  			}
  		elsif (/^[-+]/)
  			{
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 5c9ef11306c..241f4a9472c 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.10 2004/03/26 08:13:24 jlam Exp $
+$NetBSD: patch-af,v 1.11 2004/04/25 20:36:11 tv Exp $
 
 --- Makefile.org.orig	Thu Jul  3 17:43:50 2003
 +++ Makefile.org
@@ -17,10 +17,19 @@ $NetBSD: patch-af,v 1.10 2004/03/26 08:13:24 jlam Exp $
  		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 -		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 -		-Wl,-Bsymbolic \
-+		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR} \
++		-Wl,-h,lib$$i.so.${SHLIB_MAJOR} \
  		-Wl,--whole-archive lib$$i.a \
  		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
  	libs="$$libs -l$$i"; \
+@@ -449,7 +448,7 @@ do_hpux64-shared:
+ #  HP/UX-64bit: +forceload
+ #  AIX:		-bnogc
+ # SHAREDFLAGS would be:
+-#  GNU systems: -shared -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
++#  GNU systems: -shared -Wl,-h,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+ #  Tru64 Unix:  -shared \
+ #		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
+ #  Solaris:     -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 @@ -636,14 +635,14 @@ dist:   
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)