- Update to 2.4.9.3 (a bugfix release).

6 files changed, 4 insertions, 86 deletions

diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 4c683242e825..5b51ba44b112 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.4.9.2
-PORTREVISION=	2
+PORTVERSION=	2.4.9.3
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index c1cc78b8eb25..459180336757 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-2.4.9.2.tar.bz2) = 9a0778494aac62f43876e5acab16efe45e9f36bbe63d4f184ad6e4878f1b941c
-SIZE (pkgtools-2.4.9.2.tar.bz2) = 79391
+SHA256 (pkgtools-2.4.9.3.tar.bz2) = a4492ee785822b2086c924a0857d627ebaba68d1a1d106c7e7839fe881a6c424
+SIZE (pkgtools-2.4.9.3.tar.bz2) = 79394
diff --git a/ports-mgmt/portupgrade/files/patch-bin_pkgdb b/ports-mgmt/portupgrade/files/patch-bin_pkgdb
deleted file mode 100644
index 1da54d17a9af..000000000000
--- a/ports-mgmt/portupgrade/files/patch-bin_pkgdb
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/bin/pkgdb b/bin/pkgdb
-index 34530fe..eae46fa 100755
---- bin/pkgdb
-+++ bin/pkgdb
-@@ -294,10 +294,11 @@ def get_real_run_deps(pkgname)
-     puts "Disclose depends for #{pkgname}" if $verbose
- 
-     $origins[pkgname] = Hash.new
--    `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.map { |line|
-+    `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.each_line { |line|
-+      next if line.empty?
-       a = line.chomp.split(/ /)
--      $origins[pkgname].store(a[0], a[2])
--    }.compact
-+      $origins[pkgname].store(a[0], a[2]) unless a[0].nil? or a[1].nil?
-+    }
-   end
-   $origins[pkgname]
- end
diff --git a/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb b/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb
deleted file mode 100644
index c1a7268c85a1..000000000000
--- a/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/lib/pkgdb.rb b/lib/pkgdb.rb
-index 819309b..23e4203 100644
---- lib/pkgdb.rb
-+++ lib/pkgdb.rb
-@@ -431,7 +431,7 @@ class PkgDB
- 	@db.select { |path, pkgs|
- 	  path[0] == ?/ && pkgs.split.find { |pkg| deleted_pkgs.qinclude?(pkg) }
- 	}.each do |path, pkgs|
--	  path = File.realpath(path)
-+	  path = File.expand_path(path)
- 
- 	  pkgs = pkgs.split - deleted_pkgs
- 
-@@ -466,7 +466,7 @@ class PkgDB
- 	  end
- 
- 	  pkginfo.files.each do |path|
--	    path = File.realpath(path)
-+	    path = File.expand_path(path)
- 
- 	    if @db.key?(path)
- 	      pkgs = @db[path].split
-@@ -558,7 +558,7 @@ class PkgDB
-   end
- 
-   def which(path, m = false)
--    path = File.realpath(path)
-+    path = File.expand_path(path)
- 
-     open_db
- 
diff --git a/ports-mgmt/portupgrade/files/patch-lib_pkgmisc.rb b/ports-mgmt/portupgrade/files/patch-lib_pkgmisc.rb
deleted file mode 100644
index c1b4a14e99e9..000000000000
--- a/ports-mgmt/portupgrade/files/patch-lib_pkgmisc.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/pkgmisc.rb b/lib/pkgmisc.rb
-index 225408a..83ea9da 100644
---- lib/pkgmisc.rb
-+++ lib/pkgmisc.rb
-@@ -94,14 +94,6 @@ def shelljoin(*args)
-   }.join(' ')
- end
- 
--class File
--  if not File.respond_to?('realpath') then
--    def File.realpath(path)
--      return File.expand_path(path)
--    end
--  end
--end
--
- def init_tmpdir
-   if ! $tmpdir.nil? && $tmpdir != "" then
-     return
diff --git a/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb b/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
deleted file mode 100644
index 2950dd5895e3..000000000000
--- a/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/portsdb.rb b/lib/portsdb.rb
-index 3d1d757..95ba620 100644
---- lib/portsdb.rb
-+++ lib/portsdb.rb
-@@ -185,7 +185,7 @@ class PortsDB
-   def make_var(var, dir = ports_dir())
-     if var.is_a?(Array)
-       vars = var.join(' -V ')
--      `cd #{dir} && make -V #{vars} 2>/dev/null`.map { |val|
-+      `cd #{dir} && make -V #{vars} 2>/dev/null`.lines.map { |val|
- 	val.strip!
- 	if val.empty?
- 	  nil