svn commit: r371055 - in head/databases/rubygem-dbi: . files

[Dirk Meyer]

Author: dinoex
Date: Fri Oct 17 13:59:46 2014
New Revision: 371055
URL: https://svnweb.freebsd.org/changeset/ports/371055
QAT: https://qat.redports.org/buildarchive/r371055/

Log:
  - fix ruby 2.0

Added:
  head/databases/rubygem-dbi/files/
  head/databases/rubygem-dbi/files/patch-row.rb   (contents, props changed)
  head/databases/rubygem-dbi/files/patch-tc_types.rb   (contents, props changed)
Modified:
  head/databases/rubygem-dbi/Makefile

Modified: head/databases/rubygem-dbi/Makefile
==============================================================================
--- head/databases/rubygem-dbi/Makefile	Fri Oct 17 13:45:41 2014	(r371054)
+++ head/databases/rubygem-dbi/Makefile	Fri Oct 17 13:59:46 2014	(r371055)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbi
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 

Added: head/databases/rubygem-dbi/files/patch-row.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-dbi/files/patch-row.rb	Fri Oct 17 13:59:46 2014	(r371055)
@@ -0,0 +1,39 @@
+--- lib/dbi/row.rb.orig	2014-10-17 15:50:24.000000000 +0200
++++ lib/dbi/row.rb	2014-10-17 15:54:47.000000000 +0200
+@@ -209,7 +209,6 @@
+         end
+ 
+ 
+-        if RUBY_VERSION =~ /^1\.9/
+             def __getobj__
+                 @arr
+             end
+@@ -217,28 +216,6 @@
+             def __setobj__(obj)
+                 @delegate_dc_obj = @arr = obj
+             end
+-        else
+-            #
+-            # See Object#clone.
+-            #
+-            # #clone and #dup here, however, are both deep copies via Marshal.
+-            #
+-            def clone
+-                Marshal.load(Marshal.dump(self))
+-            end
+-
+-            def dup
+-                row = self.class.allocate
+-                row.instance_variable_set :@column_types,  @column_types
+-                row.instance_variable_set :@convert_types, @convert_types
+-                row.instance_variable_set :@column_map,    @column_map
+-                row.instance_variable_set :@column_names,  @column_names
+-                # this is the only one we actually dup...
+-                row.instance_variable_set :@arr,           arr = @arr.dup
+-                row.instance_variable_set :@_dc_obj,       arr
+-                row
+-            end
+-        end
+ 
+         private
+ 

Added: head/databases/rubygem-dbi/files/patch-tc_types.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-dbi/files/patch-tc_types.rb	Fri Oct 17 13:59:46 2014	(r371055)
@@ -0,0 +1,14 @@
+--- test/dbi/tc_types.rb.orig	2014-10-17 15:44:22.000000000 +0200
++++ test/dbi/tc_types.rb	2014-10-17 15:48:58.000000000 +0200
+@@ -114,11 +114,7 @@
+         d = Date.today
+         assert_equal(DateTime.parse(d.to_s).to_s, klass.parse(d).to_s)
+ 
+-        md = "10-11"
+-
+-        if RUBY_VERSION =~ /^1\.9/
+             md = "11-10"
+-        end
+ 
+         # be sure we're actually getting the right data back
+         assert_equal(