diff options
| author | jlam <jlam> | 2005-05-19 15:18:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-19 15:18:13 +0000 |
| commit | 6a4a5a6598df2db3036921d1b2d01f8466e61b98 (patch) | |
| tree | 0304198979aeea8370def91452ddbabab36757ee /mk | |
| parent | 5a1d277899277fde3f62bef2b0327a17960e5a04 (diff) | |
| download | pkgsrc-6a4a5a6598df2db3036921d1b2d01f8466e61b98.tar.gz | |
PERL5_PKGSRCDIR is no more. Explicitly use "lang/perl58" for the
location of the perl package to install for bulk builds.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bulk/build | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 5309b9685c2..81a3a88e3e8 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.80 2005/05/06 00:52:30 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.81 2005/05/19 15:18:13 jlam Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -179,7 +179,7 @@ bulk-cache: .else @${ECHO_MSG} "BULK> Extracting database for SPECIFIC_PKGS subset of pkgsrc" @${ECHO_MSG} " along with their dependencies" -.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} ${PERL5_PKGSRCDIR:C|.*/([^/]*/[^/]*)$|\1|} pkgtools/pkglint +.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl58 pkgtools/pkglint cd ${PKGSRCDIR}/${__tmp__} && ${SETENV} BMAKE=${MAKE} AWK=${AWK} EXPR=${EXPR} ${SH} ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE} .endfor @${ECHO_MSG} "BULK> Extracting dependency tree file" diff --git a/mk/bulk/build b/mk/bulk/build index e28da38c39a..af6231b9a75 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: build,v 1.50 2005/05/18 20:12:49 sketch Exp $ +# $NetBSD: build,v 1.51 2005/05/19 15:18:13 jlam Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -189,7 +189,6 @@ fi 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 @@ -231,7 +230,6 @@ echo "----------------------------------" # 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 \ @@ -366,7 +364,7 @@ do done # Perl was wiped, reinstall it! -( cd pkgtools/pkglint && cd ${PERL5_PKGSRCDIR} && ${BMAKE} bulk-install ) +( cd lang/perl58 && ${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! |