[142028] trunk/dports/databases/couchdb

[ciserlohn at macports.org]

Revision: 142028
          https://trac.macports.org/changeset/142028
Author:   ciserlohn at macports.org
Date:     2015-11-02 02:29:07 -0800 (Mon, 02 Nov 2015)
Log Message:
-----------
couchdb: patch configure script to work with erlang 18.x (closes #49536)

Modified Paths:
--------------
    trunk/dports/databases/couchdb/Portfile

Added Paths:
-----------
    trunk/dports/databases/couchdb/files/patch-configure.ac.diff
    trunk/dports/databases/couchdb/files/patch-configure.diff

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2015-11-02 06:22:32 UTC (rev 142027)
+++ trunk/dports/databases/couchdb/Portfile	2015-11-02 10:29:07 UTC (rev 142028)
@@ -43,7 +43,9 @@
 
 patchfiles              patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff \
                         patch-support-dual-spidermonkey.diff \
-                        patch-src-couchdb-priv-Makefile.in.diff
+                        patch-src-couchdb-priv-Makefile.in.diff \
+                        patch-configure.ac.diff \
+                        patch-configure.diff
 
 require_active_variants erlang ssl
 

Added: trunk/dports/databases/couchdb/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/databases/couchdb/files/patch-configure.ac.diff	2015-11-02 10:29:07 UTC (rev 142028)
@@ -0,0 +1,41 @@
+--- configure.ac.orig	2015-11-02 11:13:25.000000000 +0100
++++ configure.ac	2015-11-02 11:16:33.000000000 +0100
+@@ -411,7 +411,7 @@
+ 
+ { $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 =< 17 (erts-6.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
+ 
+ version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
+ major_version=`echo $version | ${AWK} "{print \\$1}"`
+@@ -419,7 +419,7 @@
+ patch_version=`echo $version | ${AWK} "{print \\$3}"`
+ echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
+ 
+-if test $major_version -lt 5 -o $major_version -gt 6; then
++if test $major_version -lt 5 -o $major_version -gt 7; then
+     as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
+ fi
+ 
+@@ -429,7 +429,7 @@
+ 
+ AC_MSG_RESULT(compatible)
+ 
+-# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
++# returns 17/18 for erts-6.0/7.0, and R14B03 or similar for earlier releases
+ otp_release="`\
+     ${ERL} -noshell \
+     -eval 'io:put_chars(erlang:system_info(otp_release)).' \
+@@ -438,9 +438,9 @@
+ AC_SUBST(otp_release)
+ 
+ AM_CONDITIONAL([USE_OTP_NIFS],
+-    [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
++    [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")])
+ AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
+-    [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
++    [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")])
+ 
+ has_crypto=`\
+     ${ERL} -eval "\

Added: trunk/dports/databases/couchdb/files/patch-configure.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/databases/couchdb/files/patch-configure.diff	2015-11-02 10:29:07 UTC (rev 142028)
@@ -0,0 +1,47 @@
+--- configure.orig	2015-11-02 11:17:36.000000000 +0100
++++ configure	2015-11-02 11:18:58.000000000 +0100
+@@ -18532,7 +18532,7 @@
+ 
+ { $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 =< 17 (erts-6.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
+ 
+ version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
+ major_version=`echo $version | ${AWK} "{print \\$1}"`
+@@ -18540,7 +18540,7 @@
+ patch_version=`echo $version | ${AWK} "{print \\$3}"`
+ echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
+ 
+-if test $major_version -lt 5 -o $major_version -gt 6; then
++if test $major_version -lt 5 -o $major_version -gt 7; then
+     as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
+ fi
+ 
+@@ -18551,7 +18551,7 @@
+ { $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
++# returns 17/18 for erts-6.0/7.0, and R14B03 or similar for earlier releases
+ otp_release="`\
+     ${ERL} -noshell \
+     -eval 'io:put_chars(erlang:system_info(otp_release)).' \
+@@ -18559,7 +18559,7 @@
+ 
+ 
+ 
+- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then
+   USE_OTP_NIFS_TRUE=
+   USE_OTP_NIFS_FALSE='#'
+ else
+@@ -18567,7 +18567,7 @@
+   USE_OTP_NIFS_FALSE=
+ fi
+ 
+- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then
+   USE_EJSON_COMPARE_NIF_TRUE=
+   USE_EJSON_COMPARE_NIF_FALSE='#'
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/b2258764/attachment.html>