 @@ -1,16 +1,16 @@
 #!@SH@ -e
+#
-# $Id: pkg_chk.sh,v 1.62 2009/02/21 20:50:06 abs Exp $
+# $Id: pkg_chk.sh,v 1.63 2009/03/25 00:00:52 abs Exp $
+#
 # TODO: Make -g check dependencies and tsort
 # TODO: Make -g list user-installed packages first, followed by commented
 #	out automatically installed packages
 # TODO: List user-installed packages that are not in config
 PATH=${PATH}:/usr/sbin:/usr/bin
 SUMMARY_FILE=pkg_summary.gz
 OLD_SUMMARY_FILE=pkg_chk-summary
 is_binary_available()
+    {
 @@ -247,59 +247,61 @@ generate_conf_from_installed()
     FILE=$1
     if [ -r $FILE ]; then
 	mv $FILE ${FILE}.old
     fi
     echo "# Generated automatically at $(date)" > $FILE
     echo $(pkgdirs_from_installed) | tr ' ' '\n' >> $FILE
+    }
 get_bin_pkg_info()
+    {
     summary_file=$PACKAGES/$SUMMARY_FILE
     if [ -f $summary_file ] ; then
 	if [ -z "$(find $PACKAGES -type f -newer $summary_file -name '*.t[bg]z')" ] ; then
 	    msg_progress Reading $summary_file
 	    zcat $summary_file
 	    return;
 	fi
 	echo "*** Ignoring $SUMMARY_FILE as PACKAGES contains newer files" >&2
     fi
     msg_progress Scan $PACKAGES
     list_bin_pkgs | ${XARGS} ${PKG_INFO} -X
+    }
 get_build_ver()
+    {
     if [ -n "$opt_b" -a -z "$opt_s" ] ; then
-	${PKG_INFO} -. -q -b $PACKAGES/$PKGNAME$PKG_SUFX | ${GREP} .
+	${PKG_INFO} -q -b $PACKAGES/$PKGNAME$PKG_SUFX | ${GREP} .
 	return
     fi
-    # Unfortunately pkgsrc always outputs to a file, but it does helpfully
+    # Unfortunately pkgsrc always outputs to a file, but it does
-    # allows # us to specify the name
+    # helpfully allows us to specify the name
     rm -f $MY_TMPFILE
     ${MAKE} _BUILD_VERSION_FILE=$MY_TMPFILE $MY_TMPFILE
     cat $MY_TMPFILE
+    }
 list_bin_pkgs ()
+    {
     ls -t $PACKAGES | grep "$PKG_SUFX_RE"'$' | ${SED} "s|^|$PACKAGES/|"
+    }
 # Given a binary package filename as the first argumennt, return a list
 # of exact package versions against which it was built and on which it
 # depends
+#
 list_dependencies()
+    {
-    ${PKG_INFO} -. -q -n $1 | ${GREP} .. || true
+    ${PKG_INFO} -q -n $1 | ${GREP} .. || true
+    }
 # Pass a list of pkgdirs, outputs a tsorted list including any dependencies
+#
 list_packages()
+    {
     # Convert passed in list of pkgdirs to a list of binary package files
     pkglist=''
     for pkgdir in $* ; do
 	pkgname=`pkgdir2pkgname $pkgdir`
 	if [ -z "$pkgname" ]; then
 	    fatal_later "$pkgdir - Unable to extract pkgname"
 	    continue
 @@ -829,27 +831,26 @@ fi
 AWK_PARSE_SUMMARY='$1=="PKGNAME"{pkgname=$2} $1=="PKGPATH"{pkgpath=$2} NF==0{if (pkgpath && pkgname) print pkgpath ":" pkgname; pkgpath=""; pkgname=""} END{if (pkgpath && pkgname) print pkgpath ":" pkgname}'
 if [ -n "$opt_b" -a -z "$opt_s" ] ; then
     case $PACKAGES in
 	http://*|ftp://*)
             PKGDB=`ftp -o - $PACKAGES/$SUMMARY_FILE | ${GZIP_CMD} -cd \
 		| ${AWK} -F= "$AWK_PARSE_SUMMARY"`
 	    if [ -z "$PKGDB" ]
 	    then
 		PKGDB=`ftp -o - $PACKAGES/$OLD_SUMMARY_FILE`
 	    fi;;
 	*)
 	    if [ -d "$PACKAGES" ] ; then
 		msg_progress Scan $PACKAGES
 		PKGDB=$(get_bin_pkg_info | bin_pkg_info2pkgdb)
 		PKGSRCDIR=NONE
 	    fi;;
     esac
 fi
 if [ -n "$opt_g" ]; then
     verbose "Write $PKGCHK_CONF based on installed packages"
     generate_conf_from_installed $PKGCHK_CONF
 fi
 if [ -n "$opt_r" -o -n "$opt_u" ];then
     verbose "Enumerate PKGDIRLIST from installed packages"

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.70 2009/02/21 20:50:06 abs Exp $
+# $NetBSD: Makefile,v 1.71 2009/03/25 00:00:52 abs Exp $
-DISTNAME=	pkg_chk-1.97
+DISTNAME=	pkg_chk-1.98
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 OWNER=		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
 PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty