- Minimize patches to just remove the comparison

Pointed out by:		mandree
Pointyhat to:		swills

5 files changed, 11 insertions, 57 deletions

diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 2d9a601cee1d..89209a4c531c 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bdb
 PORTVERSION=	0.6.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
 		http://idaemons.org/distfiles/ruby/ \
diff --git a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
index 7ec4721e5d6a..bbbcc43a5269 100644
--- a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
+++ b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
@@ -1,19 +1,9 @@
 --- ./bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml1/bdbxml.cc	2013-12-18 19:00:54.663254132 +0000
-@@ -2316,7 +2316,7 @@
- 
-     void Init_bdbxml()
-     {
--	int major, minor, patch;
-+	int major, minor;
- 	VALUE version;
- #ifdef BDB_LINK_OBJ
- 	extern void Init_bdb();
-@@ -2339,19 +2339,16 @@
- 	xb_mDb = rb_const_get(rb_cObject, rb_intern("BDB"));
++++ ./bdbxml1/bdbxml.cc	2014-01-03 01:47:58.535201285 +0000
+@@ -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")));
+ 	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",
@@ -24,13 +14,12 @@
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
--	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
+ 	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);
-+	version = rb_tainted_str_new2(dbxml_version(&major, &minor));
 +	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,
@@ -38,11 +27,3 @@
  	}
  
  	xb_eFatal = rb_const_get(xb_mDb, rb_intern("Fatal"));
-@@ -2374,7 +2371,6 @@
- 	rb_define_const(xb_mXML, "VERSION", version);
- 	rb_define_const(xb_mXML, "VERSION_MAJOR", INT2FIX(major));
- 	rb_define_const(xb_mXML, "VERSION_MINOR", INT2FIX(minor));
--	rb_define_const(xb_mXML, "VERSION_PATCH", INT2FIX(patch));
- #ifdef DBXML_CHKSUM_SHA1
- 	rb_define_const(xb_mXML, "CHKSUM_SHA1", INT2NUM(DBXML_CHKSUM_SHA1));
- #endif
diff --git a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
index 915d9e3c758b..acbf44827f1a 100644
--- a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
+++ b/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
@@ -1,19 +1,9 @@
 --- ./bdbxml2/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml2/bdbxml.cc	2013-12-18 19:00:54.677253900 +0000
-@@ -5510,7 +5510,7 @@
- 
-     void Init_bdbxml()
-     {
--	int major, minor, patch;
-+	int major, minor;
- 	VALUE version;
- #ifdef BDB_LINK_OBJ
- 	extern void Init_bdb();
-@@ -5535,19 +5535,16 @@
- 	xb_mDb = rb_const_get(rb_cObject, rb_intern("BDB"));
++++ ./bdbxml2/bdbxml.cc	2014-01-03 01:49:02.080197786 +0000
+@@ -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")));
+ 	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",
@@ -24,13 +14,12 @@
 +		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
 +		     major, minor);
  	}
--	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
+ 	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);
-+	version = rb_tainted_str_new2(dbxml_version(&major, &minor));
 +	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,
@@ -38,11 +27,3 @@
  	}
  
          xb_mObs = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
-@@ -5604,7 +5601,6 @@
- 	rb_define_const(xb_mXML, "VERSION", version);
- 	rb_define_const(xb_mXML, "VERSION_MAJOR", INT2FIX(major));
- 	rb_define_const(xb_mXML, "VERSION_MINOR", INT2FIX(minor));
--	rb_define_const(xb_mXML, "VERSION_PATCH", INT2FIX(patch));
- #if HAVE_DBXML_CONST_DBXML_ADOPT_DBENV
-         rb_define_const(xb_mXML, "ADOPT_DBENV", INT2NUM(DBXML_ADOPT_DBENV));
- #endif
diff --git a/databases/ruby-bdb/files/patch-extconf.rb b/databases/ruby-bdb/files/patch-extconf.rb
index d5896a60a8df..3127fe0dbe46 100644
--- a/databases/ruby-bdb/files/patch-extconf.rb
+++ b/databases/ruby-bdb/files/patch-extconf.rb
@@ -1,5 +1,5 @@
 --- ./extconf.rb.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./extconf.rb	2013-12-18 19:00:54.688254572 +0000
++++ ./extconf.rb	2014-01-03 01:45:56.334209519 +0000
 @@ -50,7 +50,7 @@
  rdoc: docs/doc/index.html
  
diff --git a/databases/ruby-bdb/files/patch-src__bdb.c b/databases/ruby-bdb/files/patch-src__bdb.c
index d8c655af9215..723f1f36507f 100644
--- a/databases/ruby-bdb/files/patch-src__bdb.c
+++ b/databases/ruby-bdb/files/patch-src__bdb.c
@@ -1,5 +1,5 @@
 --- ./src/bdb.c.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./src/bdb.c	2013-12-18 19:04:39.134238326 +0000
++++ ./src/bdb.c	2014-01-03 01:45:56.336210315 +0000
 @@ -166,11 +166,10 @@
  	rb_raise(rb_eNameError, "module already defined");
      }
@@ -16,11 +16,3 @@
      }
      bdb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));
      bdb_id_current_db = rb_intern("__bdb_current_db__");
-@@ -189,7 +188,6 @@
-     rb_define_const(bdb_mDb, "VERSION", version);
-     rb_define_const(bdb_mDb, "VERSION_MAJOR", INT2FIX(major));
-     rb_define_const(bdb_mDb, "VERSION_MINOR", INT2FIX(minor));
--    rb_define_const(bdb_mDb, "VERSION_PATCH", INT2FIX(patch));
-     rb_define_const(bdb_mDb, "VERSION_NUMBER", INT2NUM(BDB_VERSION));
- #if HAVE_CONST_DB_BTREE
-     rb_define_const(bdb_mDb, "BTREE", INT2FIX(DB_BTREE));