For some reason, the way pkgsrc ran configure, mucked up the
boot-strapping of bmake srcdir was set to '.' in unit-tests which
hosed the results.

Since I always use bmake/boot-strap these days I figure it wouldn't
hurt for pkgsrc to use it too.

Anyone see anything wrong with the patch below?

Thanks
--sjg

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	21 Feb 2004 00:15:44 -0000	1.19
+++ Makefile	11 May 2004 00:02:12 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.19 2004/02/21 00:15:44 sjg Exp $
 #
 
-DISTNAME=       bmake-20040220
+DISTNAME=       bmake-20040508
 CATEGORIES=	devel
-MASTER_SITES=   ftp://ftp.NetBSD.org/pub/incoming/sjg/
+MASTER_SITES=   ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
 
 MAINTAINER=	sjg@NetBSD.org
 HOMEPAGE=	http://www.crufty.net/help/sjg/bmake.html
@@ -14,16 +14,19 @@
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
 WRKSRC=		${WRKDIR}/bmake
+
 makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=	no
 CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
 
+do-configure:
+
 do-build:
-	cd ${WRKSRC} && MAKESYSPATH=${makesyspath} make -f makefile.boot bootstrap
+	cd ${WRKDIR} && ./bmake/boot-strap ${CONFIGURE_ARGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bmake ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${PREFIX}/man/cat1/bmake.0
-	${INSTALL_MAN} ${WRKSRC}/bmake.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.cat1 ${PREFIX}/man/cat1/bmake.0
+	${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	21 Feb 2004 00:15:44 -0000	1.15
+++ distinfo	11 May 2004 00:02:12 -0000
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.15 2004/02/21 00:15:44 sjg Exp $
 
-SHA1 (bmake-20040220.tar.gz) = 01aba5d9bc8c4bff83c0f21178acd2f212640580
-Size (bmake-20040220.tar.gz) = 340411 bytes
+SHA1 (bmake-20040508.tar.gz) = c275ad84246868f093e659124805b0311db6d429
+Size (bmake-20040508.tar.gz) = 341817 bytes