[pkgsrc/trunk]: pkgsrc/pkgtools/createbuildlink 3.8: When pulling existing .i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e94a0ce97f3
branches:  trunk
changeset: 481955:0e94a0ce97f3
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Oct 15 14:41:11 2004 +0000

description:
3.8: When pulling existing .includes of buildlink3 files from the Makefile,
comment them out by default, and add a comment above them indicating that
only *directly* needed dependencies should be in the (edited, final) bl3
file.

This will hopefully encourage folks to reduce the amount of unnecessary bl3
recursion that is rampant in pkgsrc, making many packages "depend" directly
on APIs they never see nor use.

diffstat:

 pkgtools/createbuildlink/Makefile              |   4 ++--
 pkgtools/createbuildlink/files/createbuildlink |  16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r e66d4d87bcd2 -r 0e94a0ce97f3 pkgtools/createbuildlink/Makefile
--- a/pkgtools/createbuildlink/Makefile Fri Oct 15 13:56:27 2004 +0000
+++ b/pkgtools/createbuildlink/Makefile Fri Oct 15 14:41:11 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2004/09/30 12:43:57 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2004/10/15 14:41:11 tv Exp $
 
-DISTNAME=      createbuildlink-3.7
+DISTNAME=      createbuildlink-3.8
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # Nothing
 DISTFILES=     # Nothing
diff -r e66d4d87bcd2 -r 0e94a0ce97f3 pkgtools/createbuildlink/files/createbuildlink
--- a/pkgtools/createbuildlink/files/createbuildlink    Fri Oct 15 13:56:27 2004 +0000
+++ b/pkgtools/createbuildlink/files/createbuildlink    Fri Oct 15 14:41:11 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: createbuildlink,v 1.26 2004/09/26 23:48:09 rh Exp $
+#      $NetBSD: createbuildlink,v 1.27 2004/10/15 14:41:11 tv Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Create an initial buildlink3.mk from a package's Makefile and PLIST
 #
 
-REV=`echo '$Revision: 1.26 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.27 $' | sed 's/\\$//g'`
 tmpdir=/tmp
 spacesintab=8
 makefile=Makefile
@@ -176,10 +176,18 @@
 ## buildlinked dependencies
 ##
 grep -l '^.include.*\.\.\/.*\/.*/buildlink3.mk\"' $makefile $commons \
-       >/dev/null 2>&1 && echo ""      # Be careful not to print duplicate \n
+       >/dev/null 2>&1 && cat <<EOF
+
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+EOF
 for i in $makefile $commons ; do
        [ ! -f $i ] || grep '^.include.*\.\.\/.*\/.*/buildlink3.mk\"' $i |
-               egrep -v '/devel/pkgconfig/|/textproc/intltool/'
+               egrep -v '/devel/pkgconfig/|/textproc/intltool/' | sed 's,^,#,'
 done
 
 sed -f $sedrules <<EOF