diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2003-12-22 01:15:49 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2003-12-22 01:15:49 +0000 |
| commit | 8521a0316c7420d23f172308ff25a48d064e6fdc (patch) | |
| tree | bef7c270cdd7eee0ec7e30bc31de434c157864dc /pkgtools | |
| parent | a9338209c71bf959c798f52e8434c925470614b0 (diff) | |
| download | pkgsrc-8521a0316c7420d23f172308ff25a48d064e6fdc.tar.gz | |
Don't drop header files those extensions are >2 characters, e.g., "*.hpp".
Min Sik Kim in PR pkg/23834.
While here, "sort | uniq" -> "sort -u" in 2 places.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 8360f7453ba..342de2a57af 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2003/10/15 00:18:05 salo Exp $ +# $NetBSD: Makefile,v 1.20 2003/12/22 01:15:49 uebayasi Exp $ # -DISTNAME= createbuildlink-2.8 +DISTNAME= createbuildlink-2.9 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index 3d824ddde77..57d1f0cc146 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.15 2003/10/15 00:18:05 salo Exp $ +# $NetBSD: createbuildlink,v 1.16 2003/12/22 01:15:50 uebayasi 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.15 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.16 $' | sed 's/\\$//g'` tmpdir=/tmp makefile=Makefile sedrules=$tmpdir/sedrules.buildlink.$$ @@ -140,7 +140,7 @@ EOF ## if [ "$join" = "YES" ]; then for i in `egrep "^include/|/Headers/.*\.h" $PLIST \ - | sed -e 's|[^/]*\.h\([Hhpx+]\)*$|*.h\1|' | sort | uniq`; do + | sed -e 's|[^/]*\.h\([Hhpx+]*\)$|*.h\1|' | sort -u`; do echo "BUILDLINK_FILES.$PKGNOVER+= $i" done else @@ -155,7 +155,7 @@ fi for i in \ `egrep '^lib/|/Libraries/.*/lib[^\.]*\.a$|/Libraries/.*/lib[^\.]*\.so' $PLIST \ | egrep -v '\.pc$' | sed -e 's/\.a$/.*/' -e 's/\.la$/.*/' -e 's/\.so.*$/.*/' \ -| sort | uniq`; do +| sort -u`; do echo "BUILDLINK_FILES.$PKGNOVER+= $i" done |