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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12acdc6a8482
branches:  trunk
changeset: 470097:12acdc6a8482
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Mar 06 15:11:22 2004 +0000

description:
Update pkgtools/createbuildlink to 3.3.  Changes from version 3.2 include
fixes to the whitespace in the generated files to more closely match the
template buildlink3.mk file.

diffstat:

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

diffs (102 lines):

diff -r 1e5978919abf -r 12acdc6a8482 doc/CHANGES
--- a/doc/CHANGES       Sat Mar 06 15:11:18 2004 +0000
+++ b/doc/CHANGES       Sat Mar 06 15:11:22 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5108 2004/03/06 15:11:18 grant Exp $
+$NetBSD: CHANGES,v 1.5109 2004/03/06 15:11:48 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1186,3 +1186,4 @@
        Added ytalk-x11-3.1.1 [grant 2004-03-06]
         Updated mozilla-gtk2 to 1.6nb3 [jmmv 2004-03-06]
        Added postfix-current-20040209 [grant 2004-03-06]
+       Updated createbuildlink to 3.3 [jlam 2004-03-06]
diff -r 1e5978919abf -r 12acdc6a8482 pkgtools/createbuildlink/Makefile
--- a/pkgtools/createbuildlink/Makefile Sat Mar 06 15:11:18 2004 +0000
+++ b/pkgtools/createbuildlink/Makefile Sat Mar 06 15:11:22 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2004/03/05 19:42:09 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/06 15:11:22 jlam Exp $
 
-DISTNAME=      createbuildlink-3.2
+DISTNAME=      createbuildlink-3.3
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # Nothing
 DISTFILES=     # Nothing
diff -r 1e5978919abf -r 12acdc6a8482 pkgtools/createbuildlink/files/createbuildlink
--- a/pkgtools/createbuildlink/files/createbuildlink    Sat Mar 06 15:11:18 2004 +0000
+++ b/pkgtools/createbuildlink/files/createbuildlink    Sat Mar 06 15:11:22 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: createbuildlink,v 1.19 2004/03/05 19:42:09 jlam Exp $
+#      $NetBSD: createbuildlink,v 1.20 2004/03/06 15:11:22 jlam Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,8 +40,9 @@
 # and PLIST
 #
 
-REV=`echo '$Revision: 1.19 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.20 $' | sed 's/\\$//g'`
 tmpdir=/tmp
+spacesintab=8
 makefile=Makefile
 sedrules=$tmpdir/sedrules.buildlink.$$
 PLIST=PLIST
@@ -151,9 +152,20 @@
 
 else   # buildlink 3
 
+gap="  "
+for i in 1 2 3; do
+       n=`expr $i \* $spacesintab`
+       if [ ${#PKGUPPER} -ge $n ]; then
+               gap="   $gap"
+       fi
+done
+
 sed -f $sedrules <<EOF
-BUILDLINK_DEPTH:=              \${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=${gap}\${BUILDLINK_DEPTH}+
 ${PKGUPPER}_BUILDLINK3_MK:=    \${${PKGUPPER}_BUILDLINK3_MK}+
+EOF
+
+sed -f $sedrules <<EOF
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    ${PKGNOVER}
@@ -184,7 +196,6 @@
 
 sed -f $sedrules <<EOF
 BUILDLINK_PKGSRCDIR.$PKGNOVER?=        ../../$CURDIR
-
 EOF
 
 ##
@@ -192,6 +203,7 @@
 ##
 if [ $blver = 2 ]; then
 sed -f $sedrules <<EOF
+
 EVAL_PREFIX+=  BUILDLINK_PREFIX.$PKGNOVER=$PKGNOVER
 BUILDLINK_PREFIX.${PKGNOVER}_DEFAULT=  \${$PREFIX}
 EOF
@@ -220,13 +232,13 @@
        echo "BUILDLINK_FILES.$PKGNOVER+=       $i"
 done
 
-echo ""
-
 fi     ## end of buildlink2-only part
 
 ##
 ## buildlinked dependencies
 ##
+grep -l '^.include.*\.\.\/.*\/.*/buildlink[23].mk\"' $makefile $commons \
+       >/dev/null 2>&1 && echo ""      # Be careful not to print duplicate \n
 for i in $makefile $commons ; do
        [ ! -f $i ] || grep '^.include.*\.\.\/.*\/.*/buildlink[23].mk\"' $i |
                sed "s/buildlink$otherver/buildlink$blver/"             |