diff options
| author | agc <agc> | 2004-07-30 18:32:20 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-30 18:32:20 +0000 |
| commit | 4e4d0453a4f2b04df7a46da279a99dab4a895938 (patch) | |
| tree | f2c65f8ac652871f2b3ee2f930d5eb6390b67fe6 | |
| parent | 9d193c90e1c7e5bb80982b33c2f4b366ab4b72dc (diff) | |
| download | pkgsrc-4e4d0453a4f2b04df7a46da279a99dab4a895938.tar.gz | |
Pullup ticket 92 to the pkgsrc-2004Q2 branch, requested by Grant Beattie
Bulk build fix
Module Name: pkgsrc
Committed By: grant
Date: Sun Jul 25 08:40:46 UTC 2004
Modified Files:
pkgsrc/mk/bulk: bsd.bulk-pkg.mk
Log Message:
correctly use PKG_SUFX instead of ".tgz".
this fixes a problem where bulk builds with PKG_SUFX=.tbz would
needlessly, repeatedly rebuild dependency packages because
${PKGNAME}.tgz did not exist.
| -rw-r--r-- | doc/CHANGES-pkgsrc-2004Q2 | 4 | ||||
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index 4cb49bac341..39377e7f56e 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.53 2004/07/30 16:20:33 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.54 2004/07/30 18:32:20 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -102,4 +102,6 @@ Pullup ticket 88, requested by Grant Beattie [agc 2004-07-30] Solaris fix for gpgme Pullup ticket 89, requested by Grant Beattie [agc 2004-07-30] Build fix for gnutls +Pullup ticket 92, requested by Grant Beattie [agc 2004-07-30] + Bulk build fix diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index d38b846de5a..cd643cb404c 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.60 2004/04/10 16:23:00 jschauma Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.60.2.1 2004/07/30 18:32:20 agc Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -323,7 +323,7 @@ bulk-package: for pkgdir in `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'` ${BULK_PREREQ} ; do \ pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ; \ if [ -z "$$pkgname" ]; then continue ; fi ;\ - pkgfile=${PACKAGES}/All/$${pkgname}.tgz ;\ + pkgfile=${PACKAGES}/All/$${pkgname}${PKG_SUFX} ;\ if ${PKG_INFO} -qe $$pkgname ; then \ ${ECHO_MSG} "BULK> Required package $$pkgname ($$pkgdir) is already installed" ; \ else \ |