diff options
| author | sem <sem@FreeBSD.org> | 2007-03-04 20:51:49 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2007-03-04 20:51:49 +0800 |
| commit | 1cccb14143dc1b05fefd65a79a8ff4c833e63714 (patch) | |
| tree | d7879edd2a1ae8b6104f380618e7e8aeb5d5abe2 /ports-mgmt | |
| parent | 60a0b6f1f4c9929db9c28da88bcdce0f49be6467 (diff) | |
| download | freebsd-ports-gnome-1cccb14143dc1b05fefd65a79a8ff4c833e63714.tar.gz freebsd-ports-gnome-1cccb14143dc1b05fefd65a79a8ff4c833e63714.tar.zst freebsd-ports-gnome-1cccb14143dc1b05fefd65a79a8ff4c833e63714.zip | |
- A quick fix for ports without an origin (e.g. bsdpan-)
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade | 51 |
2 files changed, 52 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 97e16820aaba..3cbae252be23 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade-devel PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 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..b1fe66d7e91f --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade @@ -0,0 +1,51 @@ +Index: bin/portupgrade +=================================================================== +RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v +retrieving revision 1.30 +diff -u -r1.30 portupgrade +--- portupgrade 26 Feb 2007 16:00:26 -0000 1.30 ++++ portupgrade 4 Mar 2007 12:49:16 -0000 +@@ -616,7 +616,8 @@ + + # Track unistalled ports is appeared after updating + upgrade_tasks.each do |task| +- install_tasks |= get_uninstalled_depends($pkgdb.origin(task)) ++ o = $pkgdb.origin(task) ++ install_tasks |= get_uninstalled_depends(o) if !o.nil? + end + } + +@@ -701,7 +702,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 +714,6 @@ + } unless $task_options.include?(p) + end + else +- puts "*->#{o}" + install_tasks << o + $task_options[o] = { + :make_args => make_args, +@@ -831,7 +830,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 +839,7 @@ + end + + STDERR.puts ' done]' if first +- $depends[origin] = depends ++ $depends[origin] = depends.compact + else + $depends[origin] + end |