From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 01:59:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33ED85D4; Fri, 3 Jan 2014 01:59:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13C4F18F8; Fri, 3 Jan 2014 01:59:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s031xWrP002810; Fri, 3 Jan 2014 01:59:32 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s031xWXT002805; Fri, 3 Jan 2014 01:59:32 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201401030159.s031xWXT002805@svn.freebsd.org> From: Steve Wills Date: Fri, 3 Jan 2014 01:59:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338517 - in head/databases/ruby-bdb: . files X-SVN-Group: ports-head 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.17 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: Fri, 03 Jan 2014 01:59:33 -0000 Author: swills Date: Fri Jan 3 01:59:31 2014 New Revision: 338517 URL: http://svnweb.freebsd.org/changeset/ports/338517 Log: - Minimize patches to just remove the comparison Pointed out by: mandree Pointyhat to: swills Modified: head/databases/ruby-bdb/Makefile head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc head/databases/ruby-bdb/files/patch-extconf.rb head/databases/ruby-bdb/files/patch-src__bdb.c Modified: head/databases/ruby-bdb/Makefile ============================================================================== --- head/databases/ruby-bdb/Makefile Fri Jan 3 01:53:21 2014 (r338516) +++ head/databases/ruby-bdb/Makefile Fri Jan 3 01:59:31 2014 (r338517) @@ -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/ \ Modified: head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc ============================================================================== --- head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc Fri Jan 3 01:53:21 2014 (r338516) +++ head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc Fri Jan 3 01:59:31 2014 (r338517) @@ -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 Modified: head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc ============================================================================== --- head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc Fri Jan 3 01:53:21 2014 (r338516) +++ head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc Fri Jan 3 01:59:31 2014 (r338517) @@ -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 Modified: head/databases/ruby-bdb/files/patch-extconf.rb ============================================================================== --- head/databases/ruby-bdb/files/patch-extconf.rb Fri Jan 3 01:53:21 2014 (r338516) +++ head/databases/ruby-bdb/files/patch-extconf.rb Fri Jan 3 01:59:31 2014 (r338517) @@ -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 Modified: head/databases/ruby-bdb/files/patch-src__bdb.c ============================================================================== --- head/databases/ruby-bdb/files/patch-src__bdb.c Fri Jan 3 01:53:21 2014 (r338516) +++ head/databases/ruby-bdb/files/patch-src__bdb.c Fri Jan 3 01:59:31 2014 (r338517) @@ -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));