update pkg_chk to 1.58

- sort -l output so that dependencies always come before packages
  which depend upon them
- completely rework -u so that a list of packages to be update is generated,
  then all mismatched packages are removed, then the list is processed to
  add in packages. If -u is interrupted, a second run will resume the update
- update (-u) works with binary packages

4 files changed, 225 insertions, 234 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 41abaee10b2..3c2895d7762 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10268 2005/06/01 03:38:04 taca Exp $
+$NetBSD: CHANGES,v 1.10269 2005/06/01 11:30:28 abs Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 	
@@ -2750,3 +2750,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated textproc/diction to 1.08 [snj 2005-06-01]
 	Updated audio/mpc to 0.11.2 [simonb 2005-06-01]
 	Updated graphics/ruby-imlib2 to 0.5.1 [taca 2005-06-01]
+	Updated pkgtools/pkg_chk to 1.58 [abs 2005-06-01]
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index d66d420d67e..71555629f22 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2005/05/07 22:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 11:29:45 abs Exp $
 
-DISTNAME=	pkg_chk-1.57
+DISTNAME=	pkg_chk-1.58
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkg_chk/files/pkg_chk.8 b/pkgtools/pkg_chk/files/pkg_chk.8
index 610d13298f6..dee22e18cdd 100644
--- a/pkgtools/pkg_chk/files/pkg_chk.8
+++ b/pkgtools/pkg_chk/files/pkg_chk.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_chk.8,v 1.9 2005/03/26 00:46:40 hubertf Exp $
+.\"	$NetBSD: pkg_chk.8,v 1.10 2005/06/01 11:29:45 abs Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs@NetBSD.org)
 .\" Absolutely no warranty.
@@ -40,7 +40,8 @@ or
 .Fl s
 options are given.
 .It Fl B
-Check the "Build version" (see option -b of pkg_info(1)) of packages.
+Include the "Build version" (see option -b of pkg_info(1)) of packages when
+determining if a package is up to date.
 .It Fl b
 Use binary packages. If
 .Fl s
@@ -94,7 +95,8 @@ against which each package was built) based on
 Will abort if a binary package is missing.
 This can be used (in conjunction with -U and -D) to determine what
 packages would need to be copied to a remote machine to ensure it
-was completely up to date.
+was completely up to date. The list is sorted so that dependencies
+always come before packages which depend upon them.
 .It Fl N
 For each installed package, look if there is a newer version
 noted in PKGSRCDIR/doc/TODO.
@@ -133,7 +135,8 @@ or
 options are given.
 .Pp
 Note: If the update fails (particularly when building from source), the system
-will be left with missing packages.
+will be left with missing packages. Once the error has been fixed a second run
+will resume the update.
 .It Fl v
 Verbose - list the tags set when checking
 .Pa pkgchk.conf ,
@@ -258,6 +261,14 @@ If not set in environment then read from
 .Pa /etc/mk.conf .
 Defaults to
 .Pa ${PKGSRCDIR}/pkgchk.conf .
+.It Ev PKGCHK_UPDATE_CONF
+Pathname to temporary list of installed packages used when updating.
+If not set in environment then read from
+.Pa /etc/mk.conf .
+Defaults to
+.Pa ${PKGSRCDIR}/pkgchk_update-$(hostname).conf . Note, if pkgsrc is being
+shared across multiple machines which may be updating at the same time then
+it is important this file does not overlap between machines.
 .It Ev PKGCHK_TAGS
 Additional tags to add when parsing
 .Pa pkgchk.conf .
@@ -275,9 +286,9 @@ devel/cpuflags
 pkgtools/xpkgwedge              x11
 
 shells/standalone-tcsh          *
-wm/pwm                          x11
+wm/pwm                          /etc/X11/XF86Config
 misc/setiathome                 i386
-print/acroread                  x11+i386
+print/acroread                  /etc/X11/XF86Config+i386
 www/communicator                x11+sparc x11+sparc64
 www/navigator                	x11+i386
 x11/xlockmore                   x11 -wopr
@@ -288,44 +299,7 @@ x11/xlockmore                   x11 -wopr
 .Aq abs@netbsd.org ,
 plus much from Stoned Elipot.
 .Sh BUGS
-Updating packages on which other packages depend can currently only be done
-via source (not binary packages).
 .Pp
-If both package
-.Em a
-and package
-.Em b
-are to be updated, and
-.Em a
-depends on
-.Em b ,
+When used against binary packages,
 .Nm
-will correctly skip the update of
-.Em a .
-However, if
-.Em a
-depends on
-.Em b
-and
-.Em c ,
-and all three are marked for update,
-.Nm
-will update
-.Em b
-and
-.Em c
-in two separate passes, resulting in unnecessary rebuilding of
-.Em a
-(and potentially other packages).
-.Pp
-There exists a workaround, if you have a complete
-.Pa pkgchk.conf :
-.Bd -literal
-# pkg_chk -ra
-
-.Ed
-will remove all outdated packages and then install all
-files that are in your
-.Pa pkgchk.conf
-file, but not currently installed, i.e. hopefully all
-that you just deleted, if the file was complete.
+does not handle the directory containing multiple versions of the same package.
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index dd22c0ed57c..dfca84cccba 100755
--- a/pkgtools/pkg_chk/files/pkg_chk.sh
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh
@@ -1,14 +1,16 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.14 2005/04/20 15:32:25 abs Exp $
+# $Id: pkg_chk.sh,v 1.15 2005/06/01 11:29:45 abs Exp $
 #
-# TODO: Handle updates with dependencies via binary packages
+# 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
+# TODO: Generate list files so -u can work against a remote URL
 
 PATH=/usr/sbin:/usr/bin:${PATH}
 
 check_packages_installed()
     {
-    UPDATE_TODO=
     MISSING_TODO=
     MISMATCH_TODO=
 
@@ -31,7 +33,6 @@ check_packages_installed()
 	    if [ -n "$pkginstalled" ];then
 		msg_n "version mismatch - $pkginstalled"
 		MISMATCH_TODO="$MISMATCH_TODO $pkginstalled"
-		UPDATE_TODO="$UPDATE_TODO $PKGNAME $pkgdir"
 	    else
 		msg_n "missing"
 		MISSING_TODO="$MISSING_TODO $PKGNAME $pkgdir"
@@ -52,7 +53,6 @@ check_packages_installed()
 		    verbose "$installed_build_ver"
 		    verbose "----"
 		    MISMATCH_TODO="$MISMATCH_TODO $PKGNAME"
-		    # should we mark this pkg to be updated if -u is given ??
 		else
 		    verbose "$PKGNAME: OK"
 		fi
@@ -63,6 +63,15 @@ check_packages_installed()
     done
     }
 
+delete_pkgs()
+    {
+    for pkg in $* ; do
+	if [ -d $PKG_DBDIR/$pkg ] ; then
+	    run_cmd "${PKG_DELETE} -r $pkg" 1
+	fi
+    done
+    }
+
 extract_make_vars()
     {
     MAKEFILE=$1
@@ -130,13 +139,15 @@ extract_variables()
 
     if [ -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 SED PACKAGES PKG_INFO PKG_ADD \
-			PKG_DELETE PKGCHK_CONF PKGCHK_TAGS PKGCHK_NOTAGS
+	extract_make_vars Makefile AWK GREP SED TSORT SORT PACKAGES PKG_INFO \
+			PKG_ADD PKG_DELETE PKGCHK_CONF PKGCHK_UPDATE_CONF \
+			PKGCHK_TAGS PKGCHK_NOTAGS
 	if [ -z "$PACKAGES" ];then
 	    PACKAGES=$PKGSRCDIR/packages
 	fi
     elif [ $MAKECONF != /dev/null ] ; then
-	extract_make_vars $MAKECONF PACKAGES PKGCHK_CONF PKGCHK_TAGS PKGCHK_NOTAGS
+	extract_make_vars $MAKECONF PACKAGES PKGCHK_CONF PKGCHK_UPDATE_CONF \
+			PKGCHK_TAGS PKGCHK_NOTAGS
 	if [ -z "$PACKAGES" ] ; then
 	    PACKAGES=`pwd`
 	fi
@@ -145,6 +156,9 @@ extract_variables()
     if [ -z "$PKGCHK_CONF" ];then
 	PKGCHK_CONF=$PKGSRCDIR/pkgchk.conf
     fi
+    if [ -z "$PKGCHK_UPDATE_CONF" ];then
+	PKGCHK_UPDATE_CONF=$PKGSRCDIR/pkgchk_update-$(hostname).conf
+    fi
     }
 
 fatal()
@@ -161,6 +175,16 @@ fatal_maybe()
     fi
     }
 
+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) | fmt -1 	>> $FILE
+    }
+
 get_build_ver()
     {
     if [ -n "$opt_b" -a -z "$opt_s" ] ; then
@@ -207,31 +231,127 @@ list_packages()
 	verbose "$PKGNAME.tgz: found"
 	CHECKLIST="$CHECKLIST$PKGNAME ";
     done
+
+    PAIRLIST=
+    PKGLIST=' '
     while [ "$CHECKLIST" != ' ' ]; do
-	PKGLIST="$PKGLIST$CHECKLIST"
 	NEXTCHECK=' '
 	for pkg in $CHECKLIST ; do
 	    if [ ! -f $PACKAGES/$pkg.tgz ] ; then
 		fatal_maybe " ** $pkg.tgz - binary package dependency missing"
 		continue
 	    fi
-	    for dep in $(${PKG_INFO} -. -N $PACKAGES/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..) ; do
-		case "$PKGLIST$NEXTCHECK" in
-		    *\ $dep\ *)
+	    DEPLIST="$(${PKG_INFO} -. -N $PACKAGES/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..)"
+	    if [ -z "$DEPLIST" ] ; then
+		PAIRLIST="${PAIRLIST}$pkg.tgz $pkg.tgz\n"
+	    fi
+	    for dep in $DEPLIST ; do
+		if [ ! -f $PACKAGES/$dep.tgz ] ; then
+		    fatal_maybe " ** $dep.tgz - binary package dependency missing"
+		    break 2
+		fi
+		PAIRLIST="${PAIRLIST}$dep.tgz $pkg.tgz\n"
+		case "$PKGLIST$CHECKLIST$NEXTCHECK" in
+		    *" $dep "*)
 			verbose "$pkg: Duplicate depend $dep"
 			;;
 		    *)
-			NEXTCHECK="$NEXTCHECK$dep "
+			NEXTCHECK=" $dep$NEXTCHECK"
 			verbose "$pkg: Add depend $dep"
 			;;
 		esac
 	    done
+	    PKGLIST="$pkg $PKGLIST"
 	done
 	CHECKLIST="$NEXTCHECK"
     done
-    for pkg in $PKGLIST ; do
-	echo $pkg.tgz
-    done
+    printf "$PAIRLIST" | ${TSORT}
+    }
+
+pkgdirs_from_conf()
+    {
+    CONF=$1; shift
+    LIST="$*"
+    if [ ! -r $CONF ];then
+	fatal "Unable to read PKGCHK_CONF '$CONF'"
+    fi
+
+    # Determine list of tags
+    #
+    extract_make_vars Makefile OPSYS OS_VERSION MACHINE_ARCH
+    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
+	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
+    if [ -n "$opt_D" ];then
+	TAGS="$TAGS,$opt_D"
+    fi
+    verbose "set   TAGS=$TAGS"
+    verbose "unset TAGS=$opt_U"
+
+    # Extract list of valid pkgdirs (skip any 'alreadyset' in $LIST)
+    #
+    LIST="$LIST "$(${AWK} -v alreadyset="$LIST" -v setlist=$TAGS -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; delete taglist[tmp[tag]] }
+
+	taglist["*"] = "*"
+    }
+    function and_expr_with_dict(expr, dict, ary, i, r, d) {
+	split(expr,ary,/\+/);
+	r = 1;
+	for (i in ary) {
+		if (ary[i] ~ /^\//) {
+			if (getline d < ary[i] == -1)
+			    { r = 0; break ;}
+		}
+		else if (! (ary[i] in dict))
+			{ r = 0; break ;}
+	}
+	return r;
+    }
+    {
+    sub("#.*", "");
+    if (skip[$1])
+	{ next; }
+    need = 0;
+    for (f = 1 ; f<=NF ; ++f) {			# For each word on the line
+	if (sub("^-", "", $f)) { 	# If it begins with a '-'
+		if (and_expr_with_dict($f, taglist))
+			next;		# If it is true, discard
+	} else {
+		if (and_expr_with_dict($f, taglist))
+			need = 1;	# If it is true, note needed
+	}
+    }
+    if (NF == 1 || need)
+	{ print $1 }
+    }
+    ' < $CONF
+    )
+    echo $LIST
+    }
+
+pkgdirs_from_installed()
+    {
+    ${PKG_INFO} -Bqa | ${AWK} -F= '/PKGPATH=/{print $2}' | ${SORT}
     }
 
 msg()
@@ -269,6 +389,16 @@ pkg_fetch()
     fi
     }
 
+pkg_fetchlist()
+    {
+    PKGLIST=$@
+    msg_progress Fetch
+    while [ $# != 0 ]; do 
+	pkg_fetch $1 $2
+	shift ; shift;
+    done
+    }
+
 pkg_install()
     {
     PKGNAME=$1
@@ -278,13 +408,6 @@ pkg_install()
     if [ -d $PKG_DBDIR/$PKGNAME ];then
 	msg "$PKGNAME installed in previous stage"
     elif [ -n "$opt_b" -a -f $PACKAGES/$PKGNAME.tgz ] ; then
-	if [ $INSTALL = Update ];then
-	    PKG=$(echo $PKGNAME | ${SED} 's/-[0-9].*//')
-	    run_cmd "${PKG_DELETE} $PKG" 1
-	    if [ -n "$FAIL" ]; then
-		fatal "Can only update packages with dependencies via -s"
-	    fi
-	fi
 	if [ -n "$saved_PKG_PATH" ] ; then
 	    export PKG_PATH=$saved_PKG_PATH
 	fi
@@ -303,23 +426,11 @@ pkg_install()
 
     if [ -n "$FAIL" ]; then
 	FAIL_DONE=$FAIL_DONE" "$PKGNAME
-    elif [ $INSTALL = Update ];then
-	UPDATE_DONE=$UPDATE_DONE" "$PKGNAME
     else
 	INSTALL_DONE=$INSTALL_DONE" "$PKGNAME
     fi
     }
 
-pkg_fetchlist()
-    {
-    PKGLIST=$@
-    msg_progress Fetch
-    while [ $# != 0 ]; do 
-	pkg_fetch $1 $2
-	shift ; shift;
-    done
-    }
-
 pkg_installlist()
     {
     INSTALL=$1 ; shift
@@ -388,7 +499,8 @@ usage()
 	-v      Verbose
 
 pkg_chk verifies installed packages against pkgsrc.
-The most common usage is 'pkg_chk -i' to check all installed packages.
+The most common usage is 'pkg_chk -i' to check all installed packages or
+'pkg_chk -u' to update all out of date packages.
 For more advanced usage, including defining a set of desired packages based
 on hostname and type, see pkg_chk(8).
 
@@ -400,7 +512,7 @@ If neither -b nor -s is given, both are assumed with -b preferred.
 verbose()
     {
     if [ -n "$opt_v" ] ; then
-	msg "$@"
+	msg "$@" >&2
     fi
     }
 
@@ -454,12 +566,14 @@ fi
 saved_PKG_PATH=$PKG_PATH
 unset PKG_PATH || true
 
-test -n "$AWK" || AWK="@AWK@"
-test -n "$GREP" || GREP="@GREP@"
-test -n "$MAKE" || MAKE="@MAKE@"
+test -n "$AWK"      || AWK="@AWK@"
+test -n "$GREP"     || GREP="@GREP@"
+test -n "$MAKE"     || MAKE="@MAKE@"
 test -n "$MAKECONF" || MAKECONF="@MAKECONF@"
 test -n "$PKG_INFO" || PKG_INFO="@PKG_INFO@"
-test -n "$SED" || SED="@SED@"
+test -n "$SED"      || SED="@SED@"
+test -n "$SORT"	    || SORT="@SORT@"
+test -n "$TSORT"    || TSORT="@TSORT@"
 
 if [ ! -f $MAKECONF ] ; then
     if [ -f /etc/mk.conf ] ; then
@@ -526,172 +640,74 @@ fi
 cd $PKGSRCDIR
 real_pkgsrcdir=$(pwd)
 
-if [ -n "$opt_i" ];then
-    PKGDIRLIST=$(sh -c "${PKG_INFO} -B \*" | ${AWK} -F= '/PKGPATH=/{printf $2" "}')
-fi
-
 if [ -n "$opt_g" ]; then
-	if [ -r $PKGCHK_CONF ]; then
-		mv $PKGCHK_CONF ${PKGCHK_CONF}.old
-	fi
-	echo "# Generated automatically at $(date)" > $PKGCHK_CONF
-	${PKG_INFO} -qBa | ${AWK} '/^PKGPATH/ { sub("PKGPATH=[ ]*", ""); print }' >> $PKGCHK_CONF
+    verbose "Write $PKGCHK_CONF based on installed packages"
+    generate_conf_from_installed $PKGCHK_CONF
 fi
 
-if [ -n "$opt_c" -o -n "$opt_l" ];then
-
-    if [ ! -r $PKGCHK_CONF ];then
-	fatal "Unable to read PKGCHK_CONF '$PKGCHK_CONF'"
-    fi
-
-    # Determine list of tags
-    #
-    extract_make_vars Makefile OPSYS OS_VERSION MACHINE_ARCH
-    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
-	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
-    if [ -n "$opt_D" ];then
-	TAGS="$TAGS,$opt_D"
-    fi
-    verbose "set   TAGS=$TAGS"
-    verbose "unset TAGS=$opt_U"
-
-    # Extract list of valid pkgdirs (skip any 'alreadyset' in $PKGDIRLIST)
-    #
-    PKGDIRLIST="$PKGDIRLIST "$(${AWK} -v alreadyset="$PKGDIRLIST" -v setlist=$TAGS -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; delete taglist[tmp[tag]] }
+if [ -n "$opt_i" ];then
+    verbose "Enumerate PKGDIRLIST from installed packages"
+    PKGDIRLIST=$(pkgdirs_from_installed)
+fi
 
-	taglist["*"] = "*"
-    }
-    function and_expr_with_dict(expr, dict, ary, i, r, d) {
-	split(expr,ary,/\+/);
-	r = 1;
-	for (i in ary) {
-		if (ary[i] ~ /^\//) {
-			if (getline d < ary[i] == -1)
-			    { r = 0; break ;}
-		}
-		else if (! (ary[i] in dict))
-			{ r = 0; break ;}
-	}
-	return r;
-    }
-    {
-    sub("#.*", "");
-    if (skip[$1])
-	{ next; }
-    need = 0;
-    for (f = 1 ; f<=NF ; ++f) {			# For each word on the line
-	if (sub("^-", "", $f)) { 	# If it begins with a '-'
-		if (and_expr_with_dict($f, taglist))
-			next;		# If it is true, discard
-	} else {
-		if (and_expr_with_dict($f, taglist))
-			need = 1;	# If it is true, note needed
-	}
-    }
-    if (NF == 1 || need)
-	{ print $1 }
-    }
-    ' < $PKGCHK_CONF
-    )
+if [ -n "$opt_c" -o -n "$opt_l" ];then	# Append to PKGDIRLIST based on conf
+    verbose "Append to PKGDIRLIST based on config $PKGCHK_CONF"
+    PKGDIRLIST="$(pkgdirs_from_conf $PKGCHK_CONF $PKGDIRLIST)"
 fi
 
 if [ -n "$opt_l" ] ; then
     list_packages $PKGDIRLIST
 else
-    # Check $PKGDIRLIST packages are installed and correct version
-    #
     check_packages_installed $PKGDIRLIST
 fi
 
-if [ -n "$opt_r" -a -n "$MISMATCH_TODO" ]; then
-    run_cmd "${PKG_DELETE} -r $MISMATCH_TODO" 1
-    if [ -n "$opt_a" ] ; then
-	msg_progress Rechecking packages after deletions
-	check_packages_installed $PKGDIRLIST # May need to add more packages
-    fi
+if [ -n "$MISMATCH_TODO" ]; then
+    delete_and_recheck=1
+elif [ -n "$opt_u" -a -f $PKGCHK_UPDATE_CONF ] ; then
+    delete_and_recheck=1
 fi
 
-UPDATE_FETCH_TODO="$UPDATE_TODO"
-if [ -n "$UPDATE_TODO" ];then
-    # Generate list including packages which depend on updates
-    #
-    set -- $UPDATE_TODO
-    while [ $# != 0 ]; do
-	PKGNAME=$(echo $1 | ${SED} 's/-[0-9].*//')
-	if [ -f $PKG_DBDIR/$PKGNAME-[0-9]*/+REQUIRED_BY ];then
-	    LIST="$LIST$1|$2|$(cat $PKG_DBDIR/$PKGNAME-[0-9]*/+REQUIRED_BY | xargs echo)\n"
+if [ -n "$delete_and_recheck" ]; then
+    if [ -n "$opt_u" ] ; then		 # Save current installed list
+	if [ -f $PKGCHK_UPDATE_CONF ] ; then
+	    msg "Merging in previous $PKGCHK_UPDATE_CONF"
+	    tmp=$(cat $PKGCHK_UPDATE_CONF;echo $(pkgdirs_from_installed)|fmt -1)
+	    echo $tmp | fmt -1 | ${SORT} -u > $PKGCHK_UPDATE_CONF
+	    tmp=
 	else
-	    LIST="$LIST$1|$2\n"
+	    echo $(pkgdirs_from_installed) | fmt -1 > $PKGCHK_UPDATE_CONF
 	fi
-	shift ; shift;
-    done
-
-    # drop any packages whose 'parents' are also to be updated
-    #
-    UPDATE_TODO=$(printf "$LIST" | ${AWK} -F '|' '
-    {
-    pkg2dir[$1] = $2
-    split($3, deplist, " ")
-    for (pkg in deplist)
-	{
-	dep = deplist[pkg]
-	sub("-[0-9].*", "", dep) # Strip version
-	covered[dep] = 1
-	}
-    }
-    END {
-    for (pkg in pkg2dir)
-	{
-	chk = pkg
-	sub("-[0-9].*", "", chk); # Strip version
-	if (!covered[chk])
-	    print pkg" "pkg2dir[pkg]
-	}
-    }
-    ')
+    fi
+    if [ -n "$opt_r" -o -n "$opt_u" ] ; then
+	if [ -n "$MISMATCH_TODO" ]; then
+	    delete_pkgs $MISMATCH_TODO
+	    msg_progress Rechecking packages after deletions
+	fi
+	if [ -n "$opt_u" ]; then
+	    PKGDIRLIST="$(pkgdirs_from_conf $PKGCHK_UPDATE_CONF $PKGDIRLIST)"
+	fi
+	if [ -n "$opt_u" -o -n "$opt_a" ]; then
+	    check_packages_installed $PKGDIRLIST # May need to add more
+	fi
+    fi
 fi
 
 if [ -n "$opt_f" ] ; then
-    pkg_fetchlist $UPDATE_FETCH_TODO
     pkg_fetchlist $MISSING_TODO
 fi
-if [ -n "$opt_u" ] ; then
-    pkg_installlist Update  $UPDATE_TODO
-fi
-if [ -n "$opt_a" ] ; then
-    pkg_installlist Install $MISSING_TODO
-fi
 
-if [ -n "$UPDATE_DONE" ];then
-    msg "Updated:$UPDATE_DONE"
-fi
-if [ -n "$INSTALL_DONE" ];then
-    msg "Installed:$INSTALL_DONE"
-fi
-if [ -n "$FAIL_DONE" ];then
-    msg "Failed:$FAIL_DONE"
+if [ -n "$MISSING_TODO" ] ; then
+    if [ -n "$opt_a" -o -n "$opt_u" ] ; then
+	pkg_installlist Install $MISSING_TODO
+    fi
 fi
-if [ -n "$MISS_DONE" ];then
-    msg "Missing:$MISS_DONE"
+
+if [ -n "$opt_u" -a -z "$FAIL_DONE" -a -f $PKGCHK_UPDATE_CONF ] ; then
+    run_cmd "rm -f $PKGCHK_UPDATE_CONF"
 fi
+
+[ -n "$MISS_DONE" ] &&		msg "Missing:$MISS_DONE"
+[ -n "$INSTALL_DONE" ] &&	msg "Installed:$INSTALL_DONE"
+[ -n "$FAIL_DONE" ] &&		msg "Failed:$FAIL_DONE"
+
+[ -z "$FAIL_DONE" ]