I've sync'd bmake with NetBSD-1.6 and improved the bootstrap system
somewhat.

I have also finally updated by prog.mk et al to be able to handle ELF
on BSD systems.  The mk-files distribution now includes an install-mk
script which generally does the right thing (I've renamed a couple of
the SunOS sys.mk's to assist install-mk in picking the right one).

I've testing bootstrap on NetBSD-1.6, FreeBSD-4.2 and SunOS-5.7
and all looks sane and most of the changes from NetBSD-1.6 are just
ansi-fication.  

Thus the patch below updates devel/mk-files to use mk-1.3.2.tar.gz
and devel/bmake to use bmake-3.1.13.tar.gz no need for the two patches
anymore btw.

Since there are a few new .mk files in mk-1.3.2.tar.gz, the PLIST for
mk-files is now autogenerated from the FILES list in the distribution.

Please let me know if there are any issues.

Thanks
--sjg

Index: devel/mk-files/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mk-files/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/mk-files/Makefile	2002/02/06 16:58:13	1.4
+++ devel/mk-files/Makefile	2002/09/17 06:46:00
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2002/02/06 16:58:13 jlam Exp $
 #
 
-DISTNAME=       mk-1.2.5
-PKGNAME=	mk-files-1.2.5
+DISTNAME=	mk-1.3.2
+PKGNAME=	mk-files-1.3.2
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/incoming/sjg/
 
@@ -15,33 +15,23 @@ WRKSRC=		${WRKDIR}/mk
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-MKFILES=	autodep.mk dep.mk doc.mk lib.mk man.mk nls.mk 
-MKFILES+=	obj.mk own.mk prog.mk subdir.mk target-flags.mk
-
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "NetBSD"
-# we don't want to use these on BSD systems, since prog.mk and
-# lib.mk now rely on finding the correct bsd.prog.mk etc to
-# get the right magic on ELF systems.
-MKFILES+=	bsd.dep.mk bsd.doc.mk bsd.lib.mk bsd.man.mk
-MKFILES+=	bsd.nls.mk bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.subdir.mk
-
-# need to include the commented out guys
 PLIST_SRC=${WRKDIR}/.PLIST_SRC
 
-${WRKDIR}/.PLIST_SRC:	${PKGDIR}/PLIST
-	@${SED} 's,^@comment.*skip-on-BSD ,,' $> > $@
-
-.endif
-
 do-install:
-.if ${OPSYS} != "NetBSD"
-	${INSTALL_DATA} ${WRKSRC}/`uname -s`.sys.mk ${PREFIX}/share/mk/sys.mk
-.endif
-	for f in ${MKFILES}; do						\
-		${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/mk/;	\
-	done
+	${WRKSRC}/install-mk ${PREFIX}/share/mk
 
 .include "../../mk/bsd.pkg.mk"
 
+# The logic below mimics what install-mk does.
+# Ie. it won't install a sys.mk if a standard BSD one exists
+# same goes for the bsd.*.mk files (it makes the symlinks to *.mk)
+${WRKSRC}/FILES:	extract
+${WRKDIR}/.PLIST_SRC:	${WRKSRC}/FILES
+	@( grep '^[a-z].*\.mk' $> ; \
+	[ -f /usr/share/mk/sys.mk ] || echo sys.mk; \
+	[ -f /usr/share/mk/bsd.prog.mk ] || \
+	for f in dep doc init lib man nls obj own prog subdir; do \
+		echo bsd.$$f.mk; \
+	done ) | sed 's,^,share/mk/,' > $@
Index: devel/mk-files/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mk-files/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- devel/mk-files/PLIST	2001/11/01 01:24:54	1.1
+++ devel/mk-files/PLIST	2002/09/17 06:46:00
@@ -1,22 +1,2 @@
 @comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:54 zuntum Exp $
-share/mk/autodep.mk
-@comment skip-on-BSD share/mk/bsd.dep.mk
-@comment skip-on-BSD share/mk/bsd.doc.mk
-@comment skip-on-BSD share/mk/bsd.lib.mk
-@comment skip-on-BSD share/mk/bsd.man.mk
-@comment skip-on-BSD share/mk/bsd.nls.mk
-@comment skip-on-BSD share/mk/bsd.obj.mk
-@comment skip-on-BSD share/mk/bsd.own.mk
-@comment skip-on-BSD share/mk/bsd.prog.mk
-@comment skip-on-BSD share/mk/bsd.subdir.mk
-share/mk/dep.mk
-share/mk/doc.mk
-share/mk/lib.mk
-share/mk/man.mk
-share/mk/nls.mk
-share/mk/obj.mk
-share/mk/own.mk
-share/mk/prog.mk
-share/mk/subdir.mk
-@comment skip-on-BSD share/mk/sys.mk
-share/mk/target-flags.mk
+@comment rest is autogenerated
Index: devel/mk-files/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mk-files/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/mk-files/distinfo	2001/10/18 21:38:32	1.2
+++ devel/mk-files/distinfo	2002/09/17 06:46:00
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.2 2001/10/18 21:38:32 sjg Exp $
 
-SHA1 (mk-1.2.5.tar.gz) = 9cdcd46e9443972fb56a7f373918bf127a96ec97
-Size (mk-1.2.5.tar.gz) = 20948 bytes
+SHA1 (mk-1.3.2.tar.gz) = d37a597b3caa8642f2db7ec9bcca98f234c98c71
+Size (mk-1.3.2.tar.gz) = 23248 bytes
Index: devel/bmake/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/bmake/Makefile	2002/02/06 16:58:12	1.4
+++ devel/bmake/Makefile	2002/09/17 06:46:00
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2002/02/06 16:58:12 jlam 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
 
Index: devel/bmake/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/bmake/distinfo	2002/02/18 10:10:21	1.4
+++ devel/bmake/distinfo	2002/09/17 06:46:00
@@ -1,6 +1,4 @@
 $NetBSD: distinfo,v 1.4 2002/02/18 10:10:21 jmc 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