<pre style='margin:0'>
ci42 pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c9c2f369608a8adf913904dfe3178c9ddbc7ab7">https://github.com/macports/macports-ports/commit/7c9c2f369608a8adf913904dfe3178c9ddbc7ab7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7c9c2f3 couchdb: update to version 1.7.0; remove obsolete patches
</span>7c9c2f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c9c2f369608a8adf913904dfe3178c9ddbc7ab7
</span>Author: ci42 <ciserlohn@macports.org>
AuthorDate: Tue Nov 7 23:26:03 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> couchdb: update to version 1.7.0; remove obsolete patches
</span>---
databases/couchdb/Portfile | 10 ++---
databases/couchdb/files/patch-configure.ac.diff | 41 -------------------
databases/couchdb/files/patch-configure.diff | 47 ----------------------
.../files/patch-src-couchdb-priv-Makefile.in.diff | 11 -----
4 files changed, 3 insertions(+), 106 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/couchdb/Portfile b/databases/couchdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 651f7fd..3140855 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/couchdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/couchdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup conflicts_build 1.0
</span>
name couchdb
conflicts couchdb-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.0
</span>
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +26,8 @@ master_sites apache
</span> master_sites.mirror_subdir ${name}/source/${version}/
distname apache-${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9701c8cb7f712ce792ede3fc73e9cf028cea54b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 25545913e98727f86e6708799192af7518ab5b68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b492e7e5389477107100ef83c41cc32185e2fe9cc88c19c550ed4b2192890dd
</span>
depends_build port:help2man \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +44,6 @@ conflicts_build spidermonkey
</span>
patchfiles patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff \
patch-support-dual-spidermonkey.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-couchdb-priv-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff
</span>
require_active_variants erlang ssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/couchdb/files/patch-configure.ac.diff b/databases/couchdb/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f16049c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/couchdb/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2015-11-02 11:13:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2015-11-02 11:16:33.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -411,7 +411,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking Erlang version compatibility... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major_version=`echo $version | ${AWK} "{print \\$1}"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,7 +419,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch_version=`echo $version | ${AWK} "{print \\$3}"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $major_version -lt 5 -o $major_version -gt 6; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $major_version -lt 5 -o $major_version -gt 8; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,7 +429,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(compatible)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# returns 17/18/19 for erts-6.0/7.0/8.0, and R14B03 or similar for earlier releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_release="`\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${ERL} -noshell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -eval 'io:put_chars(erlang:system_info(otp_release)).' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -438,9 +438,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(otp_release)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL([USE_OTP_NIFS],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)")])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)")])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_crypto=`\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${ERL} -eval "\
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/couchdb/files/patch-configure.diff b/databases/couchdb/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 381eab5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/couchdb/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-11-02 11:17:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-11-02 11:18:58.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18532,7 +18532,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking Erlang version compatibility... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major_version=`echo $version | ${AWK} "{print \\$1}"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18540,7 +18540,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch_version=`echo $version | ${AWK} "{print \\$3}"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $major_version -lt 5 -o $major_version -gt 6; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $major_version -lt 5 -o $major_version -gt 8; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18551,7 +18551,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: compatible" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "compatible" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# returns 17/18 for erts-6.0/7.0/8.0, and R14B03 or similar for earlier releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_release="`\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${ERL} -noshell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -eval 'io:put_chars(erlang:system_info(otp_release)).' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18559,7 +18559,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_OTP_NIFS_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_OTP_NIFS_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18567,7 +18567,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_OTP_NIFS_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_EJSON_COMPARE_NIF_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_EJSON_COMPARE_NIF_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff b/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00c84bc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../apache-couchdb-1.3.0.orig/src/couchdb/priv/Makefile.in 2013-03-30 09:46:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/couchdb/priv/Makefile.in 2013-04-05 10:12:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- couch_js/util.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- couchjs_SOURCES = $(COUCHJS_SRCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- couchjs_LDADD = $(CURL_LIBS) $(JS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- couchpriv_DATA = stat_descriptions.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @WINDOWS_TRUE@couchspawnkillable_SOURCES = spawnkillable/couchspawnkillable_win.c
</span></pre><pre style='margin:0'>
</pre>