Update to 20011006 with many improvements.

Beware, there can probably be some bugs left in the new pkgdb code.
In such a case please run "pkgdb -fu" to fix the situation.

overall:

  Utilize pkgdb better and optimize.

portupgrade:

  Do not scan packages all at once when -P is given, but find one per
  request.  [Requested by: Hideaki OKADA <hokada@isl.melco.co.jp>]

  Create a backup package record in tmpdir instead of pkgdbdir, in
  order not to update pkgdbdir's mtime.

  Rephrase/add messages.

portinstall:

  Commit major changes and improvements over portinstall.

  Now it warns and asks the user for confirmation if a port is being
  installed when a package of the same origin is already installed.

  Upgrade all the required packages before installing a new port.
  [Requested by: Hajimu UMEMOTO <ume@mahoroba.org>]

  Do not install ports immediately but queue them up, then install
  them after upgrading all the specified and required packages.

pkgdb:

  Record pkgname <=> origin mapping in the pkgdb and make full use of
  it instead of repeatedly calling pkg_info -o which has undesirable
  overheads.

  Make portupgrade, pkg_deinstall update the pkgdb after they
  install/deinstall packages or modify package records.

  Integrate pkgdepfix(1) within. (pkgdb -F/--fix)

  Add -o/--origin, which looks up an origin of a package in pkgdb.

  Detect added/deleted/reinstalled packages more strictly so pkgdb can
  keep being sane and consistent.

  Do not fail over a small conflict found during updating pkgdb;
  portupgrade should not be aborted by such a minor problem.

pkgdepfix:

  Obsolete -o and turn -o on by default.  Now we can look up an origin
  of a package so quickly thanks to the pkgdb.

  Integrate into pkgdb(1). (pkgdb -F/--fix)

portsdb:

  A date spec is not a valid ports glob; emit a warning if specified.
  [Found by: Hajimu UMEMOTO <ume@mahoroba.org>]

8 files changed, 16 insertions, 28 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 624ed0a89397..bd695cefa958 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010922.2
+PORTVERSION=	20011006
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-${PORTVERSION:R}
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	pkgtools-${PORTVERSION:R}.1.patch.gz \
-		pkgtools-${PORTVERSION}.patch.gz
+#PATCH_SITES=	${MASTER_SITES}
+#PATCHFILES=	pkgtools-${PORTVERSION}.1.patch.gz
 
 MAINTAINER=	knu@FreeBSD.org
 
@@ -30,7 +29,6 @@ RUBY_SHEBANG_FILES=	\
 		${WRKSRC}/pkg_fetch \
 		${WRKSRC}/pkg_glob \
 		${WRKSRC}/pkgdb \
-		${WRKSRC}/pkgdepfix \
 		${WRKSRC}/portcvsweb \
 		${WRKSRC}/portsclean \
 		${WRKSRC}/portsdb \
@@ -43,7 +41,6 @@ MAN1=		pkg_deinstall.1 \
 		pkg_fetch.1 \
 		pkg_glob.1 \
 		pkg_which.1 \
-		pkgdepfix.1 \
 		portcvsweb.1 \
 		ports_glob.1 \
 		portsclean.1 \
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 24cc352c1eaf..908784282e93 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1 @@
-MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e
-MD5 (pkgtools-20010922.1.patch.gz) = 6acc07aa08c4056ac71666c19966eb99
-MD5 (pkgtools-20010922.2.patch.gz) = 576d4017950ed94138d23ddebcd78df2
+MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024
diff --git a/sysutils/portupgrade-devel/pkg-descr b/sysutils/portupgrade-devel/pkg-descr
index a30dd0000040..245522088994 100644
--- a/sysutils/portupgrade-devel/pkg-descr
+++ b/sysutils/portupgrade-devel/pkg-descr
@@ -17,7 +17,7 @@ pkg_deinstall:	Wraps pkg_delete(1) and provides extra features.
 pkg_fetch:	Fetches packages from a remote site.
 pkg_glob:	Expands package globs.
 pkg_which:	Checks which package a file came from quickly.
-pkgdb:		Creates packages database from /var/db/pkg.
-pkgdepfix:	Fixes the /var/db/pkg registry interactively.
+pkgdb:		Manipulate the package database and interactively
+		fixes most problems in the /var/db/pkg registry.
 
 Author: Akinori MUSHA <knu@FreeBSD.org>
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 92fa2a63e4a5..3f101d5b4e58 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -5,7 +5,6 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkgdb
-sbin/pkgdepfix
 sbin/portcvsweb
 sbin/portinstall
 sbin/ports_glob
@@ -16,6 +15,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb
 %%RUBY_SITELIBDIR%%/pkgdb.rb
 %%RUBY_SITELIBDIR%%/pkginfo.rb
+%%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
@@ -26,7 +26,6 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdb
-share/zsh/site-functions/_pkgdepfix
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 624ed0a89397..bd695cefa958 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010922.2
+PORTVERSION=	20011006
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-${PORTVERSION:R}
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	pkgtools-${PORTVERSION:R}.1.patch.gz \
-		pkgtools-${PORTVERSION}.patch.gz
+#PATCH_SITES=	${MASTER_SITES}
+#PATCHFILES=	pkgtools-${PORTVERSION}.1.patch.gz
 
 MAINTAINER=	knu@FreeBSD.org
 
@@ -30,7 +29,6 @@ RUBY_SHEBANG_FILES=	\
 		${WRKSRC}/pkg_fetch \
 		${WRKSRC}/pkg_glob \
 		${WRKSRC}/pkgdb \
-		${WRKSRC}/pkgdepfix \
 		${WRKSRC}/portcvsweb \
 		${WRKSRC}/portsclean \
 		${WRKSRC}/portsdb \
@@ -43,7 +41,6 @@ MAN1=		pkg_deinstall.1 \
 		pkg_fetch.1 \
 		pkg_glob.1 \
 		pkg_which.1 \
-		pkgdepfix.1 \
 		portcvsweb.1 \
 		ports_glob.1 \
 		portsclean.1 \
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 24cc352c1eaf..908784282e93 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,3 +1 @@
-MD5 (pkgtools-20010922.tar.gz) = aaa46b29adc57622637808c7f82e615e
-MD5 (pkgtools-20010922.1.patch.gz) = 6acc07aa08c4056ac71666c19966eb99
-MD5 (pkgtools-20010922.2.patch.gz) = 576d4017950ed94138d23ddebcd78df2
+MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024
diff --git a/sysutils/portupgrade/pkg-descr b/sysutils/portupgrade/pkg-descr
index a30dd0000040..245522088994 100644
--- a/sysutils/portupgrade/pkg-descr
+++ b/sysutils/portupgrade/pkg-descr
@@ -17,7 +17,7 @@ pkg_deinstall:	Wraps pkg_delete(1) and provides extra features.
 pkg_fetch:	Fetches packages from a remote site.
 pkg_glob:	Expands package globs.
 pkg_which:	Checks which package a file came from quickly.
-pkgdb:		Creates packages database from /var/db/pkg.
-pkgdepfix:	Fixes the /var/db/pkg registry interactively.
+pkgdb:		Manipulate the package database and interactively
+		fixes most problems in the /var/db/pkg registry.
 
 Author: Akinori MUSHA <knu@FreeBSD.org>
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 92fa2a63e4a5..3f101d5b4e58 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -5,7 +5,6 @@ sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkgdb
-sbin/pkgdepfix
 sbin/portcvsweb
 sbin/portinstall
 sbin/ports_glob
@@ -16,6 +15,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb
 %%RUBY_SITELIBDIR%%/pkgdb.rb
 %%RUBY_SITELIBDIR%%/pkginfo.rb
+%%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
@@ -26,7 +26,6 @@ share/zsh/site-functions/_pkg_deinstall
 share/zsh/site-functions/_pkg_fetch
 share/zsh/site-functions/_pkg_glob
 share/zsh/site-functions/_pkgdb
-share/zsh/site-functions/_pkgdepfix
 share/zsh/site-functions/_portsclean
 share/zsh/site-functions/_portsdb
 share/zsh/site-functions/_portupgrade