Several of the Makefile used in this package call 'make' directly. If

an operating system does not have a 'make' (ie only bmake), or if the OS
supplied 'make' is sufficiently broken (Irix), this will cause the build to
fail (interestingly enough apparently only if build as a dependency, not
if build from this directory).
Patch Makefiles to use @MAKE@, which then, after patching, is substituted with
the actual ${MAKE} (can't use "MAKE= ${MAKE} -f Makefile.ssl").

While here, tweak Irix configure a bit.

8 files changed, 102 insertions, 25 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 837bc52e2db..a8ce3d6cc71 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2003/07/17 22:53:02 grant Exp $
+# $NetBSD: Makefile,v 1.76 2003/08/25 16:34:00 jschauma Exp $
 
 DISTNAME=		openssl-0.9.6g
 PKGREVISION=		2
@@ -35,6 +35,17 @@ CONF_FILES=		${PREFIX}/share/examples/openssl/openssl.cnf	\
 			${PKG_SYSCONFDIR}/openssl.cnf
 OWN_DIRS=		${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
 
+SEDFILES=		Configure Makefile.org Makefile.ssl 		\
+			apps/Makefile.ssl crypto/Makefile.ssl		\
+			ssl/Makefile.ssl test/Makefile.ssl
+
+post-patch:
+	for i in ${SEDFILES}; do					\
+		${SED} -e "s/@MAKE@/${MAKE}/" ${WRKSRC}/$$i > 		\
+			${WRKSRC}/$$i.tmp && 				\
+		${MV} ${WRKSRC}/$$i.tmp ${WRKSRC}/$$i;			\
+	done;
+
 do-configure:
 	cd ${WRKSRC}							\
 		&& ${PERL5} util/perlpath.pl ${PERL5}			\
@@ -79,9 +90,12 @@ CONFIGURE_ARGS+=	solaris-${SPARC_TARGET_ARCH}-gcc
 .  else
 CONFIGURE_ARGS+=	solaris-${SPARC_TARGET_ARCH}-cc
 .  endif
-.elif ${OPSYS} == "IRIX" && ${ABI} == "64"
+.elif ${OPSYS} == "IRIX"
+CONFIGURE_ARGS+=	no-asm
+.  if ${ABI} == "64"
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS+=	irix64-mips4-cc
+.  endif
 .endif
 
 .include  "../../mk/bsd.pkg.mk"
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 7bba0e1b0af..a01de694bba 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2003/03/21 18:40:49 seb Exp $
+$NetBSD: distinfo,v 1.19 2003/08/25 16:34:00 jschauma Exp $
 
 SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
@@ -6,11 +6,14 @@ SHA1 (openssl-0.9.6g-20020810-netbsd.patch.gz) = 37cf5db32ba045b8a23af71ea95ab2f
 Size (openssl-0.9.6g-20020810-netbsd.patch.gz) = 27608 bytes
 SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea
 SHA1 (patch-ab) = 9bdac032996bd97834b00cb661f79c00dc31bac1
-SHA1 (patch-ac) = c4abbf586295810887d00b32db8c28bf064d8a9e
-SHA1 (patch-ad) = ee8283d5537edce1bb60470c616ebabfda0aa084
+SHA1 (patch-ac) = 64d300cbb4512777ddf3d253e53548e53f3be159
+SHA1 (patch-ad) = 120b9d451c5aa5f03dd4cf36d493507c3c570500
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
-SHA1 (patch-af) = fd470396c5f54ea2d333df44504c03e7c6c8dc96
+SHA1 (patch-af) = 238bb28deb134c2d9b8aa5a396ce9b54808d9aff
 SHA1 (patch-ag) = d470c7da2cff7ba37ac38d6ceb79751a7d21d432
 SHA1 (patch-ah) = f8a6522c5e00605c47e149f8c70878960257c65a
 SHA1 (patch-ai) = 9d2e1dae0882450b7c10cdd2ea8156dced550c4a
 SHA1 (patch-aj) = 8c71a29e8f2cbbe9c105f9bec27f4dc1835f5338
+SHA1 (patch-ak) = c81723aaecf28950159c5d4eff4b5db69c94d5db
+SHA1 (patch-al) = 2ad2516195ec5e0ee61342780c06c99ffe8ae5e3
+SHA1 (patch-am) = e485ea19915e90332f8282ac3d39d999ab7cd16a
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 59247dbe87b..032e3157a3a 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant Exp $
+$NetBSD: patch-ac,v 1.11 2003/08/25 16:34:01 jschauma Exp $
 
---- Configure.orig	Fri Aug  9 07:12:40 2002
-+++ Configure
-@@ -129,55 +129,6 @@ my %table=(
+--- Configure.orig	Sun Aug 24 15:03:44 2003
++++ Configure	Sun Aug 24 15:05:19 2003
+@@ -129,55 +129,6 @@
  "gcc",		"gcc:-O3::(unknown)::BN_LLONG:::",
  "cc",		"cc:-O::(unknown):::::",
  
@@ -58,7 +58,7 @@ $NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant Exp $
  # Sunos configs, assuming sparc for the gcc one.
  ##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown)::DES_UNROLL:::",
  "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",
-@@ -275,9 +226,6 @@ my %table=(
+@@ -275,9 +226,6 @@
  #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
  "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
  
@@ -68,7 +68,7 @@ $NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant Exp $
  # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
  # from the older DEC C Compiler to the newer compiler.  It's now the
  # same as the preferred entry, alpha-cc.  If you are still using the
-@@ -336,20 +284,6 @@ my %table=(
+@@ -336,20 +284,6 @@
  
  # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
  # bn86-elf.o file file since it is hand tweaked assembler.
@@ -89,11 +89,10 @@ $NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant 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}",
-@@ -500,6 +434,89 @@ my %table=(
- 
+@@ -501,6 +435,89 @@
  ##### VxWorks for various targets
  "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::",
-+
+ 
 +##### NetBSD
 +"NetBSD-alpha", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-arm32", "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)",
@@ -176,6 +175,16 @@ $NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant Exp $
 +"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
- 
++
  );
  
+ my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
+@@ -1188,7 +1205,7 @@
+ EOF
+ 	close(OUT);
+ } else {
+-	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?
++	(system "@MAKE@ -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?
+ 		if $symlink;
+ 	### (system 'make depend') == 0 or exit $? if $depflags ne "";
+ 	# Run "make depend" manually if you want to be able to delete
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index 6ab9b9ae7b9..20b519a4482 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.7 2002/08/25 19:23:19 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2003/08/25 16:34:02 jschauma Exp $
 
---- apps/Makefile.ssl.orig	Tue Jul 30 04:29:57 2002
-+++ apps/Makefile.ssl
-@@ -99,11 +100,11 @@
+--- apps/Makefile.ssl.orig	Thu Aug  8 14:13:36 2002
++++ apps/Makefile.ssl	Sun Aug 24 15:50:06 2003
+@@ -10,7 +10,7 @@
+ INSTALL_PREFIX=
+ INSTALLTOP=	/usr/local/ssl
+ OPENSSLDIR=	/usr/local/ssl
+-MAKE=		make -f Makefile.ssl
++MAKE=		@MAKE@ -f Makefile.ssl
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ MAKEFILE=	Makefile.ssl
+ PERL=		perl
+@@ -99,11 +99,11 @@
  	@for i in $(SCRIPTS); \
  	do  \
  	(echo installing $$i; \
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 5d84ef8a886..7bb4f24a0b3 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,10 +1,13 @@
-$NetBSD: patch-af,v 1.6 2002/08/25 19:23:19 jlam Exp $
+$NetBSD: patch-af,v 1.7 2003/08/25 16:34:02 jschauma Exp $
 
---- Makefile.org.orig	Fri Aug  9 06:43:56 2002
-+++ Makefile.org
-@@ -169,7 +169,7 @@
+--- Makefile.org.orig	Fri Aug  9 04:43:56 2002
++++ Makefile.org	Sun Aug 24 14:54:26 2003
+@@ -167,9 +167,9 @@
+ 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
+ 
  MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
+-MAKE=     make -f Makefile.ssl
++MAKE=     @MAKE@ -f Makefile.ssl
  
 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(INSTALLTOP)/man
diff --git a/security/openssl/patches/patch-ak b/security/openssl/patches/patch-ak
new file mode 100644
index 00000000000..3b55bef5b07
--- /dev/null
+++ b/security/openssl/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2003/08/25 16:34:02 jschauma Exp $
+
+--- crypto/Makefile.ssl.orig	Sun Aug 24 15:29:26 2003
++++ crypto/Makefile.ssl	Sun Aug 24 15:29:39 2003
+@@ -11,7 +11,7 @@
+ INSTALL_PREFIX=
+ OPENSSLDIR=     /usr/local/ssl
+ INSTALLTOP=	/usr/local/ssl
+-MAKE=           make -f Makefile.ssl
++MAKE=           @MAKE@ -f Makefile.ssl
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ MAKEFILE=       Makefile.ssl
+ RM=             rm -f
diff --git a/security/openssl/patches/patch-al b/security/openssl/patches/patch-al
new file mode 100644
index 00000000000..1aae5579ca5
--- /dev/null
+++ b/security/openssl/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2003/08/25 16:34:03 jschauma Exp $
+
+--- ssl/Makefile.ssl.orig	Sun Aug 24 16:20:45 2003
++++ ssl/Makefile.ssl	Sun Aug 24 16:21:04 2003
+@@ -10,7 +10,7 @@
+ INSTALL_PREFIX=
+ OPENSSLDIR=     /usr/local/ssl
+ INSTALLTOP=/usr/local/ssl
+-MAKE=		make -f Makefile.ssl
++MAKE=		@MAKE@ -f Makefile.ssl
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ MAKEFILE=	Makefile.ssl
+ AR=		ar r
diff --git a/security/openssl/patches/patch-am b/security/openssl/patches/patch-am
new file mode 100644
index 00000000000..e0f3f5fe448
--- /dev/null
+++ b/security/openssl/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2003/08/25 16:34:03 jschauma Exp $
+
+--- test/Makefile.ssl.orig	Sun Aug 24 18:02:52 2003
++++ test/Makefile.ssl	Sun Aug 24 18:03:05 2003
+@@ -11,7 +11,7 @@
+ OPENSSLDIR=     /usr/local/ssl
+ INSTALLTOP=	/usr/local/ssl
+ MAKEFILE=	Makefile.ssl
+-MAKE=		make -f $(MAKEFILE)
++MAKE=		@MAKE@ -f $(MAKEFILE)
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ PERL=		perl
+