Clean up:

- make this work on all arches (use C where no equivalent asm is
  available).  Since the arch specifics are determined by `uname', set
  ONLY_FOR_ARCHS to the full list of current architectures.
- don't use various methods of editing (patch, sed) where pulling values
  from the environment and using CONFIGURE_ENV/MAKE_ENV will suffice.
- use %D to get the value of $PREFIX in the PLIST; the PLIST doesn't need
  to be sed edited to get this as part of an @exec!
- use pmake's += construct to add rsaref-specific stuff, instead of adding
  "extra" patches.

Now works on arm32, but probably not on alpha and sparc64 (tests fail on
alpha; likely type-sizing problems, and still looking at that).

7 files changed, 68 insertions, 77 deletions

diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index e96c03a3028..5f4ce89a298 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/10/02 03:22:57 cjs Exp $
+# $NetBSD: Makefile,v 1.10 1998/10/02 22:02:25 tv Exp $
 # FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
 #
 #  Note that the config file goes in ${PREFIX}/lib; this cannot easily
@@ -13,7 +13,8 @@ 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 alpha
+ONLY_FOR_ARCHS=		alpha arm32 i386 m68k mips mipse[bl] ns32k powerpc \
+			sparc sparc64 vax
 
 USE_PERL5=		yes
 
@@ -23,16 +24,17 @@ MIRROR_DISTFILE=	no
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	util/NetBSD.sh
 CONFIGURE_ARGS=		${MACHINE_ARCH}
+CONFIGURE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 
-PLIST_SRC=	${WRKSRC}/PLIST
-.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-PLIST_SRC+=	${PKGDIR}/PLIST.rsaref2
-.endif
+PLIST_SRC=	${PKGDIR}/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 DEPENDS=		rsaref-2.0:../../security/rsaref
+CONFIGURE_ENV+=		USE_RSAREF_DEF=-DRSAref
+MAKE_ENV+=		USE_RSAREF=YES
+PLIST_SRC+=		${PKGDIR}/PLIST.rsaref2
 .endif
 
 fetch-depends:
@@ -43,31 +45,16 @@ fetch-depends:
 	@${ECHO} license MUST set this variable to YES.  Users outside
 	@${ECHO} the USA MUST set this variable to NO.  RSA licensees may
 	@${ECHO} choose -- NO is faster.
-	@${ECHO}
-	@${ECHO} You may also want to set DONT_USE_IDEA to YES if this program
-	@${ECHO} will be used for a commercial purpose.  There are other
-	@${ECHO} configure options\; look at the pkg Makefile for more info.
 	@${FALSE}
 .endif
 
 post-extract:
-	${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${FILESDIR}/NetBSD.sh \
-		> ${WRKSRC}/util/NetBSD.sh
-	chmod 755 ${WRKSRC}/util/NetBSD.sh
-	${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${PKGDIR}/PLIST \
-		> ${WRKSRC}/PLIST
-
-post-patch:
-	@${CP} ${WRKSRC}/Configure ${WRKSRC}/foo
-	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <${WRKSRC}/foo> ${WRKSRC}/Configure
-	@${RM} -f ${WRKSRC}/foo
+	@${CP} -f ${FILESDIR}/NetBSD.sh ${WRKSRC}/util/
+	@chmod +x ${WRKSRC}/util/NetBSD.sh
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 post-configure:
-	patch -d ${WRKSRC} <files/patch-rsaref-1
-	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <files/patch-rsaref-2 |\
-	    patch -d ${WRKSRC}
-	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
+	@${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
 .endif
 
 post-install:
diff --git a/security/ssleay/files/NetBSD.sh b/security/ssleay/files/NetBSD.sh
index 39fa1907e2a..b15c806f025 100755
--- a/security/ssleay/files/NetBSD.sh
+++ b/security/ssleay/files/NetBSD.sh
@@ -1,24 +1,33 @@
 #!/bin/sh
-# $NetBSD: NetBSD.sh,v 1.4 1998/09/21 18:30:34 garbled Exp $
+# $NetBSD: NetBSD.sh,v 1.5 1998/10/02 22:02:26 tv Exp $
 
-@@@PREFIX@@@/bin/perl util/perlpath.pl @@@PREFIX@@@/bin
-@@@PREFIX@@@/bin/perl util/ssldir.pl @@@PREFIX@@@
+$LOCALBASE/bin/perl util/perlpath.pl $LOCALBASE/bin
+$LOCALBASE/bin/perl util/ssldir.pl $PREFIX
 
 case "$1" in
+    arm32|mips|mipsel|ns32k|vax)
+	conf=NetBSD-gle32 # use C routines for little-endian, 32 bit pointers
+	;;
+    mipseb|powerpc)
+	conf=NetBSD-gbe32 # use C routines for big-endian, 32 bit pointers
+	;;
+    alpha)
+	conf=NetBSD-alpha
+	;;
     i386)
 	conf=NetBSD-x86
 	;;
-    sparc)
-	conf=NetBSD-sparc
-	;;
     m68k)
 	conf=NetBSD-m86	# yes, this really IS m86, not m68!
 	;;
-    alpha)
-	conf=NetBSD-alpha
+    sparc)
+	conf=NetBSD-sparc
+	;;
+    sparc64)
+	conf=NetBSD-sparc64
 	;;
     *)
 	echo "Not supported on this architecture, sorry."
 	;;
 esac
-@@@PREFIX@@@/bin/perl Configure $conf
+$LOCALBASE/bin/perl Configure $conf
diff --git a/security/ssleay/files/patch-rsaref-1 b/security/ssleay/files/patch-rsaref-1
deleted file mode 100644
index b30b2c17566..00000000000
--- a/security/ssleay/files/patch-rsaref-1
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-rsaref-1,v 1.1 1998/09/30 20:08:21 cjs Exp $
---- Makefile.ssl.orig	Fri Jun 26 01:25:25 1998
-+++ Makefile.ssl	Wed Sep 16 14:33:49 1998
-@@ -175,7 +175,7 @@
- 	VERSION PROBLEMS MINFO makefile.one e_os.h \
- 	MICROSOFT makevms.com config PATENTS
- WDIRS=  windows
--LIBS=   libcrypto.a libssl.a 
-+LIBS=	libcrypto.a libssl.a libRSAglue.a
- 
- GENERAL=        Makefile
- BASENAME=       SSLeay
diff --git a/security/ssleay/files/patch-rsaref-2 b/security/ssleay/files/patch-rsaref-2
deleted file mode 100644
index 4288eeea829..00000000000
--- a/security/ssleay/files/patch-rsaref-2
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-rsaref-2,v 1.1 1998/09/30 20:08:22 cjs Exp $
---- Configure.orig	Sat Sep 19 08:45:16 1998
-+++ Configure	Sun Sep 20 08:45:45 1998
-@@ -129,10 +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 -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"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 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::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 -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-+"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 -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
-+"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib -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-ab b/security/ssleay/patches/patch-ab
index afc382ce799..51eeb70bba7 100644
--- a/security/ssleay/patches/patch-ab
+++ b/security/ssleay/patches/patch-ab
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.6 1998/10/02 03:22:57 cjs Exp $
---- Makefile.ssl.orig	Fri Jun 26 01:25:25 1998
-+++ Makefile.ssl	Wed Sep 16 14:33:49 1998
+$NetBSD: patch-ab,v 1.7 1998/10/02 22:02:26 tv Exp $
+
+--- Makefile.ssl.orig	Fri Jun 26 04:25:25 1998
++++ Makefile.ssl	Fri Oct  2 16:00:53 1998
 @@ -62,7 +62,7 @@
  CC= cc
  #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
@@ -10,7 +11,18 @@ $NetBSD: patch-ab,v 1.6 1998/10/02 03:22:57 cjs Exp $
  EX_LIBS= 
  AR=ar r
  
-@@ -327,5 +327,6 @@
+@@ -176,6 +176,10 @@
+ 	MICROSOFT makevms.com config PATENTS
+ WDIRS=  windows
+ LIBS=   libcrypto.a libssl.a 
++.if defined(USE_RSAREF)
++LIBS+=	libRSAglue.a
++EX_LIBS+=-lRSAglue -lrsaref
++.endif
+ 
+ GENERAL=        Makefile
+ BASENAME=       SSLeay
+@@ -327,5 +331,6 @@
  		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
  		chmod 644 $(INSTALLTOP)/lib/$$i ); \
  	done
diff --git a/security/ssleay/patches/patch-ac b/security/ssleay/patches/patch-ac
index 5a965fbb8ec..6ef8a757b8a 100644
--- a/security/ssleay/patches/patch-ac
+++ b/security/ssleay/patches/patch-ac
@@ -1,17 +1,30 @@
-$NetBSD: patch-ac,v 1.3 1998/09/30 20:08:22 cjs Exp $
---- Configure.orig	Sat Sep 19 08:45:16 1998
-+++ Configure	Sun Sep 20 08:45:45 1998
-@@ -129,9 +129,10 @@
+$NetBSD: patch-ac,v 1.4 1998/10/02 22:02:26 tv Exp $
+
+--- Configure.orig	Fri Oct  2 15:42:57 1998
++++ Configure	Fri Oct  2 15:53:52 1998
+@@ -38,6 +38,8 @@
+ # RMD160_ASM	use some extra ripemd160 assember,
+ # BN_ASM	use some extra bn assember,
+ 
++$use_rsaref_def=$ENV{'USE_RSAREF_DEF'};
++
+ $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
+ 
+ # MD2_CHAR slags pentium pros
+@@ -129,9 +131,13 @@
  "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-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -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-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -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-x86",	"gcc:-DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-+"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
++"NetBSD-gbe32", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-gle32", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-alpha", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -Wall -DL_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
++"NetBSD-sparc", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-sparc64", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-Wl,-R$ENV{'PREFIX'}/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC1:::",
++"NetBSD-m86", "gcc:$use_rsaref_def -DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-x86", "gcc:$use_rsaref_def -DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
  "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/pkg/PLIST b/security/ssleay/pkg/PLIST
index 4a4de1dc4b9..bbc07ecf80e 100644
--- a/security/ssleay/pkg/PLIST
+++ b/security/ssleay/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/10/02 03:22:57 cjs Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/10/02 22:02:26 tv Exp $
 bin/ssleay
 bin/asn1parse
 bin/base64
@@ -171,5 +171,5 @@ share/doc/SSLeay/threads.doc
 share/doc/SSLeay/txt_db.doc
 share/doc/SSLeay/verify
 share/doc/SSLeay/why.doc
-@exec if [ ! -f @@@PREFIX@@@/lib/ssleay.cnf ]; then echo "Installing ssleay.cnf in @@@PREFIX@@@/lib." ; cp -p @@@PREFIX@@@/lib/ssleay.cnf.eg @@@PREFIX@@@/lib/ssleay.cnf; fi
+@exec if [ ! -f %D/lib/ssleay.cnf ]; then echo "Installing ssleay.cnf in %D/lib." ; cp -p %D/lib/ssleay.cnf.eg %D/lib/ssleay.cnf; fi
 @dirrm share/doc/SSLeay