Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 28 Dec 2017 13:42:01 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457455 - in head/databases/rubygem-bdb1: . files
Message-ID:  <201712281342.vBSDg1d5030126@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sunpoet
Date: Thu Dec 28 13:42:01 2017
New Revision: 457455
URL: https://svnweb.freebsd.org/changeset/ports/457455

Log:
  Remove outdate RUBY_VER check

Added:
  head/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c
     - copied unchanged from r457454, head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c
Deleted:
  head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c
Modified:
  head/databases/rubygem-bdb1/Makefile

Modified: head/databases/rubygem-bdb1/Makefile
==============================================================================
--- head/databases/rubygem-bdb1/Makefile	Thu Dec 28 13:41:56 2017	(r457454)
+++ head/databases/rubygem-bdb1/Makefile	Thu Dec 28 13:42:01 2017	(r457455)
@@ -16,10 +16,4 @@ USE_RUBY=	yes
 USES=		gem shebangfix
 SHEBANG_FILES=	examples/*.rb
 
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} >= 2.2
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-ext_bdb1_recnum.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied: head/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c (from r457454, head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c	Thu Dec 28 13:42:01 2017	(r457455, copy of r457454, head/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c)
@@ -0,0 +1,11 @@
+--- ext/bdb1/recnum.c.orig
++++ ext/bdb1/recnum.c
+@@ -17,7 +17,7 @@
+ 	argc++;
+     }
+     rb_hash_aset(argv[argc - 1], array, INT2FIX(0));
+-    if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) {
++    if (rb_hash_aref(argv[argc - 1], sarray) != rb_hash_ifnone(argv[argc - 1])) {
+ 	rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0));
+     }
+     rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712281342.vBSDg1d5030126>