Update to 20011210 which brings several usability improvements.

pkgtools.conf(5):

- Turn HOLD_PORTS into HOLD_PKGS.

- List `bsdpan-*' in HOLD_PKGS by default.

  Requested by:	Anton Berezin <tobez@tobez.org>

pkgdb(1):

- Support HOLD_PKGS and make -f/--force overrite the setting.

pkg_fetch(1):

- Dig the temporary directory and the packages directory before
  fetching.

  Requested by:	Chris Dillon <cdillon@wolves.k12.mo.us>

- Properly quote the fetch command line arguments.

portupgrade(1):

- Fix a bug that -Pf did not properly work.

  Reported by:	The Anarcat <anarcat@anarcat.dyndns.org>

- Make -p/--package build packages for the ports that are installed as
  dependency as well.

  Suggested by:	Vivek Khera <khera@kcilink.com>

- Make -p/--package build packages for those which requisite packages
  are upgraded as well, when they are given from the command line or
  -r is specified.

  Suggested by:	Vivek Khera <khera@kcilink.com>,
		Lev Serebryakov <lev@serebryakov.spb.ru>

- Do not regard a packaging error as an installation error.

- Make -Nf override HOLD_PKGS.

- Suggest specifying -f when skipping a package.

- Detect a checksum mismatch error properly from a build log.

portinstall(1): (portupgrade -N)

- Only upgrade required packages of a newly installed port when -R is
  specified.

portversion(1):

- Support HOLD_PKGS.

overall/miscellaneous:

- Introduce lazy initialization for config variables and make
  the initialization process a little bit quicker.

- Fix some typos in the manpages.

  Submitted by:	Dan Langille <dan@langille.org>,
		kuriyama@FreeBSD.org

- Add shell completion definitions for pkg_tarup(1).

- Provide a replacement of the weekly status-pkg report script
  (/etc/periodic/weekly/400.status-pkg), which is installed as
  $PREFIX/etc/pkgtools.status-pkg.sh.

port:

- Add a missing entry of pkg_which to pkg_plist.

- Do not remove the zsh site-functions directory on deinstallation
  when zsh is installed.

12 files changed, 24 insertions, 12 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 33dc6341f25a..7b9aadfc1261 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011118
+PORTVERSION=	20011210
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 97201cc2afce..7ec70577ebd1 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011118.tar.gz) = 2cdfcf894dc9f3f2607409cbd71035a5
+MD5 (pkgtools-20011210.tar.gz) = fcdb0c80ec0ae7dafdb4b3e4037e308f
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 1c0063dccbf5..195592a3bcf9 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -7,6 +7,7 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkg_sort
+sbin/pkg_which
 sbin/pkgdb
 sbin/portcvsweb
 sbin/portinstall
@@ -28,16 +29,18 @@ sbin/portversion
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
+etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkg_sort
+share/zsh/site-functions/_pkg_tarup
 share/zsh/site-functions/_pkgdb
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 33dc6341f25a..7b9aadfc1261 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011118
+PORTVERSION=	20011210
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 97201cc2afce..7ec70577ebd1 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011118.tar.gz) = 2cdfcf894dc9f3f2607409cbd71035a5
+MD5 (pkgtools-20011210.tar.gz) = fcdb0c80ec0ae7dafdb4b3e4037e308f
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 1c0063dccbf5..195592a3bcf9 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -7,6 +7,7 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkg_sort
+sbin/pkg_which
 sbin/pkgdb
 sbin/portcvsweb
 sbin/portinstall
@@ -28,16 +29,18 @@ sbin/portversion
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
+etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkg_sort
+share/zsh/site-functions/_pkg_tarup
 share/zsh/site-functions/_pkgdb
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 33dc6341f25a..7b9aadfc1261 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011118
+PORTVERSION=	20011210
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 97201cc2afce..7ec70577ebd1 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011118.tar.gz) = 2cdfcf894dc9f3f2607409cbd71035a5
+MD5 (pkgtools-20011210.tar.gz) = fcdb0c80ec0ae7dafdb4b3e4037e308f
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 1c0063dccbf5..195592a3bcf9 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -7,6 +7,7 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkg_sort
+sbin/pkg_which
 sbin/pkgdb
 sbin/portcvsweb
 sbin/portinstall
@@ -28,16 +29,18 @@ sbin/portversion
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
+etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkg_sort
+share/zsh/site-functions/_pkg_tarup
 share/zsh/site-functions/_pkgdb
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 33dc6341f25a..7b9aadfc1261 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011118
+PORTVERSION=	20011210
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 97201cc2afce..7ec70577ebd1 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011118.tar.gz) = 2cdfcf894dc9f3f2607409cbd71035a5
+MD5 (pkgtools-20011210.tar.gz) = fcdb0c80ec0ae7dafdb4b3e4037e308f
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 1c0063dccbf5..195592a3bcf9 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -7,6 +7,7 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkg_sort
+sbin/pkg_which
 sbin/pkgdb
 sbin/portcvsweb
 sbin/portinstall
@@ -28,16 +29,18 @@ sbin/portversion
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ ! -f %B/pkgtools.conf ] && cp %B/%f %B/pkgtools.conf
+etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkg_sort
+share/zsh/site-functions/_pkg_tarup
 share/zsh/site-functions/_pkgdb
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec [ ! -f %D/bin/zsh ] && rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash