>Number:         22509
>Category:       pkg
>Synopsis:       pkgsrc/security/openssl assumes "make" command
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 17 03:14:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6.1_STABLE
>Organization:
http://bsd.reedmedia.net/
>Environment:
	
	
System: NetBSD rainier.reedmedia.net 1.6.1_STABLE NetBSD 1.6.1_STABLE (GENERIC) #0: Tue Aug 12 02:52:57 PDT 2003 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
pkgsrc/security/openssl has makefiles and perl script that
run "make". This will break the build if no "make" is in the path.
>How-To-Repeat:
Have only bmake (and gmake) and try to build pkgsrc/security/openssl.
>Fix:
Please let me know if I can commit this:

(My new patches are at end of this.)

? security/openssl/patches/patch-ak
? security/openssl/patches/patch-al
? security/openssl/patches/patch-am
? security/openssl/patches/patch-an
? security/openssl/patches/patch-ao
? security/openssl/patches/patch-ap
? security/openssl/patches/patch-aq
? security/openssl/patches/patch-ar
? security/openssl/patches/patch-as
Index: security/openssl//Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/Makefile,v
retrieving revision 1.75
diff -b -u -r1.75 Makefile
--- security/openssl//Makefile	2003/07/17 22:53:02	1.75
+++ security/openssl//Makefile	2003/08/16 19:07:11
@@ -22,6 +22,7 @@
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+MAKE_ENV+=		MAKE_PROGRAM="${MAKE_PROGRAM}"
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ARGS=		shared --openssldir=${PKG_SYSCONFDIR} --prefix=${PREFIX}
 CONFIGURE_ENV=		CC="${CC}" PERL="${PERL5}"
@@ -34,6 +35,11 @@
 CONF_FILES=		${PREFIX}/share/examples/openssl/openssl.cnf	\
 			${PKG_SYSCONFDIR}/openssl.cnf
 OWN_DIRS=		${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
+
+post-patch:
+	${SED} -e 's,@MAKE_PROGRAM@,${MAKE_PROGRAM},g' < ${WRKSRC}/Configure \
+		> ${WRKSRC}/Configure.tmp \
+		&& ${MV} ${WRKSRC}/Configure.tmp ${WRKSRC}/Configure
 
 do-configure:
 	cd ${WRKSRC}							\
Index: security/openssl//distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/distinfo,v
retrieving revision 1.18
diff -b -u -r1.18 distinfo
--- security/openssl//distinfo	2003/03/21 18:40:49	1.18
+++ security/openssl//distinfo	2003/08/16 19:07:11
@@ -6,11 +6,20 @@
 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-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
-SHA1 (patch-af) = fd470396c5f54ea2d333df44504c03e7c6c8dc96
+SHA1 (patch-ac) = 385844f4cb8540ebe65c3a4c4eafeee587225509
+SHA1 (patch-ad) = d89a5da50578415ef44c9a9b96f8e9b238e07941
+SHA1 (patch-ae) = 0999af9fc0fa726e9ca867d10ab356d572384847
+SHA1 (patch-af) = c2d1fa6ad5d747377496b6309735fc56a3afcbe0
 SHA1 (patch-ag) = d470c7da2cff7ba37ac38d6ceb79751a7d21d432
 SHA1 (patch-ah) = f8a6522c5e00605c47e149f8c70878960257c65a
 SHA1 (patch-ai) = 9d2e1dae0882450b7c10cdd2ea8156dced550c4a
 SHA1 (patch-aj) = 8c71a29e8f2cbbe9c105f9bec27f4dc1835f5338
+SHA1 (patch-ak) = b93bd9eec8c04dd6a0c62fecd48f848c3be39c9f
+SHA1 (patch-al) = 464bde501fd3aa5af66c9f43501796e3988adf9c
+SHA1 (patch-am) = 1da82aa0647b5aa6eab53fdba473a17a3b485e78
+SHA1 (patch-an) = f494580ae10683b355e3f577a681e80b80af48ba
+SHA1 (patch-ao) = 1d79e21c3d066989d75f6237310a0308d5dc1b91
+SHA1 (patch-ap) = b10b54bf8deee2a030acdfe450474448e599a5e2
+SHA1 (patch-aq) = 7830bf067080b903b5dae4caaa7b8e5be6eb6e6a
+SHA1 (patch-ar) = e607df571ecbc85efb14da06c2d1bcb03bcda64f
+SHA1 (patch-as) = af2c0403f16e2d4a86848ab01da01563d052b304
Index: security/openssl//patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-ac,v
retrieving revision 1.10
diff -b -u -r1.10 patch-ac
--- security/openssl//patches/patch-ac	2003/02/28 08:08:20	1.10
+++ security/openssl//patches/patch-ac	2003/08/16 19:07:13
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.10 2003/02/28 08:08:20 grant Exp $
+$NetBSD$
 
---- Configure.orig	Fri Aug  9 07:12:40 2002
+--- Configure.orig	Thu Aug  8 14:12:40 2002
 +++ Configure
 @@ -129,55 +129,6 @@ my %table=(
  "gcc",		"gcc:-O3::(unknown)::BN_LLONG:::",
@@ -89,11 +89,10 @@
  "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 @@ my %table=(
  ##### 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 @@
 +"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 @@ if($IsWindows) {
+ EOF
+ 	close(OUT);
+ } else {
+-	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?
++	(system "@MAKE_PROGRAM@ -f Makefile.ssl MAKE_PROGRAM=\'@MAKE_PROGRAM@\' 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
Index: security/openssl//patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-ad,v
retrieving revision 1.7
diff -b -u -r1.7 patch-ad
--- security/openssl//patches/patch-ad	2002/08/25 19:23:19	1.7
+++ security/openssl//patches/patch-ad	2003/08/16 19:07:13
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.7 2002/08/25 19:23:19 jlam Exp $
+$NetBSD$
 
---- apps/Makefile.ssl.orig	Tue Jul 30 04:29:57 2002
+--- apps/Makefile.ssl.orig	Thu Aug  8 14:13:36 2002
 +++ apps/Makefile.ssl
-@@ -99,11 +100,11 @@
+@@ -10,7 +10,7 @@ CFLAG=		-g -static
+ INSTALL_PREFIX=
+ INSTALLTOP=	/usr/local/ssl
+ OPENSSLDIR=	/usr/local/ssl
+-MAKE=		make -f Makefile.ssl
++MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ MAKEFILE=	Makefile.ssl
+ PERL=		perl
+@@ -99,11 +99,11 @@ install:
  	@for i in $(SCRIPTS); \
  	do  \
  	(echo installing $$i; \
Index: security/openssl//patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-ae,v
retrieving revision 1.6
diff -b -u -r1.6 patch-ae
--- security/openssl//patches/patch-ae	2002/08/25 19:23:19	1.6
+++ security/openssl//patches/patch-ae	2003/08/16 19:07:13
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2002/08/25 19:23:19 jlam Exp $
+$NetBSD$
 
---- tools/Makefile.ssl.orig	Thu Apr 29 16:52:08 1999
+--- tools/Makefile.ssl.orig	Thu Apr 29 14:52:08 1999
 +++ tools/Makefile.ssl
-@@ -31,8 +31,8 @@
+@@ -10,7 +10,7 @@ CFLAG=-g
+ INSTALL_PREFIX=
+ OPENSSLDIR=     /usr/local/ssl
+ INSTALLTOP=/usr/local/ssl
+-MAKE=		make -f Makefile.ssl
++MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+ MAKEFILE=	Makefile.ssl
+ 
+@@ -31,8 +31,8 @@ install:
  	done;
  	@for i in $(MISC_APPS) ; \
  	do  \
Index: security/openssl//patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/patches/patch-af,v
retrieving revision 1.6
diff -b -u -r1.6 patch-af
--- security/openssl//patches/patch-af	2002/08/25 19:23:19	1.6
+++ security/openssl//patches/patch-af	2003/08/16 19:07:13
@@ -1,17 +1,20 @@
-$NetBSD: patch-af,v 1.6 2002/08/25 19:23:19 jlam Exp $
+$NetBSD$
 
---- Makefile.org.orig	Fri Aug  9 06:43:56 2002
+--- Makefile.org.orig	Fri Aug  9 04:43:56 2002
 +++ Makefile.org
-@@ -169,7 +169,7 @@
+@@ -167,9 +167,9 @@ SDIRS=  \
+ 	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_PROGRAM) -f Makefile.ssl
  
 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(INSTALLTOP)/man
  MAN1=1
  MAN3=3
  SHELL=/bin/sh
-@@ -262,8 +262,7 @@
+@@ -262,8 +262,7 @@ do_gnu-shared:
  	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
  	( set -x; ${CC} ${SHARED_LDFLAGS} \
  		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -21,7 +24,7 @@
  		-Wl,--whole-archive lib$$i.a \
  		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
  	libs="$$libs -l$$i"; \
-@@ -632,10 +631,10 @@
+@@ -632,10 +631,10 @@ install: all install_docs
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \

My new patches security/openssl/patches/patch-a[k-s] here:


$NetBSD$

--- Makefile.ssl.orig	Fri Aug  9 04:45:26 2002
+++ Makefile.ssl
@@ -169,7 +169,7 @@ SDIRS=  \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 
 MAKEFILE= Makefile.ssl
-MAKE=     make -f Makefile.ssl
+MAKE=     $(MAKE_PROGRAM) -f Makefile.ssl
 
 MANDIR=$(OPENSSLDIR)/man
 MAN1=1
$NetBSD$

--- crypto/Makefile.orig	Thu Aug  8 14:14:05 2002
+++ crypto/Makefile
@@ -11,7 +11,7 @@ CFLAG=		-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=	/usr/local/ssl
-MAKE=           make -f Makefile.ssl
+MAKE=           $(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 RM=             rm -f
$NetBSD$

--- crypto/Makefile.ssl.orig	Thu Aug  8 14:14:05 2002
+++ crypto/Makefile.ssl
@@ -11,7 +11,7 @@ CFLAG=		-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=	/usr/local/ssl
-MAKE=           make -f Makefile.ssl
+MAKE=           $(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 RM=             rm -f
$NetBSD$

--- ssl/Makefile.orig	Thu Aug  8 14:17:41 2002
+++ ssl/Makefile
@@ -10,7 +10,7 @@ CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKE=		make -f Makefile.ssl
+MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
$NetBSD$

--- rsaref/Makefile.orig	Thu Aug  8 14:17:26 2002
+++ rsaref/Makefile
@@ -10,7 +10,7 @@ CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKE=		make -f Makefile.ssl
+MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
$NetBSD$

--- rsaref/Makefile.ssl.orig	Thu Aug  8 14:17:26 2002
+++ rsaref/Makefile.ssl
@@ -10,7 +10,7 @@ CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKE=		make -f Makefile.ssl
+MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
$NetBSD$

--- ssl/Makefile.ssl.orig	Thu Aug  8 14:17:41 2002
+++ ssl/Makefile.ssl
@@ -10,7 +10,7 @@ CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKE=		make -f Makefile.ssl
+MAKE=		$(MAKE_PROGRAM) -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
$NetBSD$

--- test/Makefile.orig	Thu Aug  8 14:18:13 2002
+++ test/Makefile
@@ -11,7 +11,7 @@ INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=	/usr/local/ssl
 MAKEFILE=	Makefile.ssl
-MAKE=		make -f $(MAKEFILE)
+MAKE=		$(MAKE_PROGRAM) -f $(MAKEFILE)
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 PERL=		perl
 
$NetBSD$

--- test/Makefile.ssl.orig	Thu Aug  8 14:18:13 2002
+++ test/Makefile.ssl
@@ -11,7 +11,7 @@ INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=	/usr/local/ssl
 MAKEFILE=	Makefile.ssl
-MAKE=		make -f $(MAKEFILE)
+MAKE=		$(MAKE_PROGRAM) -f $(MAKEFILE)
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 PERL=		perl
 
>Release-Note:
>Audit-Trail:
>Unformatted: