From db6720949cb830585c6abcc5ae1ddb217473cb81 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Wed, 20 Feb 2002 05:58:16 +0000
Subject: Update to 20020220.1.

- Fix a bug where it referenced the obsoleted PortsDB::PORTS_DIR.

- Depend on ruby-bdb1 and make bdb1_btree (db 1.85 btree) the default
  pkgdb driver/format.  This probably fixes the problem where pkgdb is
  unexpectedly broken and rebuilt from scratch.

- Support pkgdb driver fallback. (bdb -> bdb1 -> dbm)

- Show the pkgdb driver (format) on updating/rebuilding.
---
 sysutils/portupgrade-devel/Makefile | 8 ++++----
 sysutils/portupgrade-devel/distinfo | 1 +
 sysutils/portupgrade/Makefile       | 8 ++++----
 sysutils/portupgrade/distinfo       | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 9c853fb26114..c3ce287331f9 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020220
+PORTVERSION=	20020220.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -15,16 +15,16 @@ DISTNAME=	pkgtools-20020204
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2
+		pkgtools-20020218-20020220.diff.bz2 \
+		pkgtools-20020220-20020220.1.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 \
+		${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \
 		${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
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 0035a2a87a82..83f1e75f5743 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,4 @@
 MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
 MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
 MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
+MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 9c853fb26114..c3ce287331f9 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020220
+PORTVERSION=	20020220.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -15,16 +15,16 @@ DISTNAME=	pkgtools-20020204
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2
+		pkgtools-20020218-20020220.diff.bz2 \
+		pkgtools-20020220-20020220.1.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 \
+		${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \
 		${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
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 0035a2a87a82..83f1e75f5743 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,3 +1,4 @@
 MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
 MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
 MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
+MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
-- 
cgit v1.2.3