From owner-svn-ports-all@freebsd.org Tue Feb 2 01:26:02 2016 Return-Path: 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 0B8ABA9829E; Tue, 2 Feb 2016 01:26:02 +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 B96A61790; Tue, 2 Feb 2016 01:26:01 +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 u121Q0Aq006220; Tue, 2 Feb 2016 01:26:00 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u121Q0vM006218; Tue, 2 Feb 2016 01:26:00 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201602020126.u121Q0vM006218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 2 Feb 2016 01:26:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407789 - in head/databases/ruby-bdb: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2016 01:26:02 -0000 Author: swills Date: Tue Feb 2 01:26:00 2016 New Revision: 407789 URL: https://svnweb.freebsd.org/changeset/ports/407789 Log: databases/ruby-bdb: fix build with Ruby 2.3 PR: 206232 Submitted by: Yasuhiro KIMURA Added: head/databases/ruby-bdb/files/patch-src-features.rb (contents, props changed) Deleted: head/databases/ruby-bdb/files/extra-patch-src-features.rb Modified: head/databases/ruby-bdb/Makefile Modified: head/databases/ruby-bdb/Makefile ============================================================================== --- head/databases/ruby-bdb/Makefile Tue Feb 2 01:21:21 2016 (r407788) +++ head/databases/ruby-bdb/Makefile Tue Feb 2 01:26:00 2016 (r407789) @@ -21,8 +21,6 @@ USE_BDB= yes OPTIONS_DEFINE= DOCS EXAMPLES -BROKEN_RUBY23= yes - USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes @@ -59,10 +57,6 @@ SHEBANG_FILES= examples/record.rb \ .include -.if ${RUBY_VER} >= 2.0 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-features.rb -.endif - .if ${RUBY_VER} >= 2.1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bdbxml2-bdbxml.h .endif @@ -71,7 +65,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-21 .endif -.if ${RUBY_VER} == 2.2 +.if ${RUBY_VER} >= 2.2 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-22 \ ${FILESDIR}/extra-patch-src-recnum.c-22 \ ${FILESDIR}/extra-patch-src-cursor.c-22 Added: head/databases/ruby-bdb/files/patch-src-features.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/ruby-bdb/files/patch-src-features.rb Tue Feb 2 01:26:00 2016 (r407789) @@ -0,0 +1,18 @@ +--- src/features.rb.orig 2011-04-06 19:35:39.000000000 +0000 ++++ src/features.rb 2015-01-22 16:40:53.000000000 +0000 +@@ -813,7 +813,6 @@ + begin + conftest = CONFTEST_C.dup + class Object +- remove_const('CONFTEST_C') + end + + CONFTEST_C = 'conftest.cxx' +@@ -878,7 +877,6 @@ + + ensure + class Object +- remove_const('CONFTEST_C') + end + + CONFTEST_C = conftest