Update to 20010821, with many improvements.

Overall:
	- Disregard -r and -R when -a is also specified; there is no
	  need to recurse when you do with everything.
	- Fix a bug in -r and -R routines where it might fail in error
	  if dependencies of a package were all wrong.
	  [Caught by: Mamoru Iwaki <iwaki@bsp.bc.niigata-u.ac.jp>]
	- Fix the support for the case where PORTSDIR is a symlink.
	- Squeeze //'s.
	- Run `stty sane' before building each port, on interrupt, and
	  before exit.
	- Accept portorigin_glob and pkgname_glob with paths, except
	  for -x/--exclude.

portupgrade:
	- Fix `portupgrade -Ni' (portinstall -i).
	- Skip ports and packages that once failed, and do not try to
	  upgrade multiple packages of an origin.
	- If a port or a package failed to build or install, skip its
	  dependents.  This behavior can be overridden by the new
	  option, -g/--go-on.

pkgdepfix:
	- Backup +CONTENTS files before removing duplicates.

portsclean:
	- Start implementing -L/--libclean.

misc/tcsh/complete.sample:
	- Add a simple example of tcsh completion definitions.
	  [Contributed by: kuwa@flab.fujitsu.co.jp]

12 files changed, 60 insertions, 16 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 9ad34ed8993d..6342d2dc71b5 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010820
+PORTVERSION=	20010821
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -43,6 +43,10 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		portupgrade.1 portinstall.1
 MANCOMPRESSED=	yes
 
+DOCS=		ChangeLog README
+
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
 post-patch:
 	${RUBY} -i -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/pkgdb.rb
 
@@ -51,8 +55,12 @@ do-install:
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}/
+	${MKDIR} ${EXAMPLESDIR}/tcsh
+	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+	${MKDIR} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 5009e7bfff92..4aac249d80f2 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010820.tar.gz) = 4bc7230b557484d58dcd2a9e881150df
+MD5 (pkgtools-20010821.tar.gz) = f2953747a37a116726dd386b378603ad
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index aa69684dd167..fff0bd2b7e70 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -24,5 +24,8 @@ 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/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
+%%PORTDOCS%%@dirrm share/examples/portupgrade
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 9ad34ed8993d..6342d2dc71b5 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010820
+PORTVERSION=	20010821
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -43,6 +43,10 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		portupgrade.1 portinstall.1
 MANCOMPRESSED=	yes
 
+DOCS=		ChangeLog README
+
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
 post-patch:
 	${RUBY} -i -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/pkgdb.rb
 
@@ -51,8 +55,12 @@ do-install:
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}/
+	${MKDIR} ${EXAMPLESDIR}/tcsh
+	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+	${MKDIR} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 5009e7bfff92..4aac249d80f2 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010820.tar.gz) = 4bc7230b557484d58dcd2a9e881150df
+MD5 (pkgtools-20010821.tar.gz) = f2953747a37a116726dd386b378603ad
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index aa69684dd167..fff0bd2b7e70 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -24,5 +24,8 @@ 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/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
+%%PORTDOCS%%@dirrm share/examples/portupgrade
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 9ad34ed8993d..6342d2dc71b5 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010820
+PORTVERSION=	20010821
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -43,6 +43,10 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		portupgrade.1 portinstall.1
 MANCOMPRESSED=	yes
 
+DOCS=		ChangeLog README
+
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
 post-patch:
 	${RUBY} -i -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/pkgdb.rb
 
@@ -51,8 +55,12 @@ do-install:
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}/
+	${MKDIR} ${EXAMPLESDIR}/tcsh
+	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+	${MKDIR} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 5009e7bfff92..4aac249d80f2 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010820.tar.gz) = 4bc7230b557484d58dcd2a9e881150df
+MD5 (pkgtools-20010821.tar.gz) = f2953747a37a116726dd386b378603ad
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index aa69684dd167..fff0bd2b7e70 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -24,5 +24,8 @@ 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/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
+%%PORTDOCS%%@dirrm share/examples/portupgrade
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 9ad34ed8993d..6342d2dc71b5 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010820
+PORTVERSION=	20010821
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -43,6 +43,10 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		portupgrade.1 portinstall.1
 MANCOMPRESSED=	yes
 
+DOCS=		ChangeLog README
+
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
 post-patch:
 	${RUBY} -i -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/pkgdb.rb
 
@@ -51,8 +55,12 @@ do-install:
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}/
+	${MKDIR} ${EXAMPLESDIR}/tcsh
+	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+	${MKDIR} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 5009e7bfff92..4aac249d80f2 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010820.tar.gz) = 4bc7230b557484d58dcd2a9e881150df
+MD5 (pkgtools-20010821.tar.gz) = f2953747a37a116726dd386b378603ad
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index aa69684dd167..fff0bd2b7e70 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -24,5 +24,8 @@ 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/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
+%%PORTDOCS%%@dirrm share/examples/portupgrade
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade