Back out the make -> @MAKE@ -> ${MAKE} changes since we workaround the

bare "make" problem using tools.mk.

8 files changed, 12 insertions, 86 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index a8ce3d6cc71..e472412fd2d 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2003/08/25 16:34:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.77 2003/09/10 01:57:06 jlam Exp $
 
 DISTNAME=		openssl-0.9.6g
 PKGREVISION=		2
@@ -35,17 +35,6 @@ 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}			\
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index a01de694bba..bcc85b634b0 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2003/08/25 16:34:00 jschauma Exp $
+$NetBSD: distinfo,v 1.20 2003/09/10 01:57:06 jlam Exp $
 
 SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
@@ -6,14 +6,11 @@ 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) = 64d300cbb4512777ddf3d253e53548e53f3be159
-SHA1 (patch-ad) = 120b9d451c5aa5f03dd4cf36d493507c3c570500
+SHA1 (patch-ac) = cae2a44ac400833cef8b74fb051b5ef51a21436c
+SHA1 (patch-ad) = 950d57633fcb494564641f9b7e6385b96912c05d
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
-SHA1 (patch-af) = 238bb28deb134c2d9b8aa5a396ce9b54808d9aff
+SHA1 (patch-af) = 25481e491acd7c2e3cd9587fe038a37e41071a24
 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 032e3157a3a..73f55312be2 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2003/08/25 16:34:01 jschauma Exp $
+$NetBSD: patch-ac,v 1.12 2003/09/10 01:57:06 jlam Exp $
 
 --- Configure.orig	Sun Aug 24 15:03:44 2003
 +++ Configure	Sun Aug 24 15:05:19 2003
@@ -179,12 +179,3 @@ $NetBSD: patch-ac,v 1.11 2003/08/25 16:34:01 jschauma Exp $
  );
  
  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 20b519a4482..0c9f3f859ca 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,16 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2003/08/25 16:34:02 jschauma Exp $
+$NetBSD: patch-ad,v 1.9 2003/09/10 01:57:07 jlam Exp $
 
 --- 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  \
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 7bb4f24a0b3..42c0fc3e81f 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,13 +1,10 @@
-$NetBSD: patch-af,v 1.7 2003/08/25 16:34:02 jschauma Exp $
+$NetBSD: patch-af,v 1.8 2003/09/10 01:57:07 jlam Exp $
 
---- 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.org.orig	Fri Aug  9 07:43:56 2002
++++ Makefile.org	Tue Sep  9 21:37:22 2003
+@@ -169,7 +169,7 @@
  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
deleted file mode 100644
index 3b55bef5b07..00000000000
--- a/security/openssl/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 1aae5579ca5..00000000000
--- a/security/openssl/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index e0f3f5fe448..00000000000
--- a/security/openssl/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-