Update to 20020213.

pkgdb(1):
- Set the default answer to no when a score is under 80%.

pkgdb(1), portupgrade(1):
- Add a BUGS entry to each of the two man pages to note that a user
  must run pkgdb -fu to rebuild a corrupt pkgdb.

pkgdb(3):
- Add a silly workaround against a possible bug of the dbm module to
  keep a pkgdb from getting insane and rebuilt.

- [exp.] Add a knob environment variable PKG_DBDRIVER to specify an
  alternative binary database format for pkgdb.  The available options
  are:

    "bdb_btree":
        DB 3.x/4.x B+tree; requires databases/ruby-bdb.

    "bdb_hash" or just "bdb":
        DB 3.x/4.x hash; requires databases/ruby-bdb.

    "bdb1_btree" or just "btree":
        DB 1.85 B+tree; requires databases/ruby-bdb1.

    "bdb1_hash", or just "bdb1" or "hash":
        DB 1.85 hash; requires databases/ruby-bdb1.  This should be
        equivalent to the default except some tuning parameters, but
        it is quite possible that ruby-bdb1 is stabler than the
        standard dbm module included in ruby.

    default:
        DB 1.85 hash; uses ruby's standard dbm module.

  In principle, a B+tree database is faster to store data, a little
  bit slower to extract data, and takes more space than a hash
  database.

  This is still an experimental/undocumented feature only for those
  interested, although I don't believe it brings any unstability.
  Note that you can always run pkgdb -fu to rebuild a database.

portcvsweb(1):
- Invoke browsers with system() instead of exec() so that it will
  properly try every browser in turn - exec('/bin/sh', '-c', '..') may
  cause an error within /bin/sh but it never returns.

  Reported by:	Jimmy Olgeni <olgeni@FreeBSD.org>

portsclean(1):
- Make portsclean -D remove empty directories (recursively) as well.

4 files changed, 24 insertions, 8 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 5f3e0bc48089..252842ea2a77 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,25 +6,32 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020204
+PORTVERSION=	20020213
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-${PORTVERSION}
+DISTNAME=	pkgtools-${PREV_PORTVERSION}
 
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	pkgtools-${PORTVERSION}.patch.gz
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	pkgtools-${PREV_PORTVERSION}-${PORTVERSION}.diff.bz2
+PATCH_DIST_STRIP=	-p1
 
 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}/sysutils/pkg_tarup
+# For PKG_DBDRIVER={bdb1_btree,btree,bdb1_hash,hash,bdb1}
+#		${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
+# For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb}
+#		${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
 
+PREV_PORTVERSION=	20020204
+
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
 MAN1=		pkg_deinstall.1 \
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 6a07d3359c0c..3c3f46903e09 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
+MD5 (pkgtools-20020204-20020213.diff.bz2) = e09d842b1156cea675d455415635edce
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 5f3e0bc48089..252842ea2a77 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,25 +6,32 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020204
+PORTVERSION=	20020213
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-${PORTVERSION}
+DISTNAME=	pkgtools-${PREV_PORTVERSION}
 
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	pkgtools-${PORTVERSION}.patch.gz
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	pkgtools-${PREV_PORTVERSION}-${PORTVERSION}.diff.bz2
+PATCH_DIST_STRIP=	-p1
 
 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}/sysutils/pkg_tarup
+# For PKG_DBDRIVER={bdb1_btree,btree,bdb1_hash,hash,bdb1}
+#		${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
+# For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb}
+#		${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
 
+PREV_PORTVERSION=	20020204
+
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
 MAN1=		pkg_deinstall.1 \
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 6a07d3359c0c..3c3f46903e09 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
+MD5 (pkgtools-20020204-20020213.diff.bz2) = e09d842b1156cea675d455415635edce