Attachment 118213 Details for Bug 160404 – file.diff

[patch] file.diff

file.diff (text/plain), 2.30 KB, created by Mikhail T. on 2011-09-02 20:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2011-09-02 20:30:11 UTC

Size: 2.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/ruby-bdb1/Makefile,v
>retrieving revision 1.21
>diff -U 2 -r1.21 Makefile
>--- Makefile	4 Jul 2011 17:46:08 -0000	1.21
>+++ Makefile	2 Sep 2011 19:14:27 -0000
>@@ -32,4 +32,7 @@
> 		docs/doc
> 
>+test regression-test check:
>+	${MAKE} -C ${WRKSRC} test
>+
> post-build:
> .if !defined(NOPORTDOCS)
>@@ -49,5 +52,13 @@
> .include <bsd.port.pre.mk>
> .if ${RUBY_VER} == 1.9
>-BROKEN=	does not build with ruby 1.9
>+pre-everything::
>+	########################################################
>+	# Although it is now possible to compile ${PORTNAME}
>+	# against Ruby-${RUBY_VER}, the resulting binary is not
>+	# fully functional due to changes in Ruby API.
>+	# Use of Ruby-1.8 is recommended for full compatibility.
>+	########################################################
>+.elif ${RUBY_VER} == 1.8
>+post-build: test
> .endif
> .include <bsd.port.post.mk>
>Index: files/patch-delegate
>===================================================================
>RCS file: files/patch-delegate
>diff -N files/patch-delegate
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-delegate	2 Sep 2011 19:14:27 -0000
>@@ -0,0 +1,10 @@
>+--- src/delegate.c	2006-09-19 13:06:40.000000000 -0400
>++++ src/delegate.c	2011-09-02 13:28:23.000000000 -0400
>+@@ -171,5 +171,6 @@
>+ 	ary = rb_class_instance_methods(1, &tmp, rb_mKernel);
>+ 	for (i = 0; i < RARRAY_LEN(ary); i++) {
>+-	    method = StringValuePtr(RARRAY_PTR(ary)[i]);
>++	    tmp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
>++	    method = StringValuePtr(tmp);
>+ 	    if (!strcmp(method, "==") ||
>+ 		!strcmp(method, "===") || !strcmp(method, "=~")) continue;
>Index: files/patch-super
>===================================================================
>RCS file: files/patch-super
>diff -N files/patch-super
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-super	2 Sep 2011 19:14:27 -0000
>@@ -0,0 +1,16 @@
>+The RCLASS_SUPER define is present in both Ruby 1.8 and 1.9.
>+
>+Direct access to "super" no longer works in 1.9 (the field is
>+not there), but the define continues to work properly.
>+
>+	-mi
>+
>+--- src/bdb1.c	2006-09-20 12:41:01.000000000 -0400
>++++ src/bdb1.c	2011-09-02 12:27:34.000000000 -0400
>+@@ -692,5 +692,5 @@
>+ 	    break;
>+ 	}
>+-	cl = RCLASS(cl)->super;
>++	cl = RCLASS_SUPER(cl);
>+     }
>+     if (!cl) {

Actions: View | Diff

Attachments on bug 160404: 118213