- Sync with portupgrade port version till a new devel version will appear.

5 files changed, 4 insertions, 121 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index a3da752cde7d..cc098b9ef133 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.3.0
-PORTREVISION=	6
+PORTVERSION=	2.3.1
 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 2417b424f762..b938456a64ed 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.3.0.tar.bz2) = 0177b44da56e620a2ab808df667da028
-SHA256 (pkgtools-2.3.0.tar.bz2) = f1503c9e763e3c053c93ee8bae1b2d1aba122d39476c29ea93007e535223c514
-SIZE (pkgtools-2.3.0.tar.bz2) = 112822
+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-devel/files/patch-bin-pkgdb b/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
deleted file mode 100644
index 8be6e2c4080b..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: bin/pkgdb
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -r1.16 -r1.17
---- pkgdb	26 Feb 2007 16:00:25 -0000	1.16
-+++ pkgdb	2 Mar 2007 07:48:18 -0000	1.17
-@@ -310,6 +310,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)
- 
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
deleted file mode 100644
index 33d2ece39360..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
+++ /dev/null
@@ -1,84 +0,0 @@
---- bin/portupgrade.orig	Mon Feb 26 19:00:26 2007
-+++ bin/portupgrade	Thu Jun 28 14:34:58 2007
-@@ -616,7 +616,9 @@
- 
- 	  # Track unistalled ports is appeared after updating
- 	  upgrade_tasks.each do |task|
--	    install_tasks |= get_uninstalled_depends($pkgdb.origin(task))
-+	    o = $pkgdb.origin(task)
-+#XXX	    install_tasks |= get_uninstalled_depends(o) if !o.nil?
-+#	    $task_options[task][:origin] = o
- 	  end
- 	}
- 
-@@ -701,7 +703,6 @@
- 
- 	  if $upward_recursive
- 	    get_all_depends(origin).each do |o|
--	      puts "*>#{o}"
- 	      make_args = get_make_args(o)
- 
- 	      if pkgnames = $pkgdb.deorigin(o)
-@@ -714,7 +715,6 @@
- 		  } unless $task_options.include?(p)
- 		end
- 	      else
--		puts "*->#{o}"
- 		install_tasks << o
- 		$task_options[o] = {
- 		  :make_args => make_args,
-@@ -800,6 +800,9 @@
-   unless $depends.has_key?(origin)
-     depends = Set.new
- 
-+    portdir = $portsdb.portdir(origin)
-+    return nil if not File.directory?(portdir)
-+
-     first = false
-     if parents_list.nil?
-       parents_list = Set.new
-@@ -809,8 +812,6 @@
-     return nil if parents_list.include?(origin)
-     parents_list.add(origin)
- 
--    portdir = $portsdb.portdir(origin)
--
-     make_env = get_make_env(origin)
-     cmdargs = make_env << 'make'
- 
-@@ -831,7 +832,7 @@
- 
-     children_deps = Set.new
-     depends.each do |dep|
--      children_deps.merge(get_all_depends(dep, parents_list))
-+      children_deps.merge(get_all_depends(dep, parents_list)) if !dep.nil?
-     end
-     if children_deps.nil?
-       next
-@@ -840,7 +841,7 @@
-     end
- 
-     STDERR.puts ' done]' if first
--    $depends[origin] = depends
-+    $depends[origin] = depends.to_a.compact
-   else
-     $depends[origin]
-   end
-@@ -907,7 +908,7 @@
-   dependency = options[:dependency]
- 
-   origin = $origin
--  if !origin
-+  if !origin || !File.directory?($portsdb.ports_dir()+'/'+origin)
-     if !$ignore_moved and \
-        !config_ignore_moved?(pkg) and \
-        (moved = $portsdb.moved.trace(pkg.origin))
-@@ -917,6 +918,8 @@
- 	end
-       else
- 	warning_message "Package '#{pkg.name}' has been removed from ports tree."
-+	$results << PkgResult.new($origin, :ignored, pkgname)
-+	return
-       end
-     else
-       origin = pkg.origin
diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb
deleted file mode 100644
index 740ff1f86d8b..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/pkgtools.rb.orig	Tue May  1 11:12:02 2007
-+++ lib/pkgtools.rb	Tue May  1 11:12:16 2007
-@@ -646,6 +646,9 @@
- 
- # raises StandardError
- def modify_pkgdep(pkgname, dep, newdep, neworigin = nil)
-+  pkgdir = $pkgdb.pkgdir(pkgname)
-+  return if pkgdir.nil? || !File.directory?(pkgdir)
-+
-   pkgver_re = %r{-\d\S*$}
-   file = $pkgdb.pkg_contents(pkgname)
-