Remove outdate RUBY_VER check

With hat:	ruby

5 files changed, 1 insertions, 85 deletions

diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 9f85d96501b1..8f3d3f31f265 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -55,18 +55,6 @@ SHEBANG_FILES=	examples/record.rb \
 		examples/basic.rb \
 		examples/lock.rb
 
-.include <bsd.port.pre.mk>
-
-.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
 
@@ -87,4 +75,4 @@ regression-test: build
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/ruby-bdb/files/extra-patch-src-common.c-21 b/databases/ruby-bdb/files/extra-patch-src-common.c-21
deleted file mode 100644
index 4cc0727fd326..000000000000
--- a/databases/ruby-bdb/files/extra-patch-src-common.c-21
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/common.c.orig	2011-04-06 19:35:39.000000000 +0000
-+++ src/common.c	2015-01-22 17:06:38.000000000 +0000
-@@ -1570,10 +1570,10 @@
- #endif
- 	switch(dbst->type) {
- 	case DB_BTREE:
--	    RBASIC(obj)->klass = bdb_cBtree;
-+	    RBASIC_SET_CLASS_RAW(obj, bdb_cBtree);
- 	    break;
- 	case DB_HASH:
--	    RBASIC(obj)->klass = bdb_cHash;
-+	    RBASIC_SET_CLASS_RAW(obj, bdb_cHash);
- 	    break;
- 	case DB_RECNO:
- 	{
-@@ -1581,17 +1581,17 @@
- 
- 	    rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB");
- 	    if ((count = bdb_is_recnum(dbst->dbp)) != -1) {
--		RBASIC(obj)->klass = bdb_cRecnum;
-+		RBASIC_SET_CLASS_RAW(obj, bdb_cRecnum);
- 		dbst->len = count;
- 	    }
- 	    else {
--		RBASIC(obj)->klass = bdb_cRecno;
-+		RBASIC_SET_CLASS_RAW(obj, bdb_cRecno);
- 	    }
- 	    break;
- 	}
- #if HAVE_CONST_DB_QUEUE
- 	case DB_QUEUE:
--	    RBASIC(obj)->klass = bdb_cQueue;
-+	    RBASIC_SET_CLASS_RAW(obj, bdb_cQueue);
- 	    break;
- #endif
- 	default:
-@@ -1635,29 +1635,29 @@
-     dbst->options = BDB_NOT_OPEN;
-     cl = obj;
-     while (cl) {
--	if (cl == bdb_cBtree || RCLASS(cl)->m_tbl == RCLASS(bdb_cBtree)->m_tbl) {
-+	if (cl == bdb_cBtree || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cBtree)) {
- 	    dbst->type = DB_BTREE; 
- 	    break;
- 	}
--	if (cl == bdb_cRecnum || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecnum)->m_tbl) {
-+	if (cl == bdb_cRecnum || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecnum)) {
- 	    dbst->type = DB_RECNO; 
- 	    break;
- 	}
--	else if (cl == bdb_cHash || RCLASS(cl)->m_tbl == RCLASS(bdb_cHash)->m_tbl) {
-+	else if (cl == bdb_cHash || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cHash)) {
- 	    dbst->type = DB_HASH; 
- 	    break;
- 	}
--	else if (cl == bdb_cRecno || RCLASS(cl)->m_tbl == RCLASS(bdb_cRecno)->m_tbl) {
-+	else if (cl == bdb_cRecno || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cRecno)) {
- 	    dbst->type = DB_RECNO;
- 	    break;
-     }
- #if HAVE_CONST_DB_QUEUE
--	else if (cl == bdb_cQueue || RCLASS(cl)->m_tbl == RCLASS(bdb_cQueue)->m_tbl) {
-+	else if (cl == bdb_cQueue || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cQueue)) {
- 	    dbst->type = DB_QUEUE;
- 	    break;
- 	}
- #endif
--	else if (cl == bdb_cUnknown || RCLASS(cl)->m_tbl == RCLASS(bdb_cUnknown)->m_tbl) {
-+	else if (cl == bdb_cUnknown || RCLASS_M_TBL(cl) == RCLASS_M_TBL(bdb_cUnknown)) {
- 	    dbst->type = DB_UNKNOWN;
- 	    break;
- 	}
diff --git a/databases/ruby-bdb/files/extra-patch-src-common.c-22 b/databases/ruby-bdb/files/patch-src-common.c
index ddb3c03827f8..ddb3c03827f8 100644
--- a/databases/ruby-bdb/files/extra-patch-src-common.c-22
+++ b/databases/ruby-bdb/files/patch-src-common.c
diff --git a/databases/ruby-bdb/files/extra-patch-src-cursor.c-22 b/databases/ruby-bdb/files/patch-src-cursor.c
index 52253da25726..52253da25726 100644
--- a/databases/ruby-bdb/files/extra-patch-src-cursor.c-22
+++ b/databases/ruby-bdb/files/patch-src-cursor.c
diff --git a/databases/ruby-bdb/files/extra-patch-src-recnum.c-22 b/databases/ruby-bdb/files/patch-src-recnum.c
index ec7b9548f2c3..ec7b9548f2c3 100644
--- a/databases/ruby-bdb/files/extra-patch-src-recnum.c-22
+++ b/databases/ruby-bdb/files/patch-src-recnum.c