Update to current macros mk-1.2.5 (no the bsd* ones are still way old).

Changes of note:
 	Added target-flags.mk allows frobbing CFLAGS for individual
 	targets.
 	prog.mk and lib.mk attempt to use bsd.prog.mk and bsd.lib.mk
 	to help ensure the right magic happens on ELF systems.
 	Several improvments to autodep.mk - now the default unless
 	NO_AUTODEP is defined.
The bsd.*.mk files are no longer installed on BSD systems as they are
almost guaranteed to do more harm than good.

Reviewed: agc

3 files changed, 35 insertions, 21 deletions

diff --git a/devel/mk-files/Makefile b/devel/mk-files/Makefile
index 90df62c5e9f..6cf9ce73cf8 100644
--- a/devel/mk-files/Makefile
+++ b/devel/mk-files/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/25 12:33:34 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 21:38:32 sjg Exp $
 #
 
-DISTNAME=       mk-1.2.2
-PKGNAME=	mk-files-1.2.2
+DISTNAME=       mk-1.2.5
+PKGNAME=	mk-files-1.2.5
 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
+HOMEPAGE=	http://www.crufty.net/help/sjg/bmake.html
 COMMENT=	portable *.mk files for the NetBSD portable bmake utility
 
 WRKSRC=		${WRKDIR}/mk
@@ -15,15 +15,28 @@ WRKSRC=		${WRKDIR}/mk
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-MKFILES=	autodep.mk bsd.dep.mk bsd.doc.mk bsd.lib.mk bsd.man.mk
+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
+.if !exists(/usr/share/mk/bsd.prog.mk)
+# 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
-MKFILES+=	dep.mk doc.mk lib.mk man.mk nls.mk obj.mk own.mk prog.mk
-MKFILES+=	subdir.mk
+
+# need to include the commented out guys
+PLIST_SRC=${WRKDIR}/.PLIST_SRC
+.endif
 
 do-install:
+.if !exists(/usr/share/mk/sys.mk)
 	${BSD_INSTALL_DATA} ${WRKSRC}/`uname -s`.sys.mk ${PREFIX}/share/mk/sys.mk
+.endif
 	for f in ${MKFILES}; do						\
 		${BSD_INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/mk/;	\
 	done
 
 .include "../../mk/bsd.pkg.mk"
+
+${WRKDIR}/.PLIST_SRC:	${PKGDIR}/PLIST
+	@sed 's,^@comment.*skip-on-BSD ,,' $> > $@
diff --git a/devel/mk-files/distinfo b/devel/mk-files/distinfo
index 4db90b10533..c7869823775 100644
--- a/devel/mk-files/distinfo
+++ b/devel/mk-files/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/25 12:33:34 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/10/18 21:38:32 sjg Exp $
 
-SHA1 (mk-1.2.2.tar.gz) = 8d154463c4b4ab0274e1339f46847e76eb7152db
-Size (mk-1.2.2.tar.gz) = 19525 bytes
+SHA1 (mk-1.2.5.tar.gz) = 9cdcd46e9443972fb56a7f373918bf127a96ec97
+Size (mk-1.2.5.tar.gz) = 20948 bytes
diff --git a/devel/mk-files/pkg/PLIST b/devel/mk-files/pkg/PLIST
index 2941dce84ba..904d1cfada4 100644
--- a/devel/mk-files/pkg/PLIST
+++ b/devel/mk-files/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/05/25 12:33:34 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/18 21:38:35 sjg Exp $
 share/mk/autodep.mk
-share/mk/bsd.dep.mk
-share/mk/bsd.doc.mk
-share/mk/bsd.lib.mk
-share/mk/bsd.man.mk
-share/mk/bsd.nls.mk
-share/mk/bsd.obj.mk
-share/mk/bsd.own.mk
-share/mk/bsd.prog.mk
-share/mk/bsd.subdir.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
@@ -18,4 +18,5 @@ share/mk/obj.mk
 share/mk/own.mk
 share/mk/prog.mk
 share/mk/subdir.mk
-share/mk/sys.mk
+@comment skip-on-BSD share/mk/sys.mk
+share/mk/target-flags.mk