Date: Tue, 2 Feb 2016 01:26:00 +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: r407789 - in head/databases/ruby-bdb: . files Message-ID: <201602020126.u121Q0vM006218@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <yasu@utahime.org> 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 <bsd.port.pre.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602020126.u121Q0vM006218>