Update bmake and mk-files to latest versions.

bmake is now sync'd with NetBSD-1.6
mk-files have been overhauled to handle ELF on BSD systems.

4 files changed, 6 insertions, 35 deletions

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 17d4f385488..f2ec941959f 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/02/06 16:58:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/20 07:00:52 sjg Exp $
 #
 
-DISTNAME=       bmake-3.1.12
+DISTNAME=       bmake-3.1.13
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/incoming/sjg/
 
@@ -9,7 +9,7 @@ MAINTAINER=	sjg@netbsd.org
 HOMEPAGE=	http://www.crufty.net/help/sjg/bmake.html
 COMMENT=	Portable (autoconf) version of NetBSD 'make' utility
 
-DEPENDS+=	mk-files>=1.2.5:../../devel/mk-files
+DEPENDS+=	mk-files>=1.3.2:../../devel/mk-files
 
 WRKSRC=		${WRKDIR}/bmake
 
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index c94fbde1391..75610df15d9 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/02/18 10:10:21 jmc Exp $
+$NetBSD: distinfo,v 1.5 2002/09/20 07:00:53 sjg Exp $
 
-SHA1 (bmake-3.1.12.tar.gz) = 423c89cf5054b5bec1af4fff7c56dc089fb9f8f3
-Size (bmake-3.1.12.tar.gz) = 299528 bytes
-SHA1 (patch-aa) = d1a2e3c5638dcf657fb91019764987e3160a2a23
-SHA1 (patch-ab) = 8d98639f68138c9de21985197a346823c448bced
+SHA1 (bmake-3.1.13.tar.gz) = de2b6bcf16b39e68b6ecbf6977965bf2d51e0540
+Size (bmake-3.1.13.tar.gz) = 300133 bytes
diff --git a/devel/bmake/patches/patch-aa b/devel/bmake/patches/patch-aa
deleted file mode 100644
index 638b13291bc..00000000000
--- a/devel/bmake/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/06/17 22:02:21 agc Exp $
-
-Correct a spelling mistake
-
---- Makefile.in.orig	Wed Jun 13 00:51:12 2001
-+++ Makefile.in	Sun Jun 17 22:56:14 2001
-@@ -65,7 +65,7 @@
- ${MAN}:	make.1
- 	@echo making ${PROG}.1
- 	@sed -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh HISTORY/,$$d' ${srcdir}/make.1 > $@
--	@(echo ".Sh HISTORY"; echo ".Nm"; echo "is derrived from NetBSD's"; echo ".Xr make 1 ."; echo It uses autoconf to facilitate portability to other platforms.) >> $@
-+	@(echo ".Sh HISTORY"; echo ".Nm"; echo "is derived from NetBSD's"; echo ".Xr make 1 ."; echo It uses autoconf to facilitate portability to other platforms.) >> $@
- 
- .endif
- 
diff --git a/devel/bmake/patches/patch-ab b/devel/bmake/patches/patch-ab
deleted file mode 100644
index 857b0850647..00000000000
--- a/devel/bmake/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/02/18 10:10:22 jmc Exp $
-
---- machine.sh.orig	Mon Feb 18 10:05:46 2002
-+++ machine.sh	Mon Feb 18 10:06:09 2002
-@@ -38,6 +38,7 @@
- case $OS in
- *BSD)
- 	MACHINE=$OS$OSMAJOR.$machine
-+	MACHINE_ARCH=`uname -p 2>/dev/null`
- 	;;
- SunOS)
-         MACHINE=$OS$OSMAJOR