[pkgsrc/trunk]: pkgsrc/mk/bulk Don't hard-code "lang/perl58". Instead, use t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/055fd8172d74
branches:  trunk
changeset: 484056:055fd8172d74
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 23 19:44:02 2004 +0000

description:
Don't hard-code "lang/perl58".  Instead, use the value of PERL5_PKGSRCDIR
which is computed based on whether perl or perl-thread should be the
default.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  4 ++--
 mk/bulk/build           |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 3bd96831397f -r 055fd8172d74 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Tue Nov 23 19:31:46 2004 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Tue Nov 23 19:44:02 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.65 2004/11/16 18:34:12 jlam Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.66 2004/11/23 19:44:02 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -150,7 +150,7 @@
 .else
        @${ECHO_MSG} "BULK> Extracting database for SPECIFIC_PKGS subset of pkgsrc"
        @${ECHO_MSG} "      along with their dependencies"
-.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl58 pkgtools/pkglint
+.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} ${PERL5_PKGSRCDIR:C|.*/([^/]*/[^/]*)$|\1|} pkgtools/pkglint
        cd ${PKGSRCDIR}/${__tmp__} && ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE}
 .endfor
        @${ECHO_MSG} "BULK> Extracting dependency tree file"
diff -r 3bd96831397f -r 055fd8172d74 mk/bulk/build
--- a/mk/bulk/build     Tue Nov 23 19:31:46 2004 +0000
+++ b/mk/bulk/build     Tue Nov 23 19:44:02 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.45 2004/11/16 18:34:12 jlam Exp $
+# $NetBSD: build,v 1.46 2004/11/23 19:44:02 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -189,6 +189,7 @@
 fail=no
 if [ -d pkgtools/pkglint ]; then
        cd pkgtools/pkglint
+       PERL5_PKGSRCDIR=`${BMAKE} show-var VARNAME=PERL5_PKGSRCDIR` || fail=yes
        BULK_DBFILE=`${BMAKE} show-var VARNAME=BULK_DBFILE` || fail=yes
        DEPENDSTREEFILE=`${BMAKE} show-var VARNAME=DEPENDSTREEFILE` || fail=yes
        DEPENDSFILE=`${BMAKE} show-var VARNAME=DEPENDSFILE` || fail=yes
@@ -230,6 +231,7 @@
 # make sure we have values for these very important
 # variables
 if [ $fail = "yes" -o \
+       -z "$PERL5_PKGSRCDIR" -o \
        -z "$BULK_DBFILE" -o \
        -z "$DEPENDSTREEFILE" -o \
        -z "$DEPENDSFILE" -o \
@@ -355,7 +357,7 @@
 #rm $DEPENDSTREEFILE $DEPENDSFILE $SUPPORTSFILE $INDEXFILE $ORDERFILE
 
 # Perl was wiped, reinstall it!
-( cd lang/perl58 && ${BMAKE} bulk-install )
+( cd pkgtools/pkglint && cd ${PERL5_PKGSRCDIR} && ${BMAKE} bulk-install )
 perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc ${OPSYS} ${OS_VERSION}/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
 
 # Done!