diff options
| author | jlam <jlam> | 2004-11-23 19:44:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-23 19:44:02 +0000 |
| commit | bca5dd6cd4d8b9911bc68c13910d9ea24149463b (patch) | |
| tree | a2eb661a708a10f1759426b0f6942ace11cd53cc | |
| parent | f9f0eb56640205513f04aef5d446065182242e7e (diff) | |
| download | pkgsrc-bca5dd6cd4d8b9911bc68c13910d9ea24149463b.tar.gz | |
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.
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bulk/build | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 70f9bb90e7b..55ee6683158 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.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> @@ -150,7 +150,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} 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 --git a/mk/bulk/build b/mk/bulk/build index 1f8868c174b..cc4fa8aff46 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -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> @@ -189,6 +189,7 @@ 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 @@ -230,6 +231,7 @@ 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 \ @@ -355,7 +357,7 @@ echo "Post processing bulk build results..." #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! |