Update to 20010826.

Overall:

- Support the cases where PORTREVISION == 0 and PORTEPOCH == 0.

portupgrade:

- Add a new option: -l/--log-results, which is used to save the
  results as a file. [new]

- Properly exit with a non-zero status when main() does not return a
  valid value. [fix]

portsclean:

- Finally implement portsclean -L/--libclean, which cleans the old
  shared libraries that are not recorded in the package database.  It
  moves old and orphan shared libraries to ${PREFIX}/lib/compat/pkg.
  [new]

- In concert with this feature, the portupgrade port now digs the
  directory and installs a startup script which runs `ldconfig -m
  ${PREFIX}/lib/compat/pkg'. [new]

- Implement portsclean -DD, which cleans all the distfiles which are
  not referenced from any port that is currently installed, which
  portsclean -D only cleans the distfiles which are not referenced
  from any port in the ports tree. [new]

  Note that -DD runs very fast but removes more, whereas -D runs so
  slow but removes less.

  Idea provided by:	Kris Kennaway <kris@obsecurity.org>

portsdb:

- Do not fail in the case when INDEX.db and INDEX.rbo are not in sync
  somehow. [fix]

- Implement -r/--recursive. (a bit slow, though) [new]

Completions:

- Improve and update zsh compdefs.

- Add completion definitions for bash. [new]

..and several minor improvements.  Enjoy!

16 files changed, 60 insertions, 20 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 8af4d0909922..5692eaa75b25 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010823b
+PORTVERSION=	20010826
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -57,9 +57,11 @@ do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}/bash
+	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
 	${MKDIR} ${EXAMPLESDIR}/tcsh
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index d6701dcc57d2..0bbd7bec5cfe 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010823b.tar.gz) = d5812d77ee982c53f2b4c910df195fe2
+MD5 (pkgtools-20010826.tar.gz) = 1e7adff53c1a5d73e31af97d80dd1f84
diff --git a/ports-mgmt/portupgrade-devel/pkg-descr b/ports-mgmt/portupgrade-devel/pkg-descr
index f8d205ef4ea7..ad73a68a8e21 100644
--- a/ports-mgmt/portupgrade-devel/pkg-descr
+++ b/ports-mgmt/portupgrade-devel/pkg-descr
@@ -10,8 +10,10 @@ portinstall:	Helps you install new ports in a handy way.
 portcvsweb:	Instantly browses a history via CVSweb.
 portversion:	Replaces pkg_version(1).  This runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's and unreferenced distfiles.
-portsdb:	Creates binary database from the ports INDEX.
+portsclean:	Cleans ports workdir's, unreferenced distfiles and
+		old and orphan shared libraries.
+portsdb:	Creates binary database from the ports INDEX, and
+		expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides wildcards and
 		dependency recursion support, plus some more.
 pkg_glob:	Expands package globs.
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 054fb22664d2..323452b70f74 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -1,3 +1,6 @@
+etc/rc.d/000.pkgtools.sh
+@exec /bin/mkdir -p %D/lib/compt/pkg
+@unexec /bin/rmdir %D/lib/compt/pkg 2>/dev/null || true
 sbin/pkg_deinstall
 sbin/pkg_glob
 sbin/pkgdepfix
@@ -20,10 +23,13 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdepfix
 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 rmdir %D/share/zsh 2>/dev/null || true
+%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
 %%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
 %%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
 %%PORTDOCS%%@dirrm share/examples/portupgrade
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 8af4d0909922..5692eaa75b25 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010823b
+PORTVERSION=	20010826
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -57,9 +57,11 @@ do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}/bash
+	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
 	${MKDIR} ${EXAMPLESDIR}/tcsh
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index d6701dcc57d2..0bbd7bec5cfe 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010823b.tar.gz) = d5812d77ee982c53f2b4c910df195fe2
+MD5 (pkgtools-20010826.tar.gz) = 1e7adff53c1a5d73e31af97d80dd1f84
diff --git a/ports-mgmt/portupgrade/pkg-descr b/ports-mgmt/portupgrade/pkg-descr
index f8d205ef4ea7..ad73a68a8e21 100644
--- a/ports-mgmt/portupgrade/pkg-descr
+++ b/ports-mgmt/portupgrade/pkg-descr
@@ -10,8 +10,10 @@ portinstall:	Helps you install new ports in a handy way.
 portcvsweb:	Instantly browses a history via CVSweb.
 portversion:	Replaces pkg_version(1).  This runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's and unreferenced distfiles.
-portsdb:	Creates binary database from the ports INDEX.
+portsclean:	Cleans ports workdir's, unreferenced distfiles and
+		old and orphan shared libraries.
+portsdb:	Creates binary database from the ports INDEX, and
+		expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides wildcards and
 		dependency recursion support, plus some more.
 pkg_glob:	Expands package globs.
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 054fb22664d2..323452b70f74 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -1,3 +1,6 @@
+etc/rc.d/000.pkgtools.sh
+@exec /bin/mkdir -p %D/lib/compt/pkg
+@unexec /bin/rmdir %D/lib/compt/pkg 2>/dev/null || true
 sbin/pkg_deinstall
 sbin/pkg_glob
 sbin/pkgdepfix
@@ -20,10 +23,13 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdepfix
 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 rmdir %D/share/zsh 2>/dev/null || true
+%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
 %%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
 %%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
 %%PORTDOCS%%@dirrm share/examples/portupgrade
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 8af4d0909922..5692eaa75b25 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010823b
+PORTVERSION=	20010826
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -57,9 +57,11 @@ do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}/bash
+	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
 	${MKDIR} ${EXAMPLESDIR}/tcsh
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index d6701dcc57d2..0bbd7bec5cfe 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010823b.tar.gz) = d5812d77ee982c53f2b4c910df195fe2
+MD5 (pkgtools-20010826.tar.gz) = 1e7adff53c1a5d73e31af97d80dd1f84
diff --git a/sysutils/portupgrade-devel/pkg-descr b/sysutils/portupgrade-devel/pkg-descr
index f8d205ef4ea7..ad73a68a8e21 100644
--- a/sysutils/portupgrade-devel/pkg-descr
+++ b/sysutils/portupgrade-devel/pkg-descr
@@ -10,8 +10,10 @@ portinstall:	Helps you install new ports in a handy way.
 portcvsweb:	Instantly browses a history via CVSweb.
 portversion:	Replaces pkg_version(1).  This runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's and unreferenced distfiles.
-portsdb:	Creates binary database from the ports INDEX.
+portsclean:	Cleans ports workdir's, unreferenced distfiles and
+		old and orphan shared libraries.
+portsdb:	Creates binary database from the ports INDEX, and
+		expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides wildcards and
 		dependency recursion support, plus some more.
 pkg_glob:	Expands package globs.
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 054fb22664d2..323452b70f74 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -1,3 +1,6 @@
+etc/rc.d/000.pkgtools.sh
+@exec /bin/mkdir -p %D/lib/compt/pkg
+@unexec /bin/rmdir %D/lib/compt/pkg 2>/dev/null || true
 sbin/pkg_deinstall
 sbin/pkg_glob
 sbin/pkgdepfix
@@ -20,10 +23,13 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdepfix
 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 rmdir %D/share/zsh 2>/dev/null || true
+%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
 %%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
 %%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
 %%PORTDOCS%%@dirrm share/examples/portupgrade
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 8af4d0909922..5692eaa75b25 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010823b
+PORTVERSION=	20010826
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -57,9 +57,11 @@ do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}/bash
+	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
 	${MKDIR} ${EXAMPLESDIR}/tcsh
 	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index d6701dcc57d2..0bbd7bec5cfe 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010823b.tar.gz) = d5812d77ee982c53f2b4c910df195fe2
+MD5 (pkgtools-20010826.tar.gz) = 1e7adff53c1a5d73e31af97d80dd1f84
diff --git a/sysutils/portupgrade/pkg-descr b/sysutils/portupgrade/pkg-descr
index f8d205ef4ea7..ad73a68a8e21 100644
--- a/sysutils/portupgrade/pkg-descr
+++ b/sysutils/portupgrade/pkg-descr
@@ -10,8 +10,10 @@ portinstall:	Helps you install new ports in a handy way.
 portcvsweb:	Instantly browses a history via CVSweb.
 portversion:	Replaces pkg_version(1).  This runs much faster and is
 		cooperative with portupgrade(1).
-portsclean:	Cleans ports workdir's and unreferenced distfiles.
-portsdb:	Creates binary database from the ports INDEX.
+portsclean:	Cleans ports workdir's, unreferenced distfiles and
+		old and orphan shared libraries.
+portsdb:	Creates binary database from the ports INDEX, and
+		expands ports globs.
 pkg_deinstall:	Wraps pkg_delete(1) and provides wildcards and
 		dependency recursion support, plus some more.
 pkg_glob:	Expands package globs.
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 054fb22664d2..323452b70f74 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -1,3 +1,6 @@
+etc/rc.d/000.pkgtools.sh
+@exec /bin/mkdir -p %D/lib/compt/pkg
+@unexec /bin/rmdir %D/lib/compt/pkg 2>/dev/null || true
 sbin/pkg_deinstall
 sbin/pkg_glob
 sbin/pkgdepfix
@@ -20,10 +23,13 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdepfix
 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 rmdir %D/share/zsh 2>/dev/null || true
+%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
 %%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
 %%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
 %%PORTDOCS%%@dirrm share/examples/portupgrade