Update bmake to 20040511 which syncs with -current (and 2.0).

We now use bmake/boot-strap for simpler building.
New location for distfile.

Changes to bmake include:
o allow quoted strings on lhs of conditionals
o issue warning when extra .else is seen
o print line numer when errors encountered during parsing from
  string.
o posix fixes
  - remove '-e' from compat mode
  - add support for '+' command-line prefix.
o fix for handling '--' on command-line.

3 files changed, 16 insertions, 14 deletions

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index ef47903f8b6..735589634ab 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/02/21 00:15:44 sjg Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/11 18:28:32 sjg Exp $
 #
 
-DISTNAME=       bmake-20040220
+DISTNAME=       bmake-20040511
 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
@@ -11,19 +11,20 @@ COMMENT=	Portable (autoconf) version of NetBSD 'make' utility
 
 DEPENDS+=	mk-files>=20030714:../../devel/mk-files
 
-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 -q -o ${OPSYS} ${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"
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 33f6bb7bda1..47e3ea8984c 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/02/21 00:15:44 sjg Exp $
+$NetBSD: distinfo,v 1.16 2004/05/11 18:28:33 sjg Exp $
 
-SHA1 (bmake-20040220.tar.gz) = 01aba5d9bc8c4bff83c0f21178acd2f212640580
-Size (bmake-20040220.tar.gz) = 340411 bytes
+SHA1 (bmake-20040511.tar.gz) = 98540303fb59d5369ce1f6279c516b54f398ec42
+Size (bmake-20040511.tar.gz) = 342043 bytes
diff --git a/doc/CHANGES b/doc/CHANGES
index 5c8b5203850..ae5f1162b74 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5907 2004/05/11 17:46:47 recht Exp $
+$NetBSD: CHANGES,v 1.5908 2004/05/11 18:28:32 sjg Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2479,3 +2479,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated cairo to 0.1.23 [recht 2004-05-11]
 	Updated libgdiplus to 0.5 [recht 2004-05-11]
 	Updated winelib to 0.2 [recht 2004-05-11]
+	Updated bmake to 20040511 [sjg 2004-05-11]