o Update to 20020205. The best release ever, I hope. :)

  pkg_deinstall(1), portupgrade(1):

  - Properly print the legend.

  pkg_glob(1), portsdb(1):

  - Do not print an empty line when the result list is empty.

  pkgdb(1):

  - Greatly improve the origin fixing procedure.  Do the origin
    duplicateness check before checking dependencies and avoid redoing
    the origin check.

  - Show the user CVS history on the spot via the CVSweb.

  portcvsweb(1):

  - Allow specifying a no longer existent port file/directory.
    "portcvsweb net/ruby-uri" now works.

  - Change the default BROWSER value from 'lynx' to
    'w3m:lynx:links:mozilla:netscape'.

  portupgrade(1):

  - Fix a bug where portupgrade tried to use a package with a different
    origin when the package name is identical to that of what it wants
    except for the version part.

  pkgdb(3):

  - Abolish the [You have no permission to update the pkgdb -- using a
    slow method] message.  Instead, run 'pkgdb -u' via sudo(8) when
    under portupgrade -s, or stop the process immediately with a
    message that the user must run the command as root.

  pkgtools.conf(5):

  - Allow specifying unofficial ports' origin globs in HOLD_PKGS as
    well as package globs.

  overall/miscellaneous:

  - Change --no-config to --noconfig in order to get the -q option
    really working.  Since --no-config was regarded a negative form of
    --config, it didn't work as expected.

  - Fix some bugs in the zsh compdefs and add missing descriptions for
    some options.

o Use bzip2 instead of gzip for the distribution tarball to save 20KB.
  As the portupgrade user base is growing significantly, I'll get more
  serious about the download size issue from now on.  The next few
  releases will be distributed in patches against this version.

8 files changed, 14 insertions, 34 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index b2e8fc5eb4e0..5f3e0bc48089 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020128
+PORTVERSION=	20020204
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -22,6 +22,7 @@ RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup
 
+USE_BZIP2=	yes
 USE_RUBY=	yes
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
@@ -48,8 +49,6 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 post-install:
-	# Remove old database
-	${RM} -f /var/db/pkg/pkgdb.byfile.db
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
 	fi
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 3710acfa326e..6a07d3359c0c 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20020128.tar.gz) = ac8a422994b211f3a4397bbb5b62a250
+MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
diff --git a/sysutils/portupgrade-devel/pkg-descr b/sysutils/portupgrade-devel/pkg-descr
index 245522088994..f4dfba7df978 100644
--- a/sysutils/portupgrade-devel/pkg-descr
+++ b/sysutils/portupgrade-devel/pkg-descr
@@ -6,11 +6,11 @@ dependency chains up and down to upgrade packages recursively.
 
 This package also includes the following utilities:
 portinstall:	Helps you install new ports in a handy way.
-portcvsweb:	Instantly browses a history via CVSweb.
+portcvsweb:	Instantly browses change history via CVSweb.
 portversion:	Replaces pkg_version(1), runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's, unreferenced distfiles and
-		old and orphan shared libraries.
+portsclean:	Cleans ports workdir's, unreferenced distfiles,
+		old and orphan shared libraries, and stale packages.
 portsdb:	Creates binary database from the ports INDEX.
 ports_glob:	Expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides extra features.
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 195592a3bcf9..1301988ae6cd 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -30,16 +30,8 @@ sbin/portversion
 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/_pkgtools
 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 [ ! -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
@@ -50,4 +42,3 @@ share/zsh/site-functions/_portversion
 %%PORTDOCS%%share/doc/pkgtools/ChangeLog
 %%PORTDOCS%%share/doc/pkgtools/README
 %%PORTDOCS%%@dirrm share/doc/pkgtools
-@exec rm -f /var/db/pkg/pkgdb.byfile.db
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index b2e8fc5eb4e0..5f3e0bc48089 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020128
+PORTVERSION=	20020204
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -22,6 +22,7 @@ RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup
 
+USE_BZIP2=	yes
 USE_RUBY=	yes
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
@@ -48,8 +49,6 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 post-install:
-	# Remove old database
-	${RM} -f /var/db/pkg/pkgdb.byfile.db
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
 	fi
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 3710acfa326e..6a07d3359c0c 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20020128.tar.gz) = ac8a422994b211f3a4397bbb5b62a250
+MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
diff --git a/sysutils/portupgrade/pkg-descr b/sysutils/portupgrade/pkg-descr
index 245522088994..f4dfba7df978 100644
--- a/sysutils/portupgrade/pkg-descr
+++ b/sysutils/portupgrade/pkg-descr
@@ -6,11 +6,11 @@ dependency chains up and down to upgrade packages recursively.
 
 This package also includes the following utilities:
 portinstall:	Helps you install new ports in a handy way.
-portcvsweb:	Instantly browses a history via CVSweb.
+portcvsweb:	Instantly browses change history via CVSweb.
 portversion:	Replaces pkg_version(1), runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's, unreferenced distfiles and
-		old and orphan shared libraries.
+portsclean:	Cleans ports workdir's, unreferenced distfiles,
+		old and orphan shared libraries, and stale packages.
 portsdb:	Creates binary database from the ports INDEX.
 ports_glob:	Expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides extra features.
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 195592a3bcf9..1301988ae6cd 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -30,16 +30,8 @@ sbin/portversion
 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/_pkgtools
 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 [ ! -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
@@ -50,4 +42,3 @@ share/zsh/site-functions/_portversion
 %%PORTDOCS%%share/doc/pkgtools/ChangeLog
 %%PORTDOCS%%share/doc/pkgtools/README
 %%PORTDOCS%%@dirrm share/doc/pkgtools
-@exec rm -f /var/db/pkg/pkgdb.byfile.db