[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 92 to the pkgsrc-2004Q2 branch, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92e7d880f1b9
branches:  pkgsrc-2004Q2
changeset: 476760:92e7d880f1b9
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jul 30 18:32:20 2004 +0000

description:
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.

diffstat:

 doc/CHANGES-pkgsrc-2004Q2 |  4 +++-
 mk/bulk/bsd.bulk-pkg.mk   |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r fa5a82028c03 -r 92e7d880f1b9 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Fri Jul 30 16:20:33 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Fri Jul 30 18:32:20 2004 +0000
@@ -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 @@
        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 -r fa5a82028c03 -r 92e7d880f1b9 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Fri Jul 30 16:20:33 2004 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Fri Jul 30 18:32:20 2004 +0000
@@ -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@localhost>
@@ -323,7 +323,7 @@
                        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 \