ruby 1.9 update patch

[Steve Wills]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/12/11 18:05, Steve Wills wrote:
> 
> Finally getting back to this.
> 
> Here's an updated version of the patch:
> 
> http://people.freebsd.org/~swills/ruby19_and_gems_changes3.diff.txt
> 
> This, along with a patch to ruby-bdb:
> 
> http://people.freebsd.org/~swills/ruby-bdb-patch-extconf-rb.diff.txt
> 
> and this patch to portupgrade:
> 
> http://people.freebsd.org/~swills/portupgrade-patch-lib-pkgmisc-rb.diff.txt
> 
> (all also attached)
> 
> seem to fix the issue and let me use portupgrade with Ruby 1.9.
> 
> I was never able to track down the PR related to this that was mentioned.
> 
> If anyone is willing to test, I would appreciate any feedback. I'm
> thinking this will need a -exp run then be ready to inflict upon users. :)

Replying to myself... I found a few more things are needed:

http://people.freebsd.org/~swills/portupgrade-patch-bin-portupgrade.diff.txt

http://people.freebsd.org/~swills/portupgrade-patch-lib-portsdb-rb.diff.txt

With this, portupgrade seems to function. There are some weird warnings
here and there, but it seems to work.

Steve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBAgAGBQJN9UrJAAoJEPXPYrMgexuhsX4H/Au5VGVrLPTAC9fHURczwZqM
ocx7fRDfxhzC/OpzldwCmjd79Q9PAZwftcIoVTKN44jl1T7h/CpCH/8+go4gYMSW
M684iGZbXSg2euRIaFFquOYHr2xmubbbERLBXy9i+w+jitBXRFhrev+BblKX1dBm
tygHX+TmZ+BPU9HyXp+c3bZF8k/UuHTZlnsjxXDenfcTNdHL7tFzVS4E3mUMiSht
VBOd6SRfqKl+TbDyct7bJocPxL2xUIO3WU1BN/WP5TKBuK0aVD/KfBBzExCmVMGM
yIZHH79KKOBjSvPzMolSC6z3j29iwjbJ8LRkKuicZInyQtFujwXulxKIOKlyllo=
=Ub5E
-----END PGP SIGNATURE-----
-------------- next part --------------
--- lib/portsdb.rb.orig	2011-06-12 18:58:40.000000000 +0000
+++ lib/portsdb.rb	2011-06-12 18:58:45.000000000 +0000
@@ -840,7 +840,7 @@
   end
 
   def all_depends_list!(origin, before_args = nil, after_args = nil)
-    `cd #{$portsdb.portdir(origin)} && #{before_args || ''} make #{after_args || ''} all-depends-list`.map { |line|
+    `cd #{$portsdb.portdir(origin)} && #{before_args || ''} make #{after_args || ''} all-depends-list`.lines.map { |line|
       strip(line.chomp, true)
     }.compact
   end
-------------- next part --------------
--- bin/portupgrade.orig	2011-06-12 18:56:18.000000000 +0000
+++ bin/portupgrade	2011-06-12 18:56:44.000000000 +0000
@@ -726,7 +726,7 @@
 
 	  stty_sane
 
-	  ports = $portsdb.glob(pattern).map { |i| i.origin }
+	  ports = $portsdb.glob(pattern).each.map { |i| i.origin }
 
 	  unique = false
 
@@ -859,7 +859,7 @@
 
     cmdargs.concat(get_make_args(origin))
 
-    `cd #{portdir} && #{shelljoin(*cmdargs)} -V #{depends_vars.join(' -V ')} 2>&1`.each do |line|
+    `cd #{portdir} && #{shelljoin(*cmdargs)} -V #{depends_vars.join(' -V ')} 2>&1`.each_line do |line|
 	line.split(/\s+/).each do |dep|
 	  dep.sub!(/.*?:/,'')
 	  if dep.rindex(':') != nil
-------------- next part --------------
A non-text attachment was scrubbed...
Name: portupgrade-patch-lib-portsdb-rb.diff.txt.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ruby/attachments/20110612/faea6f64/portupgrade-patch-lib-portsdb-rb.diff.txt.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: portupgrade-patch-bin-portupgrade.diff.txt.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ruby/attachments/20110612/faea6f64/portupgrade-patch-bin-portupgrade.diff.txt.obj