From 86deffff7cc4b57d0469c55ed34c806c0690b1e4 Mon Sep 17 00:00:00 2001 From: rh Date: Fri, 27 Sep 2002 21:19:58 +0000 Subject: Update createbuildlink to 2.1. This adds some patterns to recognise AppKit style Objective C headers and libraries. --- pkgtools/createbuildlink/Makefile | 4 ++-- pkgtools/createbuildlink/files/createbuildlink | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 5fa6b5acc85..81980d04969 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2002/09/23 01:39:50 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/27 21:19:58 rh Exp $ # -DISTNAME= createbuildlink-2.0 +DISTNAME= createbuildlink-2.1 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index cddf9bc24a5..8dd036e27af 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.7 2002/09/06 00:36:14 rh Exp $ +# $NetBSD: createbuildlink,v 1.8 2002/09/27 21:19:59 rh 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.7 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.8 $' | sed 's/\\$//g'` tmpdir=/tmp makefile=Makefile sedrules=$tmpdir/sedrules.buildlink.$$ @@ -120,15 +120,16 @@ EOF ## ## buildlinked includes ## -for i in `grep "^include/" $PLIST`; do +for i in `grep "^include/" $PLIST` `grep "/Headers/.*\.h" $PLIST` ; do echo "BUILDLINK_FILES.$PKGNOVER+= $i" done ## ## buildlinked libraries ## -for i in `grep "^lib/" $PLIST | \ -sed -e 's/\.a$/.*/' -e 's/\.la$/.*/' -e 's/\.so.*$/.*/' | sort | uniq`; do +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 echo "BUILDLINK_FILES.$PKGNOVER+= $i" done -- cgit v1.2.3