diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-10 03:36:55 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-10 03:36:55 +0000 |
| commit | 36a14d50db0e4600a56549f56e7eddf5593c4877 (patch) | |
| tree | fbe85a424e42de3c5a0e75f790f029e96d749f34 | |
| parent | ae8b9a912894a0e99c77c0f94c0a53f96bc56d19 (diff) | |
| download | pkgsrc-36a14d50db0e4600a56549f56e7eddf5593c4877.tar.gz | |
Update pkgtools/createbuildlink to 3.1. Changes from version 3.0 include
generating buildlink3.mk files that only append to BUILDLINK_DEPENDS.*.
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 7 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 20 |
3 files changed, 23 insertions, 7 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 1cbb9f22e92..ded2bf9ac0c 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4757 2004/02/10 01:59:56 jlam Exp $ +$NetBSD: CHANGES,v 1.4758 2004/02/10 03:38:19 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -736,3 +736,4 @@ Changes to the packages collection and infrastructure in 2004: Updated gnome-vfs2 to 2.4.2nb2 [jmmv 2004-02-09] Updated cue to 20040209 [itojun 2004-02-09] Updated perl58 to 5.8.3 [jlam 2004-02-10] + Updated createbuildlink to 3.1 [jlam 2004-02-10] diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index cba7392bdf6..c0627b06af8 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.25 2004/02/06 23:02:16 wiz Exp $ -# +# $NetBSD: Makefile,v 1.26 2004/02/10 03:36:55 jlam Exp $ -DISTNAME= createbuildlink-3.0 +DISTNAME= createbuildlink-3.1 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing MAINTAINER= rh@NetBSD.org -COMMENT= Shell script to help creating a buildlink2.mk file +COMMENT= shell script to help creating buildlink[23].mk files PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index e9774ba8094..4fe271d2211 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.17 2004/01/14 08:53:57 rh Exp $ +# $NetBSD: createbuildlink,v 1.18 2004/02/10 03:36:55 jlam Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,7 +40,7 @@ # and PLIST # -REV=`echo '$Revision: 1.17 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.18 $' | sed 's/\\$//g'` tmpdir=/tmp makefile=Makefile sedrules=$tmpdir/sedrules.buildlink.$$ @@ -166,7 +166,23 @@ fi # buildlink 2/3 sed -f $sedrules <<EOF BUILDLINK_PACKAGES+= $PKGNOVER +EOF + +if [ $blver = 2 ]; then + +sed -f $sedrules <<EOF BUILDLINK_DEPENDS.$PKGNOVER?= $PKGNOVER>=$PKGVER +EOF + +else # [ $blver = 3 ] + +sed -f $sedrules <<EOF +BUILDLINK_DEPENDS.$PKGNOVER+= $PKGNOVER>=$PKGVER +EOF + +fi + +sed -f $sedrules <<EOF BUILDLINK_PKGSRCDIR.$PKGNOVER?= ../../$CURDIR EOF |