Revision: 104734 https://trac.macports.org/changeset/104734 Author: cal@macports.org Date: 2013-04-01 14:44:06 -0700 (Mon, 01 Apr 2013) Log Message: ----------- couchdb-devel: update to 1.4.0a-20130330, closes #38609, maintainer Modified Paths: -------------- trunk/dports/databases/couchdb-devel/Portfile trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch Removed Paths: ------------- trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff Modified: trunk/dports/databases/couchdb-devel/Portfile =================================================================== --- trunk/dports/databases/couchdb-devel/Portfile 2013-04-01 21:37:39 UTC (rev 104733) +++ trunk/dports/databases/couchdb-devel/Portfile 2013-04-01 21:44:06 UTC (rev 104734) @@ -6,8 +6,7 @@ name couchdb-devel conflicts couchdb -version 1.4.0a-20130227 -revision 2 +version 1.4.0a-20130330 categories databases platforms darwin @@ -25,7 +24,7 @@ fetch.type git git.url https://git-wip-us.apache.org/repos/asf/couchdb.git -git.branch 5917dd80bce470f38b9b83bde46666324487a9b1 +git.branch 97505126c90469e7588272d0eec451b93159cd9a depends_build port:automake \ port:autoconf \ Deleted: trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff =================================================================== Modified: trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch =================================================================== --- trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch 2013-04-01 21:37:39 UTC (rev 104733) +++ trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch 2013-04-01 21:44:06 UTC (rev 104734) @@ -1,6 +1,16 @@ -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/Makefile.am ./src/mochiweb/Makefile.am ---- ../couchdb-5917dd8-orig/src/mochiweb/Makefile.am 2013-02-27 16:06:51.000000000 -0600 -+++ ./src/mochiweb/Makefile.am 2013-03-17 01:44:16.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/configure.ac 2013-03-29 09:37:24.000000000 -0500 ++++ ./configure.ac 2013-03-29 09:37:56.000000000 -0500 +@@ -420,7 +420,7 @@ + as_fn_error $? "$erlang_version_error" "$LINENO" 5 + fi + +-if test $minor_version -lt 7 -o $minor_version -gt 9; then ++if test $minor_version -lt 7; then + as_fn_error $? "$erlang_version_error" "$LINENO" 5 + fi + +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/Makefile.am 2013-03-29 09:37:24.000000000 -0500 ++++ ./src/mochiweb/Makefile.am 2013-03-29 09:37:33.000000000 -0500 @@ -17,6 +17,7 @@ mochiwebebindir = $(localerlanglibdir)/mochiweb-1.4.1/ebin @@ -26,9 +36,8 @@ %.beam: %.erl - $(ERLC) $(ERLC_FLAGS) $< + $(ERLC) $(ERLC_FLAGS) -pa . $< -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/mochifmt_records.erl ./src/mochiweb/mochifmt_records.erl ---- ../couchdb-5917dd8-orig/src/mochiweb/mochifmt_records.erl 2013-02-27 16:06:51.000000000 -0600 -+++ ./src/mochiweb/mochifmt_records.erl 2013-03-17 01:43:55.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/mochifmt_records.erl 2013-03-29 09:37:24.000000000 -0500 ++++ ./src/mochiweb/mochifmt_records.erl 2013-03-29 09:37:33.000000000 -0500 @@ -13,6 +13,8 @@ -author('bob@mochimedia.com'). -export([get_value/2]). @@ -38,9 +47,8 @@ get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) -> try begin Atom = list_to_existing_atom(Key), -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/mochifmt_std.erl ./src/mochiweb/mochifmt_std.erl ---- ../couchdb-5917dd8-orig/src/mochiweb/mochifmt_std.erl 2013-02-27 16:06:51.000000000 -0600 -+++ ./src/mochiweb/mochifmt_std.erl 2013-03-17 01:43:55.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/mochifmt_std.erl 2013-03-29 09:37:24.000000000 -0500 ++++ ./src/mochiweb/mochifmt_std.erl 2013-03-29 09:37:33.000000000 -0500 @@ -7,6 +7,8 @@ -author('bob@mochimedia.com'). -export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]). @@ -50,9 +58,8 @@ format(Format, Args) -> mochifmt:format(Format, Args, THIS). -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/mochiweb_request.erl ./src/mochiweb/mochiweb_request.erl ---- ../couchdb-5917dd8-orig/src/mochiweb/mochiweb_request.erl 2013-02-27 16:06:51.000000000 -0600 -+++ ./src/mochiweb/mochiweb_request.erl 2013-03-17 01:43:55.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/mochiweb_request.erl 2013-03-29 09:37:24.000000000 -0500 ++++ ./src/mochiweb/mochiweb_request.erl 2013-03-29 09:37:33.000000000 -0500 @@ -23,6 +23,8 @@ -export([accepted_encodings/1]). -export([accepts_content_type/1]). @@ -62,9 +69,8 @@ -define(SAVE_QS, mochiweb_request_qs). -define(SAVE_PATH, mochiweb_request_path). -define(SAVE_RECV, mochiweb_request_recv). -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/mochiweb_response.erl ./src/mochiweb/mochiweb_response.erl ---- ../couchdb-5917dd8-orig/src/mochiweb/mochiweb_response.erl 2013-02-27 16:06:51.000000000 -0600 -+++ ./src/mochiweb/mochiweb_response.erl 2013-03-17 01:43:55.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/mochiweb_response.erl 2013-03-29 09:37:24.000000000 -0500 ++++ ./src/mochiweb/mochiweb_response.erl 2013-03-29 09:37:33.000000000 -0500 @@ -11,6 +11,8 @@ -export([get_header_value/1, get/1, dump/0]). -export([send/1, write_chunk/1]). @@ -74,9 +80,8 @@ %% @spec get_header_value(string() | atom() | binary()) -> string() | undefined %% @doc Get the value of the given response header. get_header_value(K) -> -diff -ruN ../couchdb-5917dd8-orig/src/mochiweb/pmod_pt.erl ./src/mochiweb/pmod_pt.erl ---- ../couchdb-5917dd8-orig/src/mochiweb/pmod_pt.erl 1969-12-31 18:00:00.000000000 -0600 -+++ ./src/mochiweb/pmod_pt.erl 2013-03-17 01:43:55.000000000 -0500 +--- ../couchdb-devel-1.4.0a-20130327.orig/src/mochiweb/pmod_pt.erl 1969-12-31 18:00:00.000000000 -0600 ++++ ./src/mochiweb/pmod_pt.erl 2013-03-29 09:37:33.000000000 -0500 @@ -0,0 +1,463 @@ +%% +%% %CopyrightBegin%