[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_chk Checking whether a file with an blank...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c88db780269
branches:  trunk
changeset: 528067:0c88db780269
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Apr 20 09:50:21 2007 +0000

description:
Checking whether a file with an blank filename exists is somewhat bogus.
Improve the last change to avoid that. Bump package revision again.

diffstat:

 pkgtools/pkg_chk/Makefile         |  4 ++--
 pkgtools/pkg_chk/files/pkg_chk.sh |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 4258d150066a -r 0c88db780269 pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Fri Apr 20 09:25:36 2007 +0000
+++ b/pkgtools/pkg_chk/Makefile Fri Apr 20 09:50:21 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2007/04/20 09:25:36 tron Exp $
+# $NetBSD: Makefile,v 1.51 2007/04/20 09:50:21 tron Exp $
 
 DISTNAME=      pkg_chk-1.85
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 4258d150066a -r 0c88db780269 pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Fri Apr 20 09:25:36 2007 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Fri Apr 20 09:50:21 2007 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.47 2007/04/20 09:25:37 tron Exp $
+# $Id: pkg_chk.sh,v 1.48 2007/04/20 09:50:21 tron Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
@@ -701,7 +701,7 @@
 test -n "$SORT"              || SORT="@SORT@"
 test -n "$TSORT"      || TSORT="@TSORT@"
 
-if [ ! -f "$MAKECONF" ] ; then
+if [ -z "$MAKECONF" -o ! -f "$MAKECONF" ] ; then
     if [ -f @PREFIX@/etc/mk.conf ] ; then
        MAKECONF=@PREFIX@/etc/mk.conf
     elif [ -f /etc/mk.conf ] ; then