From 103cbbdd608906fd872c607acaa589f8de6f591b Mon Sep 17 00:00:00 2001
From: Sergey Matveychuk <sem@FreeBSD.org>
Date: Fri, 2 Mar 2007 20:18:34 +0000
Subject: [PATCH] - Integrate last patches from stable

---
 ports-mgmt/portupgrade-devel/Makefile         |  1 +
 .../portupgrade-devel/files/patch-bin-pkgdb   | 20 +++++++++++++++++++
 .../files/patch-lib-pkgmisc.rb                | 17 ++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
 create mode 100644 ports-mgmt/portupgrade-devel/files/patch-lib-pkgmisc.rb

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index d97e605d73a6..97e16820aaba 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade-devel
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb b/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
new file mode 100644
index 000000000000..8be6e2c4080b
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb
@@ -0,0 +1,20 @@
+Index: bin/pkgdb
+===================================================================
+RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- pkgdb	26 Feb 2007 16:00:25 -0000	1.16
++++ pkgdb	2 Mar 2007 07:48:18 -0000	1.17
+@@ -310,6 +310,11 @@
+   puts "Look for lost dependencies:"
+ 
+   $pkgnames.each do |pkgname|
++    # Ignore bsdpan- pseudo ports
++    if /^bsdpan-/ =~ pkgname
++      puts "#{pkgname}: ignored"
++      next 
++    end
+     deps = $pkgdb.pkgdep(pkgname, true) or return
+     real_deps = get_real_run_deps(pkgname)
+ 
diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgmisc.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgmisc.rb
new file mode 100644
index 000000000000..ce7d672ab12c
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgmisc.rb
@@ -0,0 +1,17 @@
+Index: lib/pkgmisc.rb
+===================================================================
+RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgmisc.rb,v
+retrieving revision 1.2.2.2
+diff -u -r1.2.2.2 pkgmisc.rb
+--- lib/pkgmisc.rb	24 Feb 2007 12:32:11 -0000	1.2.2.2
++++ lib/pkgmisc.rb	2 Mar 2007 19:59:30 -0000
+@@ -93,7 +93,8 @@
+ def shelljoin(*args)
+   args.collect { |arg|
+     if /[*?{}\[\]<>()~&|\\$;\'\`\"\s]/ =~ arg
+-      '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
++      a = '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
++      a.gsub(/\s/, '" "')
+     else
+       arg
+     end