[pkgsrc/trunk]: pkgsrc update pkg_chk to 1.75

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a59c6a7e09a
branches:  trunk
changeset: 514268:7a59c6a7e09a
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Jun 09 16:43:33 2006 +0000

description:
update pkg_chk to 1.75
- match bsd.own.mk logic for determining MAKECONF, as requested by Joerg

diffstat:

 doc/CHANGES-2006                  |  3 ++-
 pkgtools/pkg_chk/Makefile         |  5 +++--
 pkgtools/pkg_chk/files/pkg_chk.sh |  6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r f2bab58dd159 -r 7a59c6a7e09a doc/CHANGES-2006
--- a/doc/CHANGES-2006  Fri Jun 09 16:41:09 2006 +0000
+++ b/doc/CHANGES-2006  Fri Jun 09 16:43:33 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.457 2006/06/09 15:24:32 minskim Exp $
+$NetBSD: CHANGES-2006,v 1.458 2006/06/09 16:45:40 abs Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -2968,3 +2968,4 @@
        Added sysutils/munin-server version 1.3.1 [he 2006-06-08]
        Updated devel/glib to 1.2.10nb10 [tron 2006-06-08]
        Updated audio/libsidplay2 to 2.1.1nb1 [minskim 2006-06-09]
+       Updated pkgtools/pkg_chk to 1.75 [abs 2006-06-08]
diff -r f2bab58dd159 -r 7a59c6a7e09a pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Fri Jun 09 16:41:09 2006 +0000
+++ b/pkgtools/pkg_chk/Makefile Fri Jun 09 16:43:33 2006 +0000
@@ -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 @@
          -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 -r f2bab58dd159 -r 7a59c6a7e09a pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Fri Jun 09 16:41:09 2006 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Fri Jun 09 16:43:33 2006 +0000
@@ -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 "$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