 @@ -1,55 +1,46 @@
-# $NetBSD: Makefile,v 1.60 2008/04/23 21:55:29 abs Exp $
+# $NetBSD: Makefile,v 1.61 2008/05/02 19:10:26 apb Exp $
 DISTNAME=	pkg_chk-1.91
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Check installed package versions against pkgsrc
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	mktemp:run
 USE_TOOLS+= 	gzip:run
 NO_CHECKSUM=	YES
 NO_BUILD=	yes
 CONFLICTS=	pkgchk-[0-9]*
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 .include "../../mk/bsd.prefs.mk"
-# Avoid changing any the actual value of MAKECONF
+SUBST_CLASSES+=		vars
-TMP_MAKECONF=${MAKECONF:U/etc/mk.conf}
+SUBST_STAGE.vars=	pre-configure
 SUBST_MESSAGE.vars=	Configuring sources.
-do-build:
+SUBST_FILES.vars=	pkg_chk.sh pkg_chk.8
-	${SED} -e 's#@AWK@#${AWK}#g' \
+SUBST_VARS.vars=	AWK GREP GZIP_CMD ID MAKE MAKECONF MKTEMP \
-	  -e 's#@GREP@#${GREP}#g' \
+			PKG_ADD PKG_ADMIN PKG_DELETE PKG_INFO \
-	  -e 's#@GZIP_CMD@#${GZIP_CMD}#g' \
+			SED SH SORT TSORT PREFIX PKG_DBDIR XARGS
 	  -e 's#@ID@#${ID}#g' \
-	  -e 's#@MAKE@#${MAKE}#g' \
+REPLACE_SH+=		pkg_chk.sh
 	  -e 's#@MAKECONF@#${TMP_MAKECONF}#g' \
-	  -e 's#@MKTEMP@#${MKTEMP}#g' \
+do-extract:
-	  -e 's#@PKG_ADD@#${PKG_ADD}#g' \
+	cp ${FILESDIR}/pkg_chk.sh ${WRKSRC}
-	  -e 's#@PKG_ADMIN@#${PKG_ADMIN}#g' \
+	cp ${FILESDIR}/pkg_chk.8 ${WRKSRC}
 	  -e 's#@PKG_DELETE@#${PKG_DELETE}#g' \
 	  -e 's#@PKG_INFO@#${PKG_INFO}#g' \
 	  -e 's#@SED@#${SED}#g' \
 	  -e 's#@SH@#${SH}#g' \
 	  -e 's#@SORT@#${SORT}#g' \
 	  -e 's#@TSORT@#${TSORT}#g' \
 	  -e 's#@PREFIX@#${PREFIX}#g' \
 	  -e 's#@PKG_DBDIR@#${PKG_DBDIR}#g' \
 	  -e 's#@XARGS@#${XARGS}#g' \
 	  ${FILESDIR}/pkg_chk.sh >${WRKSRC}/pkg_chk.sh
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkg_chk.sh ${PREFIX}/sbin/pkg_chk
-	${INSTALL_MAN} ${FILESDIR}/pkg_chk.8 ${PREFIX}/${PKGMANDIR}/man8/pkg_chk.8
+	${INSTALL_MAN} ${WRKSRC}/pkg_chk.8 ${PREFIX}/${PKGMANDIR}/man8/pkg_chk.8
 .include "../../mk/bsd.pkg.mk"

 @@ -1,19 +1,19 @@
-.\"	$NetBSD: pkg_chk.8,v 1.25 2007/08/27 15:28:54 abs Exp $
+.\"	$NetBSD: pkg_chk.8,v 1.26 2008/05/02 19:10:26 apb Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs@NetBSD.org)
 .\" Absolutely no warranty.
 .\"
-.Dd September 29, 2006
+.Dd May 2, 2008
 .Dt PKG_CHK 8
 .Sh NAME
 .Nm pkg_chk
 .Nd check, and optionally update, installed packages
 .Sh SYNOPSIS
 .Nm
 .Op Fl aBbcfhiklNnpqrsuv
 .Op Fl C Ar conf
 .Op Fl D Ar tags
 .Op Fl L Ar file
 .Op Fl P Ar path
 .Op Fl U Ar tags
 .Sh DESCRIPTION
 @@ -258,40 +258,47 @@ or
 is present,
 .Em x11
 is added to the list of tags.
 Tags should not contain the - or + characters.
 To see tags for the current machine, run
 .Nm
 with the
 .Fl v
 option.
 .Sh ENVIRONMENT
 .Nm
 uses the following environment variables.
 .Bl -tag -width xxxx
-.It Ev PKGSRCDIR
+.It Ev MAKECONF
-Base of pkgsrc tree.
+Path to
-If not set in environment then read from
+.Pa mk.conf .
-.Pa ${MAKECONF}
+Defaults to
 .Pa @MAKECONF@ , @PREFIX@/etc/mk.conf ,
 or
 .Pa /etc/mk.conf .
-Defaults to
+.It Ev PKGSRCDIR
 Base of pkgsrc tree.
 If not set in the environment, then this variable is read from
 .Pa ${MAKECONF} .
 If it is still not set, and if the current working directory
 appears to be inside a pkgsrc tree, then this variable
 is set to the base of that pkgsrc tree.
 Finally, if
 .Pa /usr/pkgsrc
 appears to contain a pkgsrc tree, then that is used as a last resort.
 .It Ev PKG_DBDIR
 pkgsrc database directory.
 If not set in environment then read from
-.Pa ${MAKECONF}
+.Pa ${MAKECONF} .
 or
 .Pa /etc/mk.conf .
 Defaults to
 .Pa /var/db/pkg
 .It Ev PACKAGES
 Location of binary packages.
 If not set in environment then read from
 .Pa /etc/mk.conf .
 Defaults to
 .Pa ${PKGSRCDIR}/packages .
 .Pp
 Unless in a completely homogeneous environment (every machine running
 exactly the same OS version and architecture) setting
 .Ev ${PACKAGES}
 in

 @@ -1,16 +1,16 @@
 #!@SH@ -e
+#
-# $Id: pkg_chk.sh,v 1.56 2008/04/23 21:55:29 abs Exp $
+# $Id: pkg_chk.sh,v 1.57 2008/05/02 19:10:26 apb Exp $
+#
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
 # TODO: List top level packages installed but not in config
 PATH=${PATH}:/usr/sbin:/usr/bin
 SUMMARY_FILE=pkg_summary.gz
 OLD_SUMMARY_FILE=pkg_chk-summary
 is_binary_available()
+    {
     if [ -n "$PKGDB" ]; then
 @@ -148,29 +148,40 @@ extract_pkg_vars()
     if [ ! -f $PKGSRCDIR/$pkgdir/Makefile ];then
 	msg "WARNING: No $pkgdir/Makefile - package moved or obsolete?"
 	return
     fi
     cd $PKGSRCDIR/$PKGDIR
     extract_make_vars Makefile "$@"
     if [ -z "$PKGNAME" ]; then
 	fatal "Unable to extract PKGNAME for $pkgdir"
     fi
+    }
 extract_variables()
+    {
-    extract_mk_var PKGSRCDIR /usr/pkgsrc
+    extract_mk_var PKGSRCDIR ''
-    if [ ! -d $PKGSRCDIR -a -z "$opt_b" ] ; then
+    if [ -z "$PKGSRCDIR" ] ; then
-	fatal "Unable to locate PKGSRCDIR ($PKGSRCDIR)"
+	for dir in . .. ../.. /usr/pkgsrc ; do
 	    if [ -f "${dir}/mk/bsd.pkg.mk" ]; then
 		case "${dir}" in
 		/*) PKGSRCDIR="${dir}" ;;
 		*)  PKGSRCDIR="$( cd "${dir}" >/dev/null 2>&1 && pwd )" ;;
 		esac
 		break
 	    fi
 	done
     fi
     if [ ! -d $PKGSRCDIR -a \( -z "$opt_b" -o -n "$opt_s" \) ] ; then
 	fatal "Unable to locate PKGSRCDIR (${PKGSRCDIR:-not set})"
     fi
     # Now we have PKGSRCDIR, use it to determine PACKAGES, and PKGCHK_CONF
     # as well as AWK, GREP, SED, PKGCHK_TAGS and PKGCHK_NOTAGS
+    #
     if [ -n "$opt_g" ]; then
+        :
     elif [ -z "$opt_b" -o -n "$opt_s" -o -d $PKGSRCDIR/pkgtools/pkg_chk ] ; then
 	cd $PKGSRCDIR/pkgtools/pkg_chk
 	extract_make_vars Makefile \
 		AWK GREP GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \
 		PKGCHK_TAGS PKGCHK_UPDATE_CONF PKG_ADD PKG_DBDIR PKG_DELETE \
 @@ -740,34 +751,36 @@ test -n "$PKG_ADD"    || PKG_ADD="@PKG_A
 test -n "$PKG_ADMIN"  || PKG_ADMIN="@PKG_ADMIN@"
 test -n "$PKG_DBDIR"  || PKG_DBDIR="@PKG_DBDIR@"
 test -n "$PKG_DELETE" || PKG_DELETE="@PKG_DELETE@"
 test -n "$PKG_INFO"   || PKG_INFO="@PKG_INFO@"
 test -n "$SED"        || SED="@SED@"
 test -n "$SORT"	      || SORT="@SORT@"
 test -n "$TSORT"      || TSORT="@TSORT@"
 test -n "$XARGS"      || XARGS="@XARGS@"
 MY_TMPDIR=`${MKTEMP} -d ${TMPDIR-/tmp}/${0##*/}.XXXXXX`
 test -n "$MY_TMPDIR" || fatal "Couldn't create temporary directory."
 MY_TMPFILE=$MY_TMPDIR/tmp
 if [ -z "$MAKECONF" ] ; then
     for mkconf in "@MAKECONF@" "@PREFIX@/etc/mk.conf" /etc/mk.conf ; do
 	if [ -f "$mkconf" ] ; then
 	    MAKECONF="$mkconf"
 	    break
 	fi
     done
 fi
 if [ -z "$MAKECONF" -o ! -f "$MAKECONF" ] ; then
-    if [ -f @PREFIX@/etc/mk.conf ] ; then
+    MAKECONF=/dev/null
 	MAKECONF=@PREFIX@/etc/mk.conf
     elif [ -f /etc/mk.conf ] ; then
 	MAKECONF=/etc/mk.conf
     else
 	MAKECONF=/dev/null
     fi
 fi
 verbose_var MAKECONF
 # grabbed from GNU configure
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | ${SED} s/-n/xn/ | grep xn >/dev/null; then
     ac_n= ac_c='
 ' ac_t='	'
   else
     ac_n=-n ac_c= ac_t=
   fi
 else