From owner-svn-ports-all@freebsd.org  Wed Feb  3 19:07:20 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C83AEA9A2E9;
 Wed,  3 Feb 2016 19:07:20 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 94666DE1;
 Wed,  3 Feb 2016 19:07:20 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13J7JuG054962;
 Wed, 3 Feb 2016 19:07:19 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13J7JZw054960;
 Wed, 3 Feb 2016 19:07:19 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201602031907.u13J7JZw054960@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 3 Feb 2016 19:07:19 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 19:07:20 -0000

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));