Skip to content

Commit

Permalink
Pullup ticket 92 to the pkgsrc-2004Q2 branch, requested by Grant Beattie
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
agc committed Jul 30, 2004
1 parent 7e37501 commit 4faa364
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion doc/CHANGES-pkgsrc-2004Q2
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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

4 changes: 2 additions & 2 deletions mk/bulk/bsd.bulk-pkg.mk
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 4faa364

Please sign in to comment.