From owner-freebsd-ports@FreeBSD.ORG Wed Apr 6 01:27:19 2011 Return-Path: Delivered-To: freebsd-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFCB6106566B for ; Wed, 6 Apr 2011 01:27:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [204.109.58.86]) by mx1.freebsd.org (Postfix) with ESMTP id 86A2F8FC1C for ; Wed, 6 Apr 2011 01:27:19 +0000 (UTC) Received: from meatwad.mouf.net (cpe-065-190-178-041.nc.res.rr.com [65.190.178.41]) (authenticated bits=0) by mouf.net (8.14.4/8.14.4) with ESMTP id p361BflU034870 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NOT); Tue, 5 Apr 2011 21:11:42 -0400 (EDT) (envelope-from swills@FreeBSD.org) Message-ID: <4D9BBDCC.3010604@FreeBSD.org> Date: Tue, 05 Apr 2011 21:11:40 -0400 From: Steve Wills User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: freebsd-ports@FreeBSD.org, knu@FreeBSD.org X-Enigmail-Version: 1.1.2 Content-Type: multipart/mixed; boundary="------------090307060506000000040603" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (mouf.net [204.109.58.86]); Tue, 05 Apr 2011 21:11:43 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.96.2 at mouf.net X-Virus-Status: Clean Cc: Subject: [CFT] databases/ruby-bdb update (portupgrade dependency) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2011 01:27:19 -0000 This is a multi-part message in MIME format. --------------090307060506000000040603 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I would like to commit the attached update to databases/ruby-bdb so that it will work with Ruby 1.9. I believe with this, portupgrade should work with Ruby 1.9 as well. Note this doesn't fix any existing bugs in portupgrade. Please test this and let me know if you have success or find problems. If you find problems, please include "uname -a" and "pkg_info" output, as well info on your latest and previous ports tree updates. Thanks, Steve -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iQEcBAEBAgAGBQJNm73MAAoJEPXPYrMgexuhG1wH/A3tKi4/LGEb5IwVq5wkna5J hFvBMB9Ggwfhq5tpYISmv7p8cyufEuTseWwUVddtBUdJGpJ3BhgQiiwgZvCI4lTG +54bDM1PX7pUAjn7NgvHf+PYsSsvI2kCVg9H+I5CO5MxGsgsUo9QqopVQJCJg6L8 +ISjPSR//ifuT7eck6bGRXLWT3AmD/0EosAWmYoPqdhDRrRhmyiH8gC58ESDDkd4 z1qejvCZuVn86SAqFm0Zmfad4K5oH0QQ6WxgTgcZfGVDtnqqRW/FM/ihMAjiSnPl jZceDcnYq8HwdUuXYf0mWa9/TFQ3BDD7CML8TOb9/cqMueHhFesMUm+6qlZcYnc= =x3gf -----END PGP SIGNATURE----- --------------090307060506000000040603 Content-Type: text/plain; name="ruby-bdb-patch2.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ruby-bdb-patch2.txt" 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 3 Apr 2011 05:56:09 -0000 @@ -7,12 +7,13 @@ PORTNAME= bdb PORTVERSION= 0.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ruby -MASTER_SITES= RF +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= swills 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 +31,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 @@ -53,14 +54,13 @@ post-build: .if !defined(NOPORTDOCS) ( cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc ) + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${RUBY_RDOC} ) .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/doc (cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${DOCSDIR}) - (cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc) .endif .if !defined(NOPORTEXAMPLES) ${MKDIR} ${EXAMPLESDIR}/ 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); - } - } - } --------------090307060506000000040603 Content-Type: application/octet-stream; name="ruby-bdb-patch2.txt.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ruby-bdb-patch2.txt.sig" iQEcBAABAgAGBQJNm73MAAoJEPXPYrMgexuhxr4IAItKKDsXkCqxAYNP5Xv8hS4KXKc/bblF m3K88NhJIa5xadc/PRMxGAg8L+oK2jyc5s5+bZFTD7BdTTG7d9NunLWgpG8hsiye8hTu2CnX /F0D4vt1bKvUdEFjfOKF8bij/aLUFCw+SBRTwE/Atw1RncfCPc1JafmPnoStHXQD3gVUiKfF Erd5GvrwXR9WvPXBVx+bugpLqrCarEc0y67D5VQl15t68T3iExZIFSC4U2aj7z12uSnmGYDO QQBCxytxxiGaYQ/zBtnekyMLJFJP34ZIjQBl5NDGkQdwL9SZjZdnJJKHdG5ig0pBxoDrdSmS BcBcFoEj6RGcTbMvS4p88s4= --------------090307060506000000040603--