ports/156018: [PATCH] update databases/ruby-bdb to work with ruby 1.9
Steve Wills
swills at FreeBSD.org
Tue Mar 29 03:40:14 UTC 2011
>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 at 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 <bsd.port.pre.mk>
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:
More information about the freebsd-ports-bugs
mailing list