[pkgsrc/trunk]: pkgsrc Update pkgtools/createbuildlink to 3.4. Changes from ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f2947574513
branches:  trunk
changeset: 471109:4f2947574513
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 18 10:47:04 2004 +0000

description:
Update pkgtools/createbuildlink to 3.4.  Changes from version 3.3
include creating buildlink3.mk files that include other buildlink3.mk
files outside of the region that is protected against multiple inclusion.
This is required to fix a bug in properly ordering the packages listed
in BUILDLINK_PACKAGES.

diffstat:

 doc/CHANGES                                    |   3 ++-
 pkgtools/createbuildlink/Makefile              |   4 ++--
 pkgtools/createbuildlink/files/createbuildlink |  22 ++++++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diffs (101 lines):

diff -r 01cea40c76ef -r 4f2947574513 doc/CHANGES
--- a/doc/CHANGES       Thu Mar 18 10:24:40 2004 +0000
+++ b/doc/CHANGES       Thu Mar 18 10:47:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5275 2004/03/17 22:02:53 jschauma Exp $
+$NetBSD: CHANGES,v 1.5276 2004/03/18 10:47:47 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1487,3 +1487,4 @@
        Updated bittorrent-gui to 3.4.1nb1 [jmmv 2004-03-17]
        Updated sun-jre14 to 2.4 [jschauma 2004-03-17]
        Updated sun-jdk14 to 2.4 [jschauma 2004-03-17]
+       Updated createbuildlink to 3.4 [jlam 2004-03-18]
diff -r 01cea40c76ef -r 4f2947574513 pkgtools/createbuildlink/Makefile
--- a/pkgtools/createbuildlink/Makefile Thu Mar 18 10:24:40 2004 +0000
+++ b/pkgtools/createbuildlink/Makefile Thu Mar 18 10:47:04 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/03/06 15:11:22 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/03/18 10:47:04 jlam Exp $
 
-DISTNAME=      createbuildlink-3.3
+DISTNAME=      createbuildlink-3.4
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # Nothing
 DISTFILES=     # Nothing
diff -r 01cea40c76ef -r 4f2947574513 pkgtools/createbuildlink/files/createbuildlink
--- a/pkgtools/createbuildlink/files/createbuildlink    Thu Mar 18 10:24:40 2004 +0000
+++ b/pkgtools/createbuildlink/files/createbuildlink    Thu Mar 18 10:47:04 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: createbuildlink,v 1.20 2004/03/06 15:11:22 jlam Exp $
+#      $NetBSD: createbuildlink,v 1.21 2004/03/18 10:47:04 jlam Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,7 +40,7 @@
 # and PLIST
 #
 
-REV=`echo '$Revision: 1.20 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.21 $' | sed 's/\\$//g'`
 tmpdir=/tmp
 spacesintab=8
 makefile=Makefile
@@ -85,7 +85,7 @@
        exit 1
 fi
 
-if [ ! -f "$PLIST" ]; then
+if [ $blver = 2 -a ! -f "$PLIST" ]; then
        echo "===> Incomplete package! To create a buildlink file <==="
        echo "===> a working PLIST is required!                   <==="
        exit 1
@@ -136,6 +136,11 @@
 # XXX After this file as been verified as correct, the comment lines
 # XXX beginning with "XXX" should be removed.  Please do not commit
 # XXX unverified buildlink[23].mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX  BUILDLINK_DEPMETHOD.$PKGNOVER?= build
 
 EOF
 
@@ -198,6 +203,14 @@
 BUILDLINK_PKGSRCDIR.$PKGNOVER?=        ../../$CURDIR
 EOF
 
+if [ $blver = 3 ]; then
+
+sed -f $sedrules <<EOF
+.endif # ${PKGUPPER}_BUILDLINK3_MK
+EOF
+
+fi
+
 ##
 ## buildlink2-only part
 ##
@@ -244,8 +257,10 @@
                sed "s/buildlink$otherver/buildlink$blver/"             |
                egrep -v '/devel/pkgconfig/|/textproc/intltool/'
 done
+if [ $blver = 2 ]; then
 grep -l '^.include.*\.\.\/.*\/.*/buildlink[23].mk\"' $makefile $commons \
        >/dev/null 2>&1 && echo ""      # Be careful not to print duplicate \n
+fi
 
 ##
 ## buildlink2-only part
@@ -271,7 +286,6 @@
 else   # buildlink 3
 
 sed -f $sedrules <<EOF
-.endif # ${PKGUPPER}_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     \${BUILDLINK_DEPTH:S/+\$//}
 EOF