aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile1
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade33
2 files changed, 34 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 443efc544143..263afc461776 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= portupgrade-devel
PORTVERSION= 2.4.1
+PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= portupgrade
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..e95699d78806
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
@@ -0,0 +1,33 @@
+--- bin/portupgrade.orig 2008-01-31 19:14:25.000000000 +0300
++++ bin/portupgrade 2008-01-31 19:14:32.000000000 +0300
+@@ -620,11 +620,20 @@
+ origin = $pkgdb.origin(task)
+ if !origin.nil?
+ begin
++ if config_held?(task)
++ STDERR.puts "#{task} is in HOLD_PKG. Ignored."
++ $results << PkgResult.new(origin, :ignored, "is in HOLD_PKG")
++ not_need_upgrade << task
++ next
++ end
++
+ name = get_pkgname(origin)
+ rescue IgnoreMarkError => e
+ $results << PkgResult.new(origin, :ignored, e.message)
+ not_need_upgrade << task
+ next
++ rescue PortDirError => e
++ #STDERR.puts "No port dir for #{task}"
+ end
+ name =~ /^(.+)-([^-]+)$/
+ newversion = PkgVersion.new($2)
+@@ -640,6 +649,9 @@
+ upgrade_tasks |= depends
+ end
+ install_tasks |= get_notinstalled_depends(origin)
++ else
++ # There is no origin for some reason
++ not_need_upgrade << task
+ end
+ end
+ upgrade_tasks -= not_need_upgrade