- Fix a few bugs that affected on planned xorg updating.

Pushed by:	kris
Thanks to:	az for a computer for tests

3 files changed, 65 insertions, 16 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 7adba20f678..3a3c228a42d 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=	3
+PORTREVISION=	4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
@@ -21,8 +21,6 @@ OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
 
 CONFLICTS=	portupgrade-[0-9]*
 
-IGNORE=		this version is a test of a new concept and don't ready for wide use
-
 USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	optparse ruby18
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
index cd0c54f81cc..450ac238c95 100644
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
+++ b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
@@ -1,21 +1,23 @@
-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 @@
+--- bin/portupgrade.orig	Mon Feb 26 19:00:26 2007
++++ bin/portupgrade	Tue May  1 21:37:49 2007
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/local/bin/ruby18
+ # -*- ruby -*-
+ #
+ # Copyright (c) 2000-2004 Akinori MUSHA
+@@ -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)
-+	    install_tasks |= get_uninstalled_depends(o) if !o.nil?
++#XXX	    install_tasks |= get_uninstalled_depends(o) if !o.nil?
++	    $task_options[task][:origin] = o
  	  end
  	}
  
-@@ -701,7 +702,6 @@
+@@ -701,7 +703,6 @@
  
  	  if $upward_recursive
  	    get_all_depends(origin).each do |o|
@@ -23,7 +25,7 @@ diff -u -r1.30 portupgrade
  	      make_args = get_make_args(o)
  
  	      if pkgnames = $pkgdb.deorigin(o)
-@@ -714,7 +714,6 @@
+@@ -714,7 +715,6 @@
  		  } unless $task_options.include?(p)
  		end
  	      else
@@ -31,7 +33,26 @@ diff -u -r1.30 portupgrade
  		install_tasks << o
  		$task_options[o] = {
  		  :make_args => make_args,
-@@ -831,7 +830,7 @@
+@@ -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|
@@ -40,7 +61,7 @@ diff -u -r1.30 portupgrade
      end
      if children_deps.nil?
        next
-@@ -840,7 +839,7 @@
+@@ -840,7 +841,7 @@
      end
  
      STDERR.puts ' done]' if first
@@ -49,3 +70,21 @@ diff -u -r1.30 portupgrade
    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
new file mode 100644
index 00000000000..740ff1f86d8
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb
@@ -0,0 +1,12 @@
+--- 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)
+