Attachment 165903 Details for Bug 206232 – Synchronize with current port tree.

[patch] Synchronize with current port tree.

patch-databases_ruby-bdb (text/plain), 2.00 KB, created by Yasuhiro Kimura on 2016-01-21 09:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2016-01-21 09:50:25 UTC

Size: 2.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 406720)
>+++ Makefile	(working copy)
>@@ -21,8 +21,6 @@
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-BROKEN_RUBY23=	yes
>-
> USE_RUBY=		yes
> USE_RUBY_EXTCONF=	yes
> USE_RUBY_RDOC=		yes
>@@ -59,10 +57,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${RUBY_VER} >= 2.0
>-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-features.rb
>-.endif
>-
> .if ${RUBY_VER} >= 2.1
> EXTRA_PATCHES+=		${FILESDIR}/extra-patch-bdbxml2-bdbxml.h
> .endif
>@@ -71,7 +65,7 @@
> EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
> .endif
> 
>-.if ${RUBY_VER} == 2.2
>+.if ${RUBY_VER} >= 2.2
> EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-22 \
> 			${FILESDIR}/extra-patch-src-recnum.c-22 \
> 			${FILESDIR}/extra-patch-src-cursor.c-22
>Index: files/extra-patch-src-features.rb
>===================================================================
>--- files/extra-patch-src-features.rb	(revision 406720)
>+++ files/extra-patch-src-features.rb	(nonexistent)
>@@ -1,18 +0,0 @@
>---- src/features.rb.orig	2011-04-06 19:35:39.000000000 +0000
>-+++ src/features.rb	2015-01-22 16:40:53.000000000 +0000
>-@@ -813,7 +813,6 @@
>- begin
>-    conftest = CONFTEST_C.dup
>-    class Object
>--      remove_const('CONFTEST_C')
>-    end
>- 
>-    CONFTEST_C = 'conftest.cxx'
>-@@ -878,7 +877,6 @@
>- 
>- ensure
>-    class Object
>--      remove_const('CONFTEST_C')
>-    end
>- 
>-    CONFTEST_C = conftest
>Index: files/patch-src-features.rb
>===================================================================
>--- files/patch-src-features.rb	(nonexistent)
>+++ files/patch-src-features.rb	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/features.rb.orig	2011-04-06 19:35:39.000000000 +0000
>++++ src/features.rb	2015-01-22 16:40:53.000000000 +0000
>+@@ -813,7 +813,6 @@
>+ begin
>+    conftest = CONFTEST_C.dup
>+    class Object
>+-      remove_const('CONFTEST_C')
>+    end
>+ 
>+    CONFTEST_C = 'conftest.cxx'
>+@@ -878,7 +877,6 @@
>+ 
>+ ensure
>+    class Object
>+-      remove_const('CONFTEST_C')
>+    end
>+ 
>+    CONFTEST_C = conftest

Actions: View | Diff

Attachments on bug 206232: 165552 | 165662 | 165719 | 165754 | 165903