Make this pkg compile on alpha. (thanks to Ross for the asm) Clean out

the Makefile.patch, there is a better way..

6 files changed, 56 insertions, 22 deletions

diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index 08848c5fa62..75a997f6ed1 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/09/05 09:05:21 explorer Exp $
+# $NetBSD: Makefile,v 1.4 1998/09/17 00:48:02 garbled Exp $
 # FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
 #
 
@@ -9,7 +9,7 @@ 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=		i386 sparc m68k
+ONLY_FOR_ARCHS=		i386 sparc m68k alpha
 DEPENDS=		rsaref-2.0:../../security/rsaref
 
 USE_PERL5=		yes
@@ -26,7 +26,6 @@ post-extract:
 
 post-configure:
 	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
-	(${PATCH} <${FILESDIR}/Makefile.patch)
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/ssleay/files/Makefile.patch b/security/ssleay/files/Makefile.patch
deleted file mode 100644
index 0f9f40728fc..00000000000
--- a/security/ssleay/files/Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- work/SSLeay-0.9.0b/Makefile.ssl~	Thu Sep  3 23:42:25 1998
-+++ work/SSLeay-0.9.0b/Makefile.ssl	Thu Sep  3 23:44:46 1998
-@@ -61,9 +61,9 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall
--PEX_LIBS= -L. -L.. -L../.. -L../../..
--EX_LIBS= 
-+CFLAG= -DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -m486 -Wall # -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+PEX_LIBS= -L. -L.. -L../.. -L../../.. -L/usr/pkg/lib
-+EX_LIBS= -lRSAglue -lrsaref
- AR=ar r
- 
- # Set BN_MULW to bn_mulw.o if you want to use the C version
diff --git a/security/ssleay/patches/patch-ab b/security/ssleay/patches/patch-ab
index d512e085457..87d42ce4faa 100644
--- a/security/ssleay/patches/patch-ab
+++ b/security/ssleay/patches/patch-ab
@@ -1,7 +1,15 @@
-$NetBSD: patch-ab,v 1.2 1998/09/05 09:05:22 explorer Exp $
-
---- Makefile.ssl.orig	Fri Jun 26 10:25:25 1998
-+++ Makefile.ssl	Sat Aug 22 13:14:34 1998
+$NetBSD: patch-ab,v 1.3 1998/09/17 00:48:02 garbled Exp $
+--- Makefile.ssl.orig	Fri Jun 26 01:25:25 1998
++++ Makefile.ssl	Wed Sep 16 14:33:49 1998
+@@ -62,7 +62,7 @@
+ 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/usr/pkg/lib
+ EX_LIBS= 
+ AR=ar r
+ 
 @@ -175,7 +175,7 @@
  	VERSION PROBLEMS MINFO makefile.one e_os.h \
  	MICROSOFT makevms.com config PATENTS
diff --git a/security/ssleay/patches/patch-ac b/security/ssleay/patches/patch-ac
new file mode 100644
index 00000000000..de94d6c3b24
--- /dev/null
+++ b/security/ssleay/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 1998/09/17 00:48:02 garbled Exp $
+--- Configure.orig	Wed Sep 16 14:09:55 1998
++++ Configure	Wed Sep 16 14:19:53 1998
+@@ -129,9 +129,10 @@
+ "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-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-x86",	"gcc:-DTERMIOS -DRSAref -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:-lRSAglue -lrsaref:BN_LLONG $x86_gcc_des $x86_gcc_opts:",
++"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -DL_ENDIAN -O3:-lRSAglue -lrsaref:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
+ "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
new file mode 100644
index 00000000000..d529ac803fb
--- /dev/null
+++ b/security/ssleay/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1998/09/17 00:48:02 garbled 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 @@
+ # 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
+ 
+ # bsdi
+ asm/bn86bsdi.o: asm/bn86unix.cpp
diff --git a/security/ssleay/patches/patch-ae b/security/ssleay/patches/patch-ae
new file mode 100644
index 00000000000..4f2f39df9ec
--- /dev/null
+++ b/security/ssleay/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 1998/09/17 00:48:02 garbled 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 @@
+ 	addq	$8,$3,$3	# c+=carry
+ 
+ 	cmpult	$3,$8,$8	# did we overflow?
+-	 stq	$3,($16)	# r[0]=c
++	 stq	$3,0($16)	# r[0]=c
+ 
+ 	addq	$7,$8,$8	# add into overflow
+ 	 subq	$19,1,$19	# loop--