From 037b8ccfb2b06f474f40e7f3a797d96b8914ce1e Mon Sep 17 00:00:00 2001
From: sjg <sjg@pkgsrc.org>
Date: Thu, 18 Oct 2001 21:41:06 +0000
Subject: Update to bmake-3.1.12 Changes of note:         synched with NetBSD
 make as of 2001/10/16         fix for bug in compat mode .END processing     
    fix for bug in cleanup of jobs when using -jN         addition of
 .USEBEFORE         simpler bootstrap - compiles again on recent linux (Red
 Hat) The Makefile here now deals with the fact that we may not have installed
 a sys.mk in /usr/pkg/share/mk on BSD systems.

Reviewed: agc
---
 devel/bmake/Makefile  | 16 ++++++++--------
 devel/bmake/distinfo  |  6 +++---
 devel/bmake/pkg/DESCR |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'devel')

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index b85433ab9b9..02c539c4e1f 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.2 2001/06/17 22:02:20 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 21:41:06 sjg Exp $
 #
 
-DISTNAME=       bmake-3.1.10
+DISTNAME=       bmake-3.1.12
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/incoming/sjg/
 
 MAINTAINER=	sjg@netbsd.org
-HOMEPAGE=	http://www.quick.com.au/help/sjg/bmake.html
-COMMENT=	NetBSD version of 'make' utility
+HOMEPAGE=	http://www.crufty.net/help/sjg/bmake.html
+COMMENT=	Portable (autoconf) version of NetBSD 'make' utility
 
-DEPENDS+=	mk-files-1.2.2:../../devel/mk-files
+DEPENDS+=	mk-files>=1.2.5:../../devel/mk-files
 
 WRKSRC=		${WRKDIR}/bmake
 
+makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	  						\
-	--with-default-sys-path=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
+CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
 
 do-build:
-	cd ${WRKSRC}; make -f makefile.boot bootstrap; ./bmake -f Makefile; ./bmake -f Makefile bmake.1
+	cd ${WRKSRC} && MAKESYSPATH=${makesyspath} make -f makefile.boot bootstrap
 
 do-install:
 	${BSD_INSTALL_PROGRAM} ${WRKSRC}/bmake ${PREFIX}/bin
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 2d3f00cdbb5..be6cf028e8e 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/06/17 22:02:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/18 21:41:06 sjg Exp $
 
-SHA1 (bmake-3.1.10.tar.gz) = 53bab64bf90ab522d3f9a5f843ea870e75bad21d
-Size (bmake-3.1.10.tar.gz) = 298238 bytes
+SHA1 (bmake-3.1.12.tar.gz) = 423c89cf5054b5bec1af4fff7c56dc089fb9f8f3
+Size (bmake-3.1.12.tar.gz) = 299528 bytes
 SHA1 (patch-aa) = d1a2e3c5638dcf657fb91019764987e3160a2a23
diff --git a/devel/bmake/pkg/DESCR b/devel/bmake/pkg/DESCR
index e88f03faeba..32e0773ec94 100644
--- a/devel/bmake/pkg/DESCR
+++ b/devel/bmake/pkg/DESCR
@@ -1,3 +1,3 @@
-bmake is NetBSD's make(1) utility, conveniently packaged using a
-configure script, for other environments which may lack NetBSD's
-libraries, regular expression code, etc.
+bmake is a portable version of NetBSD's make(1) utility, 
+conveniently packaged using a configure script, for other environments 
+which may lack NetBSD's libraries, regular expression code, etc.
-- 
cgit v1.2.3