From 4af52fd7614c0a9c5873fb44d97e1621988cdb43 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Fri, 20 Apr 2007 09:50:21 +0000
Subject: Checking whether a file with an blank filename exists is somewhat
 bogus. Improve the last change to avoid that. Bump package revision again.

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

(limited to 'pkgtools/pkg_chk')

diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index ff1040d4500..8d48c42bb98 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -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 --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index c343d1d4bab..31fb3f7eb30 100755
--- a/pkgtools/pkg_chk/files/pkg_chk.sh
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh
@@ -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 "$SED"        || SED="@SED@"
 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
-- 
cgit v1.2.3