- Update to 2.2.6. A bugfix release.

4 files changed, 4 insertions, 66 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 489d411ed851..3e8c4ba0cb3f 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 9a668fef8d27..5cff9eda73ae 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.2.5.tar.bz2) = 4940b75c904f892a6f5b20fcef4cd088
-SHA256 (pkgtools-2.2.5.tar.bz2) = f4eac05bfcf169aadad962971fca1baf197b9fe3b047f87bcd35d45ceb53afce
-SIZE (pkgtools-2.2.5.tar.bz2) = 112208
+MD5 (pkgtools-2.2.6.tar.bz2) = eeecbe495083bb6851575714d8ae1f81
+SHA256 (pkgtools-2.2.6.tar.bz2) = a4cc69fa0c7a9c43caabe3319b192437372895956320a6abbf5f9156f5d5f093
+SIZE (pkgtools-2.2.6.tar.bz2) = 112379
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb b/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
deleted file mode 100644
index 9595ba73a24b..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: bin/pkgdb
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v
-retrieving revision 1.9.2.3
-retrieving revision 1.9.2.4
-diff -u -r1.9.2.3 -r1.9.2.4
---- bin/pkgdb	26 Feb 2007 10:00:40 -0000	1.9.2.3
-+++ bin/pkgdb	26 Feb 2007 12:52:26 -0000	1.9.2.4
-@@ -30,7 +30,7 @@
- #
- 
- MYREVISION = %w$Rev: 52 $[1]
--MYDATE = %w$Date: 2007/02/26 10:00:40 $[1]
-+MYDATE = %w$Date: 2007/02/26 12:52:26 $[1]
- MYNAME = File.basename($0)
- 
- require "optparse"
-@@ -154,7 +154,7 @@
-     }
- 
-     opts.def_option("-O", "--omit-check", "Specified with -F, turn off checks#{NEXTLINE}dependencies against the ports tree. Useful#{NEXTLINE}if you need a speed-up") {
--      $omit_check = false
-+      |$omit_check|
-     }
- 
-     opts.def_option("-Q", "--quiet", "Do not write anything to stdout;#{NEXTLINE}Specified twice, stderr neither") {
diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb
deleted file mode 100644
index ab49143291fd..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: lib/portsdb.rb
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/lib/portsdb.rb,v
-retrieving revision 1.9.2.2
-retrieving revision 1.9.2.3
-diff -u -r1.9.2.2 -r1.9.2.3
---- lib/portsdb.rb	24 Feb 2007 12:32:11 -0000	1.9.2.2
-+++ lib/portsdb.rb	26 Feb 2007 12:12:27 -0000	1.9.2.3
-@@ -25,7 +25,7 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- #
--# $Id: portsdb.rb,v 1.9.2.2 2007/02/24 12:32:11 sem_prg Exp $
-+# $Id: portsdb.rb,v 1.9.2.3 2007/02/26 12:12:27 sem_prg Exp $
- 
- require 'singleton'
- require 'tempfile'
-@@ -43,15 +43,15 @@
-   DB_VERSION = [:FreeBSD, 3]
- 
-   LANGUAGE_SPECIFIC_CATEGORIES = {
-+    "arabic"		=> "ar-",
-     "chinese"		=> "zh-",
-     "french"		=> "fr-",
-     "german"		=> "de-",
-     "hebrew"		=> "iw-",
-     "hungarian"		=> "hu-",
-     "japanese"		=> "ja-",
--    "polish"		=> "pl-",
--    "portuguese"	=> "pt-",
-     "korean"		=> "ko-",
-+    "polish"		=> "pl-",
-     "portuguese"	=> "pt-",
-     "russian"		=> "ru-",
-     "ukrainian"		=> "uk-",