Ticket #43412: couchdb.43412.patch

Portfile

@@ -7 +7 @@
 name                    couchdb
 conflicts               couchdb-devel
 version                 1.5.1
+revision                1
 
 categories              databases
 platforms               darwin
@@ -42 +43 @@
 
 patchfiles              patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff \
                         patch-support-dual-spidermonkey.diff \
+                        patch-support-erlang-R17.diff \
                         patch-src-couchdb-priv-Makefile.in.diff
 
 require_active_variants erlang ssl

files/patch-support-erlang-R17.diff

@@ +1 @@
+diff -ruN ../apache-couchdb-1.5.1.orig/configure ./configure
+--- ../apache-couchdb-1.5.1.orig/configure      2014-03-27 09:34:13.000000000 -0500
++++ ./configure 2014-04-19 23:02:23.000000000 -0500
+@@ -18556,24 +18556,26 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
+ $as_echo_n "checking Erlang version compatibility... " >&6; }
+-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
+ 
+ version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
+ major_version=`echo $version | ${AWK} "{print \\$1}"`
+ minor_version=`echo $version | ${AWK} "{print \\$2}"`
+ patch_version=`echo $version | ${AWK} "{print \\$3}"`
++echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
+ 
+-if test $major_version -ne 5; then
+-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
++if test $major_version -lt 5 -o $major_version -gt 6; then
++    as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
+ fi
+ 
+-if test $minor_version -lt 8 -o $minor_version -gt 10; then
+-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
++if test $major_version -eq 5 -a $minor_version -lt 8; then
++    as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5
+ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: compatible" >&5
+ $as_echo "compatible" >&6; }
+ 
++# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
+ otp_release="`\
+     ${ERL} -noshell \
+     -eval 'io:put_chars(erlang:system_info(otp_release)).' \
+@@ -18581,7 +18583,7 @@
+ 
+ 
+ 
+- if test x$otp_release \> xR13B03; then
++ if test $otp_release \> xR14B -o $otp_release -ge 17 ; then
+   USE_OTP_NIFS_TRUE=
+   USE_OTP_NIFS_FALSE='#'
+ else
+@@ -18589,7 +18591,7 @@
+   USE_OTP_NIFS_FALSE=
+ fi
+ 
+- if test x$otp_release \> xR14B03; then
++ if test x$otp_release \> xR14B03 -o $otp_release -ge 17; then
+   USE_EJSON_COMPARE_NIF_TRUE=
+   USE_EJSON_COMPARE_NIF_FALSE='#'
+ else