From owner-svn-ports-all@freebsd.org Thu Dec 28 13:42:03 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A76AE9EACB; Thu, 28 Dec 2017 13:42:03 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDD067B589; Thu, 28 Dec 2017 13:42:02 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBSDg1tJ030128; Thu, 28 Dec 2017 13:42:01 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBSDg1d5030126; Thu, 28 Dec 2017 13:42:01 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201712281342.vBSDg1d5030126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 28 Dec 2017 13:42:01 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/databases/rubygem-bdb1: . files X-SVN-Commit-Revision: 457455 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 13:42:03 -0000 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 - -.if ${RUBY_VER} >= 2.2 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ext_bdb1_recnum.c -.endif - -.include +.include 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));