diff options
| author | salo <salo@pkgsrc.org> | 2003-10-15 00:18:05 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2003-10-15 00:18:05 +0000 |
| commit | b38902af456d4ba78f6ea48d703b947a24a405b8 (patch) | |
| tree | e58f0a4365049286fd7e4f460f345112c1eb7956 /pkgtools | |
| parent | 50b6db44e506fe9b3abe89a7297459146cd2bec9 (diff) | |
| download | pkgsrc-b38902af456d4ba78f6ea48d703b947a24a405b8.tar.gz | |
Welcome to version 2.8.
- Do not list pkgconfig files as libraries.
- Save one grep and be more precise about removing
pkgconfig and intltool buildlink2 file inclusions.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 26191a26b93..8360f7453ba 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2003/09/18 14:15:00 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2003/10/15 00:18:05 salo Exp $ # -DISTNAME= createbuildlink-2.7 +DISTNAME= createbuildlink-2.8 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index 8f2af539dd6..3d824ddde77 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.14 2003/09/18 14:15:01 jmmv Exp $ +# $NetBSD: createbuildlink,v 1.15 2003/10/15 00:18:05 salo Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ # Create an initial buildlink2.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.14 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.15 $' | sed 's/\\$//g'` tmpdir=/tmp makefile=Makefile sedrules=$tmpdir/sedrules.buildlink.$$ @@ -154,7 +154,8 @@ fi ## for i in \ `egrep '^lib/|/Libraries/.*/lib[^\.]*\.a$|/Libraries/.*/lib[^\.]*\.so' $PLIST \ -|sed -e 's/\.a$/.*/' -e 's/\.la$/.*/' -e 's/\.so.*$/.*/' | sort | uniq`; do +| egrep -v '\.pc$' | sed -e 's/\.a$/.*/' -e 's/\.la$/.*/' -e 's/\.so.*$/.*/' \ +| sort | uniq`; do echo "BUILDLINK_FILES.$PKGNOVER+= $i" done @@ -165,7 +166,7 @@ echo "" ## for i in $makefile $commons ; do [ ! -f $i ] || grep '^.include.*\.\.\/.*\/.*/buildlink2.mk\"' $i | - grep -v devel/pkgconfig | grep -v textproc/intltool + egrep -v '/devel/pkgconfig/|/textproc/intltool/' done grep -l '^.include.*\.\.\/.*\/.*/buildlink2.mk\"' $makefile $commons \ >/dev/null 2>&1 && echo "" # Be careful not to print duplicate \n |