[Midnightbsd-cvs] mports [22411] trunk/databases/ruby-bdb: update patchset

[laffer1 at midnightbsd.org]

Revision: 22411
          http://svnweb.midnightbsd.org/mports/?rev=22411
Author:   laffer1
Date:     2017-03-21 08:11:00 -0400 (Tue, 21 Mar 2017)
Log Message:
-----------
update patchset

Modified Paths:
--------------
    trunk/databases/ruby-bdb/Makefile
    trunk/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
    trunk/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
    trunk/databases/ruby-bdb/files/patch-extconf.rb
    trunk/databases/ruby-bdb/files/patch-src__bdb.c

Modified: trunk/databases/ruby-bdb/Makefile
===================================================================
--- trunk/databases/ruby-bdb/Makefile	2017-03-21 12:07:10 UTC (rev 22410)
+++ trunk/databases/ruby-bdb/Makefile	2017-03-21 12:11:00 UTC (rev 22411)
@@ -25,6 +25,7 @@
 USE_RUBY_EXTCONF=	yes
 USE_RUBY_RDOC=		yes
 
+ALL_TARGET=	all rdoc
 CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR}
 INSTALL_TARGET=	site-install
@@ -32,6 +33,7 @@
 DOCS=		Changes README.en bdb.rd docs/*.rd
 DOCSDIR=	${RUBY_MODDOCDIR}
 EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
+SHAREMODE=	0644
 PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
@@ -55,17 +57,16 @@
 		examples/basic.rb \
 		examples/lock.rb
 
-
-
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if ${RUBY_VER} >= 2.0
-	@${REINPLACE_CMD} -e '/remove_const/d' ${WRKSRC}/src/features.rb
+.if ${RUBY_VER} == 2.1
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
 .endif
 
-.if ${RUBY_VER} >= 2.1
-	@${REINPLACE_CMD} -e 's|RBASIC(obj)->klass = \(.*\);|RBASIC_SET_CLASS_RAW(obj, \1);|' -e 's|RCLASS(\([[:alnum:]_]*\))->m_tbl|RCLASS_M_TBL(\1)|g' ${WRKSRC}/bdbxml2/bdbxml.h ${WRKSRC}/src/common.c
+.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
 .endif
 post-build:
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \

Modified: trunk/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
===================================================================
--- trunk/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	2017-03-21 12:07:10 UTC (rev 22410)
+++ trunk/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	2017-03-21 12:11:00 UTC (rev 22411)
@@ -1,5 +1,5 @@
---- ./bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml1/bdbxml.cc	2014-01-03 01:47:58.535201285 +0000
+--- bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
++++ bdbxml1/bdbxml.cc
 @@ -2340,18 +2340,16 @@
  	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
  	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));

Modified: trunk/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
===================================================================
--- trunk/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	2017-03-21 12:07:10 UTC (rev 22410)
+++ trunk/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	2017-03-21 12:11:00 UTC (rev 22411)
@@ -1,5 +1,5 @@
---- ./bdbxml2/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml2/bdbxml.cc	2014-01-03 01:49:02.080197786 +0000
+--- bdbxml2/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
++++ bdbxml2/bdbxml.cc
 @@ -5536,18 +5536,16 @@
  	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
  	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));

Modified: trunk/databases/ruby-bdb/files/patch-extconf.rb
===================================================================
--- trunk/databases/ruby-bdb/files/patch-extconf.rb	2017-03-21 12:07:10 UTC (rev 22410)
+++ trunk/databases/ruby-bdb/files/patch-extconf.rb	2017-03-21 12:11:00 UTC (rev 22411)
@@ -1,5 +1,5 @@
---- ./extconf.rb.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./extconf.rb	2014-01-03 01:45:56.334209519 +0000
+--- extconf.rb.orig	2011-04-06 19:35:39 UTC
++++ extconf.rb
 @@ -50,7 +50,7 @@
  rdoc: docs/doc/index.html
  
@@ -9,3 +9,21 @@
  
  ri:
  \t at -(rdoc -r docs/*rb)
+@@ -67,7 +67,7 @@
+    Dir.foreach('tests') do |x|
+       next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
+       next if FileTest.directory?(x)
+-      make.print "\t-#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
++      make.print "\t-#{RbConfig::CONFIG['ruby_install_name']} tests/#{x}\n"
+    end
+ ensure
+    make.close
+@@ -76,7 +76,7 @@
+ subdirs.each do |subdir|
+    STDERR.puts("#{$0}: Entering directory `#{subdir}'")
+    Dir.chdir(subdir)
+-   system("#{CONFIG['RUBY_INSTALL_NAME']} extconf.rb " + ARGV.join(" "))
++   system("#{RbConfig::CONFIG['ruby_install_name']} extconf.rb " + ARGV.join(" "))
+    Dir.chdir("..")
+    STDERR.puts("#{$0}: Leaving directory `#{subdir}'")
+ end

Modified: trunk/databases/ruby-bdb/files/patch-src__bdb.c
===================================================================
--- trunk/databases/ruby-bdb/files/patch-src__bdb.c	2017-03-21 12:07:10 UTC (rev 22410)
+++ trunk/databases/ruby-bdb/files/patch-src__bdb.c	2017-03-21 12:11:00 UTC (rev 22411)
@@ -1,5 +1,5 @@
---- ./src/bdb.c.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./src/bdb.c	2014-01-03 01:45:56.336210315 +0000
+--- src/bdb.c.orig	2011-04-06 19:35:39 UTC
++++ src/bdb.c
 @@ -166,11 +166,10 @@
  	rb_raise(rb_eNameError, "module already defined");
      }