- Update to 2.3.1. Many people test it and it looks good.

  To upgrade back from portupgrade-devel use the command:
  portupgrade -o ports-mgmt/portupgrade portupgrade-devel

4 files changed, 10 insertions, 37 deletions

diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 31399853bd3c..3abb13e939a6 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.2.6
-PORTREVISION=	3
+PORTVERSION=	2.3.1
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 5cff9eda73ae..b938456a64ed 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.2.6.tar.bz2) = eeecbe495083bb6851575714d8ae1f81
-SHA256 (pkgtools-2.2.6.tar.bz2) = a4cc69fa0c7a9c43caabe3319b192437372895956320a6abbf5f9156f5d5f093
-SIZE (pkgtools-2.2.6.tar.bz2) = 112379
+MD5 (pkgtools-2.3.1.tar.bz2) = 943260281c88721261cc447dc3c8e128
+SHA256 (pkgtools-2.3.1.tar.bz2) = 8586b00e9e154acad4027d4808cdc1f46ca472446495fcf18dc727cfd0e0f052
+SIZE (pkgtools-2.3.1.tar.bz2) = 112891
diff --git a/ports-mgmt/portupgrade/files/patch-bin-pkgdb b/ports-mgmt/portupgrade/files/patch-bin-pkgdb
deleted file mode 100644
index 60c7f8452aef..000000000000
--- a/ports-mgmt/portupgrade/files/patch-bin-pkgdb
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: bin/pkgdb
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v
-diff -u -r1.9.2.6 -r1.9.2.7
---- pkgdb	27 Feb 2007 11:30:31 -0000	1.9.2.6
-+++ pkgdb	27 Feb 2007 17:58:46 -0000	1.9.2.7
-@@ -314,6 +314,11 @@
-   puts "Look for lost dependencies:"
- 
-   $pkgnames.each do |pkgname|
-+    # Ignore bsdpan- pseudo ports
-+    if /^bsdpan-/ =~ pkgname
-+      puts "#{pkgname}: ignored"
-+      next 
-+    end
-     deps = $pkgdb.pkgdep(pkgname, true) or return
-     real_deps = get_real_run_deps(pkgname)
- 
-@@ -700,7 +700,7 @@
-   hash = config_value(:ALT_PKGDEP) or return nil
- 
-   if dep == ''
--    dep = $pkgdb.deorigin(origin)
-+    dep = $pkgdb.deorigin(origin).to_s
-   end
- 
-   hash.each do |pat, alt|
diff --git a/ports-mgmt/portupgrade/pkg-message b/ports-mgmt/portupgrade/pkg-message
index e8f8f58cb1f1..469e81b04538 100644
--- a/ports-mgmt/portupgrade/pkg-message
+++ b/ports-mgmt/portupgrade/pkg-message
@@ -1,7 +1,4 @@
------------------------------------------------------------------------
-NOTE: If you upgrade, it's recomended to run pkgdb -L to restore lost
-      dependencies.
-
+------------------------------------------------------------------------------
       Fill ALT_PKGDEP section in pkgtools.conf file for portupgrade
       be aware of alternative dependencies you use.
       E.g.
@@ -14,4 +11,8 @@ NOTE: If you upgrade, it's recomended to run pkgdb -L to restore lost
       suffixes (E.g. -nox11). So you should explicitly define variables
       (E.g. WITHOUT_X11=yes) for the ports in /etc/make.conf or pkgtools.conf
       (MAKE_ARGS section) files.
------------------------------------------------------------------------
+
+      REMEMBER, portupgrade helps to upgrade ports but you should understand
+      what you doing. It allows you to shut in your leg or make a demage if
+      you ask it.
+------------------------------------------------------------------------------