Fix up a little rpath ELF lossage. Now this works on alpha.

3 files changed, 15 insertions, 6 deletions

diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index bf0a9a6f558..d4410ffd121 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/09/17 12:34:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/09/21 18:30:32 garbled Exp $
 # FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
 #
 
@@ -24,6 +24,12 @@ CONFIGURE_ARGS=		${MACHINE_ARCH}
 post-extract:
 	${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${FILESDIR}/NetBSD.sh \
 		> ${WRKSRC}/util/NetBSD.sh
+	chmod 755 ${WRKSRC}/util/NetBSD.sh
+
+post-patch:
+	@${CP} ${WRKSRC}/Configure foo
+	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <foo> ${WRKSRC}/Configure
+	@${RM} -f foo
 
 post-configure:
 	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
diff --git a/security/ssleay/files/NetBSD.sh b/security/ssleay/files/NetBSD.sh
index b3c0240d8c5..39fa1907e2a 100755
--- a/security/ssleay/files/NetBSD.sh
+++ b/security/ssleay/files/NetBSD.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: NetBSD.sh,v 1.3 1998/09/17 12:34:29 frueauf Exp $
+# $NetBSD: NetBSD.sh,v 1.4 1998/09/21 18:30:34 garbled Exp $
 
 @@@PREFIX@@@/bin/perl util/perlpath.pl @@@PREFIX@@@/bin
 @@@PREFIX@@@/bin/perl util/ssldir.pl @@@PREFIX@@@
@@ -14,6 +14,9 @@ case "$1" in
     m68k)
 	conf=NetBSD-m86	# yes, this really IS m86, not m68!
 	;;
+    alpha)
+	conf=NetBSD-alpha
+	;;
     *)
 	echo "Not supported on this architecture, sorry."
 	;;
diff --git a/security/ssleay/patches/patch-ac b/security/ssleay/patches/patch-ac
index de94d6c3b24..f9662a8b5b0 100644
--- a/security/ssleay/patches/patch-ac
+++ b/security/ssleay/patches/patch-ac
@@ -1,6 +1,6 @@
-$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
+$NetBSD: patch-ac,v 1.2 1998/09/21 18:30:33 garbled Exp $
+--- Configure.orig	Sat Sep 19 08:45:16 1998
++++ Configure	Sun Sep 20 08:45:45 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",
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 1998/09/17 00:48:02 garbled Exp $
 +"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::",
++"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:::",