Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 3 Feb 2016 19:07:19 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407969 - in head/databases/rubygem-bdb1: . files
Message-ID:  <201602031907.u13J7JZw054960@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: swills
Date: Wed Feb  3 19:07:19 2016
New Revision: 407969
URL: https://svnweb.freebsd.org/changeset/ports/407969

Log:
  databases/rubygem-bdb1: fix build with Ruby 2.2 and 2.3

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

Modified: head/databases/rubygem-bdb1/Makefile
==============================================================================
--- head/databases/rubygem-bdb1/Makefile	Wed Feb  3 18:36:06 2016	(r407968)
+++ head/databases/rubygem-bdb1/Makefile	Wed Feb  3 19:07:19 2016	(r407969)
@@ -11,12 +11,15 @@ COMMENT=	Ruby interface to Berkeley DB r
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-BROKEN_RUBY22=	yes
-BROKEN_RUBY23=	yes
-
 USES=		execinfo
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} >= 2.2
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-ext_bdb1_recnum.c
+.endif
+
+.include <bsd.port.post.mk>

Added: head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c	Wed Feb  3 19:07:19 2016	(r407969)
@@ -0,0 +1,11 @@
+--- ext/bdb1/recnum.c.orig
++++ ext/bdb1/recnum.c
+@@ -17,7 +17,7 @@
+ 	argc++;
+     }
+     rb_hash_aset(argv[argc - 1], array, INT2FIX(0));
+-    if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) {
++    if (rb_hash_aref(argv[argc - 1], sarray) != rb_hash_ifnone(argv[argc - 1])) {
+ 	rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0));
+     }
+     rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER));

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