View | Details | Raw Unified | Return to bug 206232 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +1 lines)
Lines 57-66 Link Here
57
57
58
.include <bsd.port.pre.mk>
58
.include <bsd.port.pre.mk>
59
59
60
.if ${RUBY_VER} >= 2.0
61
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-features.rb
62
.endif
63
64
.if ${RUBY_VER} >= 2.1
60
.if ${RUBY_VER} >= 2.1
65
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-bdbxml2-bdbxml.h
61
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-bdbxml2-bdbxml.h
66
.endif
62
.endif
Lines 69-75 Link Here
69
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
65
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
70
.endif
66
.endif
71
67
72
.if ${RUBY_VER} == 2.2
68
.if ${RUBY_VER} >= 2.2
73
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-22 \
69
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-22 \
74
			${FILESDIR}/extra-patch-src-recnum.c-22 \
70
			${FILESDIR}/extra-patch-src-recnum.c-22 \
75
			${FILESDIR}/extra-patch-src-cursor.c-22
71
			${FILESDIR}/extra-patch-src-cursor.c-22
(-)files/extra-patch-src-features.rb (-18 lines)
Lines 1-18 Link Here
1
--- src/features.rb.orig	2011-04-06 19:35:39.000000000 +0000
2
+++ src/features.rb	2015-01-22 16:40:53.000000000 +0000
3
@@ -813,7 +813,6 @@
4
 begin
5
    conftest = CONFTEST_C.dup
6
    class Object
7
-      remove_const('CONFTEST_C')
8
    end
9
 
10
    CONFTEST_C = 'conftest.cxx'
11
@@ -878,7 +877,6 @@
12
 
13
 ensure
14
    class Object
15
-      remove_const('CONFTEST_C')
16
    end
17
 
18
    CONFTEST_C = conftest

Return to bug 206232