Honour ZOULARISBASE, rather than expecting bmake in ${PREFIX}/bsd/bin.

This should work with the Zoularis kit and the bootstrap kit.

XXX The patches should go into 1.11.

4 files changed, 39 insertions, 3 deletions

diff --git a/pkgtools/gensolpkg/Makefile b/pkgtools/gensolpkg/Makefile
index b2f210cba2e..e8c3c00cafd 100644
--- a/pkgtools/gensolpkg/Makefile
+++ b/pkgtools/gensolpkg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2002/01/11 17:38:45 seb Exp $
+# $NetBSD: Makefile,v 1.16 2002/11/23 20:55:21 cjep Exp $
 #
 
 DISTNAME=	gensolpkg-1.10
+PKGREVISION=	1
 CATEGORIES=	pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -11,7 +12,7 @@ COMMENT=	Utility to generate a Solaris package
 ONLY_FOR_PLATFORM=	SunOS-*-*	# uses Solaris pkgmk(1)
 
 MAKE_ENV+=	CPPFLAGS="" CC="${CC}"
-MAKEFLAGS+=	PREFIX=${PREFIX}
+MAKEFLAGS+=	PREFIX=${PREFIX} ZOULARISBASE=${ZOULARISBASE}
 
 do-install:
 	cd ${WRKSRC} && ${MAKE} install PREFIX=${PREFIX}
diff --git a/pkgtools/gensolpkg/distinfo b/pkgtools/gensolpkg/distinfo
index def2eb16b80..eb7f9c433ec 100644
--- a/pkgtools/gensolpkg/distinfo
+++ b/pkgtools/gensolpkg/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/05/05 15:54:38 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/11/23 20:55:21 cjep Exp $
 
 SHA1 (gensolpkg-1.10.tar.gz) = d7981f6c2159a1a2304a5e446185ce6b2ade7305
 Size (gensolpkg-1.10.tar.gz) = 8430 bytes
+SHA1 (patch-aa) = 638f029a2d05d4fefea60fc5335fdbbf3851e154
+SHA1 (patch-ab) = fba2606b035298b3b7fc1fe52e602aa9d345080d
diff --git a/pkgtools/gensolpkg/patches/patch-aa b/pkgtools/gensolpkg/patches/patch-aa
new file mode 100644
index 00000000000..4bb90b8a8e1
--- /dev/null
+++ b/pkgtools/gensolpkg/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2002/11/23 20:55:22 cjep Exp $
+--- Makefile.orig	Sun Jan 21 23:26:06 2001
++++ Makefile	Sat Nov 23 20:18:40 2002
+@@ -1,6 +1,8 @@
+ # Short makefile for gensolpkg
+ 
+ PREFIX= /usr/local
++ZOULARISBASE= /usr/local
++
+ CFLAGS= -O
+ BIN= gensolpkg
+ OBJS= gensolpkg.o
+@@ -13,7 +15,7 @@
+ 	${CC} ${CFLAGS} ${LDFLAGS} ${OBJS} ${LIBS} -o ${BIN}
+ 
+ gensolpkg.c: gensolpkg.c.in
+-	sed -e 's|@PREFIX@|${PREFIX}|g' -e 's|@VENDOR@|${VENDOR}|g' -e 's|@SPOOLDIR@|${SPOOLDIR}|g' gensolpkg.c.in > gensolpkg.c
++	sed -e 's|@PREFIX@|${PREFIX}|g' -e 's|@VENDOR@|${VENDOR}|g' -e 's|@SPOOLDIR@|${SPOOLDIR}|g' -e 's|@ZOULARISBASE@|${ZOULARISBASE}|g' gensolpkg.c.in > gensolpkg.c
+ 
+ gensolpkg.1: gensolpkg.1.in
+ 	sed -e 's|@PREFIX@|${PREFIX}|g' -e 's|@VENDOR@|${VENDOR}|g' -e 's|@SPOOLDIR@|${SPOOLDIR}|g' gensolpkg.1.in > gensolpkg.1
diff --git a/pkgtools/gensolpkg/patches/patch-ab b/pkgtools/gensolpkg/patches/patch-ab
new file mode 100644
index 00000000000..24551cc47f6
--- /dev/null
+++ b/pkgtools/gensolpkg/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2002/11/23 20:55:23 cjep Exp $
+--- gensolpkg.c.in.orig	Sat Nov 23 20:19:13 2002
++++ gensolpkg.c.in	Sat Nov 23 20:19:33 2002
+@@ -572,7 +572,7 @@
+ 	int	i;
+ 
+ 	(void) strcpy(prefix, "@PREFIX@");
+-	(void) strcpy(bmake, "@PREFIX@/bsd/bin/bmake");
++	(void) strcpy(bmake, "@ZOULARISBASE@/bin/bmake");
+ 	(void) strcpy(output, "/tmp");
+ 	(void) strcpy(pkgdir, "@SPOOLDIR@");
+ 	transform = 0;