 @@ -1,33 +1,32 @@
-# $NetBSD: Makefile,v 1.75 2011/01/13 17:07:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.76 2012/05/13 13:43:59 abs Exp $
-DISTNAME=	pkg_chk-2.0
+DISTNAME=	pkg_chk-2.0.1
 PKGREVISION=	1
 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}
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	mktemp:run
-USE_TOOLS+= 	gzcat:run
+USE_TOOLS+=	gzcat:run
-USE_TOOLS+= 	gzip:run
+USE_TOOLS+=	gzip:run
 NO_BUILD=	yes
 CONFLICTS=	pkgchk-[0-9]*
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 .include "../../mk/bsd.prefs.mk"
 SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	pre-configure
 SUBST_MESSAGE.vars=	Configuring sources.
 SUBST_FILES.vars=	pkg_chk.sh pkg_chk.8
 SUBST_VARS.vars=	AWK GREP GZCAT GZIP_CMD ID MAKE MAKECONF MKTEMP \

 @@ -1,16 +1,16 @@
 #!@SH@ -e
+#
-# $Id: pkg_chk.sh,v 1.65 2009/07/22 21:56:13 sketch Exp $
+# $Id: pkg_chk.sh,v 1.66 2012/05/13 13:43:59 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()
+    {
 @@ -359,46 +359,40 @@ list_packages()
 pkgdir2pkgname()
+    {
     pkgdir=$1
     for pkgline in $PKGDB ; do
 	case $pkgline in
 	    "$pkgdir:"*)
 		echo $pkgline | ${SED} 's/[^:]*://'
 		return;
 	    ;;
 	esac
     done
+    }
-pkgdirs_from_conf()
+determine_tags()
+    {
     CONF=$1; shift
     LIST="$*"
     if [ ! -r $CONF ];then
 	fatal "Unable to read PKGCHK_CONF '$CONF'"
     fi
     # Determine list of tags
+    #
     if [ "$PKGSRCDIR" = NONE ]; then
 	OPSYS=$(uname -s)
 	OS_VERSION=$(uname -r)
 	MACHINE_ARCH=$(uname -p)
     else
 	extract_make_vars Makefile OPSYS OS_VERSION MACHINE_ARCH
     fi
     TAGS="$(hostname | ${SED} -e 's,\..*,,'),$(hostname),$OPSYS-$OS_VERSION-$MACHINE_ARCH,$OPSYS-$OS_VERSION,$OPSYS-$MACHINE_ARCH,$OPSYS,$OS_VERSION,$MACHINE_ARCH"
-    if [ -f /usr/X11R6/lib/libX11.so -o -f /usr/X11R6/lib/libX11.a ];then
+    if [ -f /usr/X11R7/lib/libX11.a -o -f /usr/X11R6/lib/libX11.a ];then
 	TAGS="$TAGS,x11"
     fi
     if [ -n "$PKGCHK_TAGS" ];then
 	TAGS="$TAGS,$PKGCHK_TAGS"
     fi
     if [ -n "$PKGCHK_NOTAGS" ];then
 	if [ -n "$opt_U" ];then
 		opt_U="$opt_U,$PKGCHK_NOTAGS"
 	else
 		opt_U="$PKGCHK_NOTAGS"
 	fi
     fi
 @@ -408,26 +402,36 @@ pkgdirs_from_conf()
     case ",$opt_U," in
 	*,\*,*)
 	    TAGS=''
 	    ;;
     esac
     if [ -n "$TAGS" ];then
 	if [ -n "$opt_D" ];then
 		opt_D="$opt_D,$TAGS"
 	else
 		opt_D="$TAGS"
 	fi
     fi
     verbose "set   TAGS=$opt_D"
+    }
 pkgdirs_from_conf()
+    {
     CONF=$1; shift
     LIST="$*"
     if [ ! -r $CONF ];then
 	fatal "Unable to read PKGCHK_CONF '$CONF'"
     fi
     # Extract list of valid pkgdirs (skip any 'alreadyset' in $LIST)
+    #
     LIST="$LIST "$(${AWK} -v alreadyset="$LIST" -v setlist="$opt_D" -v unsetlist="$opt_U" '
     BEGIN {
 	split(alreadyset, tmp, " ");
 	for (tag in tmp) { skip[tmp[tag]] = 1; }
 	split(setlist, tmp, ",");
 	for (tag in tmp) { taglist[tmp[tag]] = 1; }
 	split(unsetlist, tmp, ",");
 	for (tag in tmp) { skip[tmp[tag]] = 1; nofile[tmp[tag]] = 1 ;
 @@ -838,26 +842,28 @@ if [ -n "$opt_b" -a -z "$opt_s" ] ; then
 		| ${AWK} -F= "$AWK_PARSE_SUMMARY"`
 	    if [ -z "$PKGDB" ]
 	    then
 		PKGDB=`ftp -o - $PACKAGES/$OLD_SUMMARY_FILE`
 	    fi;;
 	*)
 	    if [ -d "$PACKAGES" ] ; then
 		PKGDB=$(get_bin_pkg_info | bin_pkg_info2pkgdb)
 		PKGSRCDIR=NONE
 	    fi;;
     esac
 fi
 determine_tags
 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"
     PKGDIRLIST=$(pkgdirs_from_installed)
 fi
 if [ -n "$opt_p" ] ; then
     pkgdirs_from_conf $PKGCHK_CONF $PKGDIRLIST | tr ' ' '\n'
     exit