Index: head/databases/ruby-bdb/Makefile
===================================================================
--- head/databases/ruby-bdb/Makefile	(revision 431391)
+++ head/databases/ruby-bdb/Makefile	(revision 431392)
@@ -1,90 +1,90 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	bdb
 PORTVERSION=	0.6.6
 PORTREVISION=	5
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
 		http://idaemons.org/distfiles/ruby/ \
 		LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	${WITH_BDB_VER}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby interface to Oracle Berkeley DB revision 2 or later
 
 LICENSE=	RUBY
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
 MAKE_ENV+=		RUBY_RDOC=${LOCALBASE}/bin/rdoc
 
 ALL_TARGET=	all rdoc
 CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR}
 INSTALL_TARGET=	site-install
 
 DOCS=		Changes README.en bdb.rd docs/*.rd
 DOCSDIR=	${RUBY_MODDOCDIR}
 EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
 SHAREMODE=	0644
 PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
 USES=		bdb shebangfix tar:bzip2
 SHEBANG_FILES=	examples/record.rb \
 		examples/recno.rb \
 		examples/zeroc.rb \
 		examples/txn.rb \
 		examples/queue.rb \
 		examples/cats.rb \
 		examples/log.rb \
 		examples/cursor.rb \
 		examples/func.rb \
 		examples/replication/mgr/b.rb \
 		examples/replication/base/op.rb \
 		examples/replication/base/cl.rb \
 		examples/replication/base/b.rb \
 		examples/replication/base/ma.rb \
 		examples/replication/base/mc.rb \
 		examples/join.rb \
 		examples/basic.rb \
 		examples/lock.rb
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} >= 2.1
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-bdbxml2-bdbxml.h
-.endif
-
 .if ${RUBY_VER} == 2.1
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
 .endif
 
 .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-patch:
 	@${RM} ${WRKSRC}/docs/*.orig
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/bdb.so
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -empty")
 
 regression-test: build
 	@${MKDIR} ${BUILD_WRKSRC}/tmp
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
 .include <bsd.port.post.mk>
Index: head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h
===================================================================
--- head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h	(revision 431391)
+++ head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h	(nonexistent)
@@ -1,11 +0,0 @@
---- bdbxml2/bdbxml.h.orig	2011-04-06 19:35:39.000000000 +0000
-+++ bdbxml2/bdbxml.h	2015-01-22 17:03:07.000000000 +0000
-@@ -377,7 +377,7 @@
- static inline void
- rset_obj(VALUE obj)
- {
--    RBASIC(obj)->klass = rb_cData;
-+    RBASIC_SET_CLASS_RAW(obj, rb_cData);
-     RDATA(obj)->dfree = (RDF)free;
-     RDATA(obj)->dmark = 0;
- }

Property changes on: head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
===================================================================
--- head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	(revision 431392)
@@ -1,29 +1,29 @@
---- ./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")));
  	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
 -	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
 -	    || patch != DB_VERSION_PATCH) {
 -	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
 -		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
 -		     major, minor, patch);
 +	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
 +	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d and BDB version %d.%d\n",
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
  	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
 -	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
 -	    || patch != DBXML_VERSION_PATCH) {
 -	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
 -		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
 -		     major, minor, patch);
 +	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
 +	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d and libdbxml version %d.%d\n",
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
  
  	xb_eFatal = rb_const_get(xb_mDb, rb_intern("Fatal"));
Index: head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
===================================================================
--- head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h	(nonexistent)
+++ head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h	(revision 431392)
@@ -0,0 +1,11 @@
+--- bdbxml2/bdbxml.h.orig	2011-04-06 19:35:39 UTC
++++ bdbxml2/bdbxml.h
+@@ -377,7 +377,7 @@
+ static inline void
+ rset_obj(VALUE obj)
+ {
+-    RBASIC(obj)->klass = rb_cData;
++    RBASIC_SET_CLASS_RAW(obj, rb_cData);
+     RDATA(obj)->dfree = (RDF)free;
+     RDATA(obj)->dmark = 0;
+ }

Property changes on: head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
===================================================================
--- head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	(revision 431392)
@@ -1,29 +1,29 @@
---- ./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")));
  	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
 -	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
 -	    || patch != DB_VERSION_PATCH) {
 -	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
 -		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
 -		     major, minor, patch);
 +	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
 +	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d and BDB version %d.%d\n",
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
  	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
 -	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
 -	    || patch != DBXML_VERSION_PATCH) {
 -	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
 -		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
 -		     major, minor, patch);
 +	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
 +	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d and libdbxml version %d.%d\n",
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
  
          xb_mObs = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
Index: head/databases/ruby-bdb/files/patch-extconf.rb
===================================================================
--- head/databases/ruby-bdb/files/patch-extconf.rb	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-extconf.rb	(revision 431392)
@@ -1,29 +1,29 @@
---- extconf.rb.orig	2011-04-06 19:35:39.000000000 +0000
-+++ extconf.rb	2015-01-22 14:56:21.000000000 +0000
+--- extconf.rb.orig	2011-04-06 19:35:39 UTC
++++ extconf.rb
 @@ -50,7 +50,7 @@
  rdoc: docs/doc/index.html
  
  docs/doc/index.html: $(RDOC)
 -\t@-(cd docs; rdoc .)
 +\t@-(cd docs; ${RUBY_RDOC} .)
  
  ri:
  \t@-(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
Index: head/databases/ruby-bdb/files/patch-src-extconf.rb
===================================================================
--- head/databases/ruby-bdb/files/patch-src-extconf.rb	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-src-extconf.rb	(revision 431392)
@@ -1,23 +1,23 @@
---- src/extconf.rb.orig	2015-01-22 16:09:31.000000000 +0000
-+++ src/extconf.rb	2015-01-22 16:09:34.000000000 +0000
+--- src/extconf.rb.orig	2015-01-22 16:09:31 UTC
++++ src/extconf.rb
 @@ -36,16 +36,16 @@
  
  if unknown = enable_config("unknown")
     libs = if CONFIG.key?("LIBRUBYARG_STATIC")
 -	     Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
 +	     RbConfig::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
  	  else
 -	     Config::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
 +	     RbConfig::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
  	  end
     unknown = find_library(libs, "ruby_init", 
 -			  Config::expand(CONFIG["archdir"].dup))
 +			  RbConfig::expand(CONFIG["archdir"].dup))
  end
  
  inc_dir, lib_dir = dir_config("db", "/usr/include", "/usr/lib")
 -case Config::CONFIG["arch"]
 +case RbConfig::CONFIG["arch"]
  when /solaris2/
     $DLDFLAGS ||= ""
     $DLDFLAGS += " -R#{lib_dir}"
Index: head/databases/ruby-bdb/files/patch-src-features.rb
===================================================================
--- head/databases/ruby-bdb/files/patch-src-features.rb	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-src-features.rb	(revision 431392)
@@ -1,18 +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
+--- src/features.rb.orig	2011-04-06 19:35:39 UTC
++++ src/features.rb
 @@ -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
Index: head/databases/ruby-bdb/files/patch-src__bdb.c
===================================================================
--- head/databases/ruby-bdb/files/patch-src__bdb.c	(revision 431391)
+++ head/databases/ruby-bdb/files/patch-src__bdb.c	(revision 431392)
@@ -1,18 +1,18 @@
---- ./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");
      }
      version = rb_tainted_str_new2(db_version(&major, &minor, &patch));
 -    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
 -	|| patch != DB_VERSION_PATCH) {
 -        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",
 -		 DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
 -		 major, minor, patch);
 +    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
 +        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d and libdb version %d.%d\n",
 +		 DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		 major, minor);
      }
      bdb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));
      bdb_id_current_db = rb_intern("__bdb_current_db__");