Update to 20010823. I feel it's getting as stable as before... :)

Overall:
- Fix commands and libraries to run on a statically linked ruby.

- If a command fails to load dynamic modules with dynamically linked ruby,
  restart itself with statically linked ruby.

This is to cope with the 4.3 -> 4.4 upgrade, since ruby's dynamic modules
are under a directory with a name including a FreeBSD version.  Now
portupgrade can upgrade itself and ruby even after a major FreeBSD upgrade.

portupgrade:
- Fix a bug where portupgrade -sS 'su root -c %s' did not properly work.
  [Submitted by: KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>]

portcvsweb:
- Accept a port path as well.

portsdb:

- Adopt better error handling and a better PORTS_DBDIR selection algorithm.

- Check database errors a bit harder.

8 files changed, 16 insertions, 12 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index b813d5dee31a..8fb3e616228b 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010822
+PORTVERSION=	20010823
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -17,7 +17,8 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
+		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup \
+		${LOCALBASE}/bin/ruby_s:${PORTSDIR}/lang/ruby_static
 
 USE_RUBY=	yes
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 549fac3caf3c..dc4e1f80484f 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010822.tar.gz) = 321c3f411e6b28d850d02911fbd12647
+MD5 (pkgtools-20010823.tar.gz) = c1c2b5153d3ceee694208f9d2654fe8f
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index b813d5dee31a..8fb3e616228b 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010822
+PORTVERSION=	20010823
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -17,7 +17,8 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
+		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup \
+		${LOCALBASE}/bin/ruby_s:${PORTSDIR}/lang/ruby_static
 
 USE_RUBY=	yes
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 549fac3caf3c..dc4e1f80484f 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010822.tar.gz) = 321c3f411e6b28d850d02911fbd12647
+MD5 (pkgtools-20010823.tar.gz) = c1c2b5153d3ceee694208f9d2654fe8f
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index b813d5dee31a..8fb3e616228b 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010822
+PORTVERSION=	20010823
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -17,7 +17,8 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
+		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup \
+		${LOCALBASE}/bin/ruby_s:${PORTSDIR}/lang/ruby_static
 
 USE_RUBY=	yes
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 549fac3caf3c..dc4e1f80484f 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010822.tar.gz) = 321c3f411e6b28d850d02911fbd12647
+MD5 (pkgtools-20010823.tar.gz) = c1c2b5153d3ceee694208f9d2654fe8f
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index b813d5dee31a..8fb3e616228b 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20010822
+PORTVERSION=	20010823
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -17,7 +17,8 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
+		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup \
+		${LOCALBASE}/bin/ruby_s:${PORTSDIR}/lang/ruby_static
 
 USE_RUBY=	yes
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 549fac3caf3c..dc4e1f80484f 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010822.tar.gz) = 321c3f411e6b28d850d02911fbd12647
+MD5 (pkgtools-20010823.tar.gz) = c1c2b5153d3ceee694208f9d2654fe8f