aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2011-08-23 07:00:01 +0000
committerStanislav Sedov <stas@FreeBSD.org>2011-08-23 07:00:01 +0000
commitf686e750b535b84fb5410c9c1df5e4705ef5ba54 (patch)
treeb5d4b288ed194696de1b623c08345d1db73926af /ports-mgmt
parent464eea75492265d38fc9eb5c4bb2b004f2f49f28 (diff)
downloadports-f686e750b535b84fb5410c9c1df5e4705ef5ba54.tar.gz
ports-f686e750b535b84fb5410c9c1df5e4705ef5ba54.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade/Makefile2
-rw-r--r--ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb31
-rw-r--r--ports-mgmt/portupgrade/files/patch-lib_pkgmisc.rb19
3 files changed, 51 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 0716d563edf5..064a343d9abe 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 2.4.9.2
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= ports-mgmt
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/
diff --git a/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb b/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb
new file mode 100644
index 000000000000..c1a7268c85a1
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-lib_pkgdb.rb
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..c1b4a14e99e9
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-lib_pkgmisc.rb
@@ -0,0 +1,19 @@
+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