diff options
| author | sjg <sjg@pkgsrc.org> | 2005-09-04 17:09:54 +0000 |
|---|---|---|
| committer | sjg <sjg@pkgsrc.org> | 2005-09-04 17:09:54 +0000 |
| commit | ec6404f5a1f3aaa6872604430ad26802d24801e2 (patch) | |
| tree | 31a8ef56c6ece9bad3bd6d3bcf63bb3f52c27ab5 /devel | |
| parent | 76e8a5701a6af124213dac4d8742d4f727438b0a (diff) | |
| download | pkgsrc-ec6404f5a1f3aaa6872604430ad26802d24801e2.tar.gz | |
Update to bmake-20050901 which includes a fix for PR/31077
Also use the distributed bmake.cat1 if one is not generated for
this platform.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/bmake/Makefile | 21 | ||||
| -rw-r--r-- | devel/bmake/distinfo | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index b1461ee84c3..9eac9584985 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2005/06/16 06:57:45 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/09/04 17:09:54 sjg Exp $ # -DISTNAME= bmake-20050530 +DISTNAME= bmake-20050901 CATEGORIES= devel MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ @@ -24,9 +24,24 @@ do-configure: do-build: cd ${WRKDIR} && ./bmake/boot-strap -q -o ${OPSYS} ${CONFIGURE_ARGS} +# we use locally formatted version if available +BMAKE_CATg=${WRKDIR}/${OPSYS}/bmake.cat1 +# otherwise we use the distributed one +BMAKE_CATd=${WRKSRC}/bmake.cat1 + do-install: ${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.cat1 ${PREFIX}/man/cat1/bmake.0 + ${INSTALL_MAN} ${BMAKE_CAT1} ${PREFIX}/man/cat1/bmake.0 ${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" + +# with bmake-20040108 or later we could use +# ${exists(${BMAKE_CATg}):?${BMAKE_CATg}:${BMAKE_CATd}} +# to do the existence test at the time we run the script +# but pkgsrc/bootstrap/bmake won't handle that. +.if exists(${BMAKE_CATg}) +BMAKE_CAT1=${BMAKE_CATg} +.else +BMAKE_CAT1=${BMAKE_CATd} +.endif diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo index 1c1d23382c0..00e5edec3b9 100644 --- a/devel/bmake/distinfo +++ b/devel/bmake/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.18 2005/05/31 20:52:53 sjg Exp $ +$NetBSD: distinfo,v 1.19 2005/09/04 17:09:54 sjg Exp $ -SHA1 (bmake-20050530.tar.gz) = ade2616e3ef2421ab1bb0c9e4447afdd5358a7dc -RMD160 (bmake-20050530.tar.gz) = 9702aeff4f4df723aca996553b326e2a3a24ef5c -Size (bmake-20050530.tar.gz) = 342050 bytes +SHA1 (bmake-20050901.tar.gz) = 167e9d637030d4125907b943a3e08d7976018e4f +RMD160 (bmake-20050901.tar.gz) = e77305eead0fec601c0436158d4dc81a8fd7dd0e +Size (bmake-20050901.tar.gz) = 343100 bytes |