4 files changed, 4 insertions, 38 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 371fd5aedb71..8c75677489f3 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	2.2.4
 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 ca67e0223c3d..c26f9c789f23 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.2.2.tar.bz2) = c9e08616c474d776f301ada920735a66
-SHA256 (pkgtools-2.2.2.tar.bz2) = ab5cd8904e69c03be0d37cf71b2d6271ccabed14bca673e5a34a7d21a1af5c02
-SIZE (pkgtools-2.2.2.tar.bz2) = 111055
+MD5 (pkgtools-2.2.4.tar.bz2) = e9122a87f4cc0aee7cf00f51e8ad7d8a
+SHA256 (pkgtools-2.2.4.tar.bz2) = 44f1e3e347f5eac19dbf53d718799349bc88d1edeb41fe52381891f921f58f35
+SIZE (pkgtools-2.2.4.tar.bz2) = 111877
diff --git a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb
deleted file mode 100644
index c1f6eb7939f8..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/portsdb.rb.orig	Sat Nov 11 22:59:24 2006
-+++ lib/portsdb.rb	Mon Feb  5 10:15:00 2007
-@@ -56,7 +56,7 @@
-     "vietnamese"	=> "vi-",
-   }
- 
--  MY_PORT = 'sysutils/portupgrade'
-+  MY_PORT = 'ports-mgmt/portupgrade'
- 
-   LOCK_FILE = '/var/run/portsdb.lock'
- 
-@@ -387,8 +387,8 @@
-   end
- 
-   def subdirs(dir)
--    %x"fgrep -v bsd.port.subdir.mk #{dir}/Makefile |
--       make -f - -V SUBDIR 2> /dev/null".split.select { |i|
-+    %x"fgrep SUBDIR #{dir}/Makefile | sed -e 's/SUBDIR +=//'
-+    	2> /dev/null".split.select { |i|
-       File.directory?(File.join(dir, i))
-     }.sort
-   end
diff --git a/ports-mgmt/portupgrade-devel/files/patch-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-portupgrade
deleted file mode 100644
index 53c9037ebbff..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-portupgrade
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/portupgrade.orig	Thu Feb  1 15:42:15 2007
-+++ bin/portupgrade	Thu Feb  1 15:42:22 2007
-@@ -1594,7 +1594,7 @@
-       end
- 
-       if $sudo && Process.euid != 0
--	dep_cmdargs = cmdargs.dup << 'fetch-depends' << 'build-depends' << 'lib-depends' << 'misc-depends'
-+	dep_cmdargs = cmdargs.dup << 'fetch-depends' << 'build-depends' << 'lib-depends'
- 
- 	if not system(shelljoin(*dep_cmdargs) + ' DEPENDS_TARGET="-n nonexistent_target" >/dev/null 2>&1')
- 	  script!(logfile, *dep_cmdargs) or