From ef29fc39eb00d3d0874b92d8389b9b2a738246e2 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Tue, 6 May 2003 13:14:36 +0000
Subject: Update pkgchk to 1.35:     Handle missing /etc/mk.conf - fixes PR
 pkg/21471 from Tomasz Luchowski

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

(limited to 'pkgtools')

diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile
index 8812de94053..076124573c8 100644
--- a/pkgtools/pkgchk/Makefile
+++ b/pkgtools/pkgchk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2003/03/29 12:42:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/06 13:14:36 abs Exp $
 
-DISTNAME=	pkgchk-1.34
+DISTNAME=	pkgchk-1.35
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh
index 48430062964..719adde3616 100755
--- a/pkgtools/pkgchk/files/pkgchk.sh
+++ b/pkgtools/pkgchk/files/pkgchk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# $Id: pkgchk.sh,v 1.37 2002/10/08 15:44:14 abs Exp $
+# $Id: pkgchk.sh,v 1.38 2003/05/06 13:14:37 abs Exp $
 #
 # TODO: Handle updates with dependencies via binary packages
 
@@ -309,7 +309,11 @@ unset PKG_PATH || true
 test -n "$MAKE" || MAKE="@MAKE@"
 test -n "$MAKECONF" || MAKECONF="@MAKECONF@"
 if [ ! -f $MAKECONF ] ; then
-    MAKECONF=/etc/mk.conf
+    if [ -f /etc/mk.conf ] ; then
+	MAKECONF=/etc/mk.conf
+    else
+	MAKECONF=/dev/null
+    fi
 fi
 
 # grabbed from GNU configure
-- 
cgit v1.2.3