diff options
author | sjg <sjg> | 2002-09-20 07:00:52 +0000 |
---|---|---|
committer | sjg <sjg> | 2002-09-20 07:00:52 +0000 |
commit | 002ffd2d6c48e0172a1f8b1369f169d654fbd8d7 (patch) | |
tree | 976ede8e4c0c889893f8d7689e58df6afedd4d78 | |
parent | b38769968843764b8a547734722e7ed2325046e5 (diff) | |
download | pkgsrc-002ffd2d6c48e0172a1f8b1369f169d654fbd8d7.tar.gz |
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.
-rw-r--r-- | devel/bmake/Makefile | 6 | ||||
-rw-r--r-- | devel/bmake/distinfo | 8 | ||||
-rw-r--r-- | devel/bmake/patches/patch-aa | 15 | ||||
-rw-r--r-- | devel/bmake/patches/patch-ab | 12 | ||||
-rw-r--r-- | devel/mk-files/Makefile | 40 | ||||
-rw-r--r-- | devel/mk-files/PLIST | 24 | ||||
-rw-r--r-- | devel/mk-files/distinfo | 6 |
7 files changed, 26 insertions, 85 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 diff --git a/devel/mk-files/Makefile b/devel/mk-files/Makefile index e2d6270f6e3..392033496d3 100644 --- a/devel/mk-files/Makefile +++ b/devel/mk-files/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/02/06 16:58:13 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/20 07:00:56 sjg 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/,' > $@ diff --git a/devel/mk-files/PLIST b/devel/mk-files/PLIST index dbc2cac8e7f..bc1204e6bfb 100644 --- a/devel/mk-files/PLIST +++ b/devel/mk-files/PLIST @@ -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 $NetBSD: PLIST,v 1.2 2002/09/20 07:00:56 sjg Exp $ +@comment rest is autogenerated diff --git a/devel/mk-files/distinfo b/devel/mk-files/distinfo index c7869823775..6162bbf0ec3 100644 --- a/devel/mk-files/distinfo +++ b/devel/mk-files/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/10/18 21:38:32 sjg Exp $ +$NetBSD: distinfo,v 1.3 2002/09/20 07:00:56 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 |