<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142028] trunk/dports/databases/couchdb</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142028">142028</a></dd>
<dt>Author</dt> <dd>ciserlohn@macports.org</dd>
<dt>Date</dt> <dd>2015-11-02 02:29:07 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>couchdb: patch configure script to work with erlang 18.x (closes #49536)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasescouchdbPortfile">trunk/dports/databases/couchdb/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasescouchdbfilespatchconfigureacdiff">trunk/dports/databases/couchdb/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsdatabasescouchdbfilespatchconfigurediff">trunk/dports/databases/couchdb/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasescouchdbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/couchdb/Portfile (142027 => 142028)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,7 +43,9 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff \
</span><span class="cx"> patch-support-dual-spidermonkey.diff \
</span><del>- patch-src-couchdb-priv-Makefile.in.diff
</del><ins>+ patch-src-couchdb-priv-Makefile.in.diff \
+ patch-configure.ac.diff \
+ patch-configure.diff
</ins><span class="cx">
</span><span class="cx"> require_active_variants erlang ssl
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasescouchdbfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/couchdb/files/patch-configure.ac.diff (0 => 142028)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+--- 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 "\
</ins></span></pre></div>
<a id="trunkdportsdatabasescouchdbfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/couchdb/files/patch-configure.diff (0 => 142028)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>