From d4dac6f718dfc5dcb557543c3a6770697b569179 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Fri, 9 Jun 2006 16:43:33 +0000
Subject: update pkg_chk to 1.75 - match bsd.own.mk logic for determining
 MAKECONF, as requested by Joerg

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

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index b59e25f9fa1..610feca28e5 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/06/07 16:27:14 abs Exp $
+# $NetBSD: Makefile,v 1.35 2006/06/09 16:43:33 abs Exp $
 
-DISTNAME=	pkg_chk-1.74
+DISTNAME=	pkg_chk-1.75
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -38,6 +38,7 @@ do-build:
 	  -e 's#@SH@#${SH}#g' \
 	  -e 's#@SORT@#${SORT}#g' \
 	  -e 's#@TSORT@#${TSORT}#g' \
+	  -e 's#@PREFIX@#${PREFIX}#g' \
 	  ${FILESDIR}/pkg_chk.sh >${WRKSRC}/pkg_chk.sh
 
 do-install:
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index b80606a34ca..20f40db6f9f 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.35 2006/06/07 16:27:14 abs Exp $
+# $Id: pkg_chk.sh,v 1.36 2006/06/09 16:43:33 abs Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
@@ -646,7 +646,9 @@ test -n "$SORT"	      || SORT="@SORT@"
 test -n "$TSORT"      || TSORT="@TSORT@"
 
 if [ ! -f $MAKECONF ] ; then
-    if [ -f /etc/mk.conf ] ; then
+    if [ -f @PREFIX@/etc/mk.conf ] ; then
+	MAKECONF=@PREFIX@/etc/mk.conf
+    elif [ -f /etc/mk.conf ] ; then
 	MAKECONF=/etc/mk.conf
     else
 	MAKECONF=/dev/null
-- 
cgit v1.2.3