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.

6 files changed, 79 insertions, 19 deletions

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
+