summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2001-05-02 13:51:43 +0000
committerdmcmahill <dmcmahill>2001-05-02 13:51:43 +0000
commit575b1e91fdd090c1b296b14467c16af42525f5a9 (patch)
tree323759f0ae3c3acb7ec12d419d4a2260a52da176 /mk
parent8ac6224655c15efc82d3974241323ab540b1b3ac (diff)
downloadpkgsrc-575b1e91fdd090c1b296b14467c16af42525f5a9.tar.gz
do some extra checks. In particular, don't try to pkg_add a package if
it doesn't exist (doh!).
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 6614272cf6e..88ae8bd085e 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.23 2001/03/31 00:03:03 dmcmahill Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.24 2001/05/02 13:51:43 dmcmahill Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -236,8 +236,12 @@ bulk-package:
pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ; \
pkgfile=${PACKAGES}/All/$${pkgname}.tgz ;\
if ! `${PKG_INFO} -qe $$pkgname` ; then \
- ${ECHO_MSG} "BULK> " ${PKG_ADD} $$pkgfile ; \
- ${DO} ${PKG_ADD} $$pkgfile ; \
+ if [ -f $$pkgfile ]; then \
+ ${ECHO_MSG} "BULK> ${PKG_ADD} $$pkgfile"; \
+ ${DO} ${PKG_ADD} $$pkgfile ; \
+ else \
+ ${ECHO_MSG} "BULK> warning: $$pkgfile does not exist. It will be rebuilt." ;\
+ fi ;\
else \
${ECHO_MSG} "BULK> Required package $$pkgname ($$pkgdir) is already installed" ; \
fi ;\