From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 29 03:40:14 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0819F1065672 for ; Tue, 29 Mar 2011 03:40:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DAA238FC17 for ; Tue, 29 Mar 2011 03:40:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2T3eDX6027573 for ; Tue, 29 Mar 2011 03:40:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2T3eDTO027572; Tue, 29 Mar 2011 03:40:13 GMT (envelope-from gnats) Resent-Date: Tue, 29 Mar 2011 03:40:13 GMT Resent-Message-Id: <201103290340.p2T3eDTO027572@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Wills Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F257106564A for ; Tue, 29 Mar 2011 03:34:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 656438FC12 for ; Tue, 29 Mar 2011 03:34:02 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p2T3Y2Lq084700 for ; Tue, 29 Mar 2011 03:34:02 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p2T3Y2eg084699; Tue, 29 Mar 2011 03:34:02 GMT (envelope-from nobody) Message-Id: <201103290334.p2T3Y2eg084699@red.freebsd.org> Date: Tue, 29 Mar 2011 03:34:02 GMT From: Steve Wills To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/156018: [PATCH] update databases/ruby-bdb to work with ruby 1.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2011 03:40:14 -0000 >Number: 156018 >Category: ports >Synopsis: [PATCH] update databases/ruby-bdb to work with ruby 1.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 29 03:40:13 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: 9-CURRENT >Organization: >Environment: >Description: databases/ruby-bdb doesn't currently work with RUBY_VER == 1.9. This patch fixes that. I've build tested this on 7.4, 8.2 and 9-CURRENT on both i386 and amd64. Run tested on all those too except 9-CURRENT i386. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/ruby-bdb/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- Makefile 7 Jun 2010 20:48:38 -0000 1.61 +++ Makefile 24 Mar 2011 03:23:27 -0000 @@ -7,12 +7,12 @@ PORTNAME= bdb PORTVERSION= 0.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ruby -MASTER_SITES= RF +MASTER_SITES= https://download.github.com/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} PKGNAMESUFFIX= ${WITH_BDB_VER} -DIST_SUBDIR= ruby +DISTNAME= knu-ruby-bdb-v0.6.5-8-g6feba54 MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to Sleepycat's Berkeley DB revision 2 or later @@ -30,11 +30,11 @@ --with-db-version=${BDB_LIB_NAME:S/^db//} INSTALL_TARGET= site-install +WRKSRC= ${WRKDIR}/knu-ruby-bdb-6feba54 + DOCS= Changes \ README.en \ - bdb.html \ bdb.rd \ - docs/*.html \ docs/*.rd .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/ruby-bdb/distinfo,v retrieving revision 1.44 diff -u -r1.44 distinfo --- distinfo 20 Mar 2011 12:47:58 -0000 1.44 +++ distinfo 24 Mar 2011 03:08:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (ruby/bdb-0.6.5.tar.gz) = edba29bb720fa32a93a80b2746667d52a30d63e418e89958b17896ef0f25889d -SIZE (ruby/bdb-0.6.5.tar.gz) = 321865 +SHA256 (knu-ruby-bdb-v0.6.5-8-g6feba54.tar.gz) = 88582a29003fa0fb61c9136187db9cca575f5d11d64d5f5eec6e0c49f5416067 +SIZE (knu-ruby-bdb-v0.6.5-8-g6feba54.tar.gz) = 286058 Index: files/patch-src_common.c =================================================================== RCS file: files/patch-src_common.c diff -N files/patch-src_common.c --- files/patch-src_common.c 7 May 2009 16:12:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- src/common.c.orig 2009-05-02 19:19:39.000000000 +0400 -+++ src/common.c 2009-05-02 19:20:04.000000000 +0400 -@@ -941,7 +941,7 @@ - } - } - if (!(dbst->options & BDB_NOT_OPEN)) { -- bdb_test_error(dbst->dbp->close(dbst->dbp, flags)); -+ dbst->dbp->close(dbst->dbp, flags); - } - } - else { -@@ -950,7 +950,7 @@ - bdb_ary_delete(&envst->db_ary, dbst->ori_val); - } - if (!(dbst->options & BDB_NOT_OPEN)) { -- bdb_test_error(dbst->dbp->close(dbst->dbp, flags)); -+ dbst->dbp->close(dbst->dbp, flags); - } - } - } >Release-Note: >Audit-Trail: >Unformatted: