Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 19 Jan 2016 04:50:37 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406632 - in head/databases/rubygem-bdb1: . files
Message-ID:  <201601190450.u0J4obko040570@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dinoex
Date: Tue Jan 19 04:50:37 2016
New Revision: 406632
URL: https://svnweb.freebsd.org/changeset/ports/406632

Log:
  - fix build with ruby-2.1

Added:
  head/databases/rubygem-bdb1/files/
  head/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c   (contents, props changed)
Modified:
  head/databases/rubygem-bdb1/Makefile

Modified: head/databases/rubygem-bdb1/Makefile
==============================================================================
--- head/databases/rubygem-bdb1/Makefile	Tue Jan 19 03:10:32 2016	(r406631)
+++ head/databases/rubygem-bdb1/Makefile	Tue Jan 19 04:50:37 2016	(r406632)
@@ -11,7 +11,6 @@ COMMENT=	Ruby interface to Berkeley DB r
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-BROKEN_RUBY21=	yes
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
 

Added: head/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c	Tue Jan 19 04:50:37 2016	(r406632)
@@ -0,0 +1,21 @@
+--- ext/bdb1/bdb1.c.orig	2016-01-18 21:34:35 UTC
++++ ext/bdb1/bdb1.c
+@@ -752,15 +752,15 @@ bdb1_s_alloc(VALUE obj)
+     dbst->options |= BDB1_NOT_OPEN;
+     cl = obj;
+     while (cl) {
+-	if (cl == bdb1_cBtree || RCLASS(cl)->m_tbl == RCLASS(bdb1_cBtree)->m_tbl) {
++	if (cl == bdb1_cBtree || rb_obj_classname(cl) == rb_class2name(bdb1_cBtree)) {
+ 	    dbst->type = DB_BTREE;
+ 	    break;
+ 	}
+-	else if (cl == bdb1_cHash || RCLASS(cl)->m_tbl == RCLASS(bdb1_cHash)->m_tbl) {
++	else if (cl == bdb1_cHash || rb_obj_classname(cl) == rb_class2name(bdb1_cHash)) {
+ 	    dbst->type = DB_HASH;
+ 	    break;
+ 	}
+-	else if (cl == bdb1_cRecnum || RCLASS(cl)->m_tbl == RCLASS(bdb1_cRecnum)->m_tbl) {
++	else if (cl == bdb1_cRecnum || rb_obj_classname(cl) == rb_class2name(bdb1_cRecnum)) {
+ 	    dbst->type = DB_RECNO;
+ 	    break;
+ 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601190450.u0J4obko040570>