[104138] trunk/dports/databases
cal at macports.org
cal at macports.org
Sun Mar 17 04:46:08 PDT 2013
Revision: 104138
https://trac.macports.org/changeset/104138
Author: cal at macports.org
Date: 2013-03-17 04:46:08 -0700 (Sun, 17 Mar 2013)
Log Message:
-----------
couchdb{,-devel}: fix possible race condition during build, #38395
Modified Paths:
--------------
trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch
trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch
Modified: trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch
===================================================================
--- trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch 2013-03-17 09:27:20 UTC (rev 104137)
+++ trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch 2013-03-17 11:46:08 UTC (rev 104138)
@@ -1,6 +1,6 @@
diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/Makefile.in ./src/etap/Makefile.in
--- ../apache-couchdb-1.2.1-orig/src/etap/Makefile.in 2012-12-20 15:28:49.000000000 -0600
-+++ ./src/etap/Makefile.in 2013-03-16 11:10:15.000000000 -0500
++++ ./src/etap/Makefile.in 2013-03-17 01:46:46.000000000 -0500
@@ -109,7 +109,7 @@
ERL = @ERL@
ERLANG_FLAGS = @ERLANG_FLAGS@
@@ -26,9 +26,17 @@
etap.beam \
etap_application.beam \
etap_can.beam \
+@@ -486,6 +488,7 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-etapebinDATA
+
++etap_request.beam : pmod_pt.beam
+
+ %.beam: %.erl
+ $(ERLC) $(ERLC_FLAGS) $<
diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/etap_request.erl ./src/etap/etap_request.erl
--- ../apache-couchdb-1.2.1-orig/src/etap/etap_request.erl 2012-12-20 15:24:07.000000000 -0600
-+++ ./src/etap/etap_request.erl 2013-03-16 10:47:54.000000000 -0500
++++ ./src/etap/etap_request.erl 2013-03-17 01:46:16.000000000 -0500
@@ -33,6 +33,8 @@
body_has_string/2
]).
@@ -40,7 +48,7 @@
diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/pmod_pt.erl ./src/etap/pmod_pt.erl
--- ../apache-couchdb-1.2.1-orig/src/etap/pmod_pt.erl 1969-12-31 18:00:00.000000000 -0600
-+++ ./src/etap/pmod_pt.erl 2013-03-16 11:08:17.000000000 -0500
++++ ./src/etap/pmod_pt.erl 2013-03-17 01:46:16.000000000 -0500
@@ -0,0 +1,463 @@
+%%
+%% %CopyrightBegin%
@@ -507,7 +515,7 @@
+ [].
diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/Makefile.in ./src/mochiweb/Makefile.in
--- ../apache-couchdb-1.2.1-orig/src/mochiweb/Makefile.in 2012-12-20 15:28:49.000000000 -0600
-+++ ./src/mochiweb/Makefile.in 2013-03-16 11:16:07.000000000 -0500
++++ ./src/mochiweb/Makefile.in 2013-03-17 01:46:16.000000000 -0500
@@ -109,7 +109,7 @@
ERL = @ERL@
ERLANG_FLAGS = @ERLANG_FLAGS@
@@ -519,7 +527,7 @@
FLAGS = @FLAGS@
diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_records.erl ./src/mochiweb/mochifmt_records.erl
--- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_records.erl 2012-12-20 15:24:07.000000000 -0600
-+++ ./src/mochiweb/mochifmt_records.erl 2013-03-16 11:13:48.000000000 -0500
++++ ./src/mochiweb/mochifmt_records.erl 2013-03-17 01:46:16.000000000 -0500
@@ -13,6 +13,8 @@
-author('bob at mochimedia.com').
-export([get_value/2]).
@@ -531,7 +539,7 @@
Atom = list_to_existing_atom(Key),
diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_std.erl ./src/mochiweb/mochifmt_std.erl
--- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_std.erl 2012-12-20 15:24:07.000000000 -0600
-+++ ./src/mochiweb/mochifmt_std.erl 2013-03-16 11:14:31.000000000 -0500
++++ ./src/mochiweb/mochifmt_std.erl 2013-03-17 01:46:16.000000000 -0500
@@ -7,6 +7,8 @@
-author('bob at mochimedia.com').
-export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
@@ -543,7 +551,7 @@
diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_request.erl ./src/mochiweb/mochiweb_request.erl
--- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_request.erl 2012-12-20 15:24:07.000000000 -0600
-+++ ./src/mochiweb/mochiweb_request.erl 2013-03-16 11:15:19.000000000 -0500
++++ ./src/mochiweb/mochiweb_request.erl 2013-03-17 01:46:16.000000000 -0500
@@ -23,6 +23,8 @@
-export([accepted_encodings/1]).
-export([accepts_content_type/1]).
@@ -555,7 +563,7 @@
-define(SAVE_RECV, mochiweb_request_recv).
diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_response.erl ./src/mochiweb/mochiweb_response.erl
--- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_response.erl 2012-12-20 15:24:07.000000000 -0600
-+++ ./src/mochiweb/mochiweb_response.erl 2013-03-16 11:15:32.000000000 -0500
++++ ./src/mochiweb/mochiweb_response.erl 2013-03-17 01:46:16.000000000 -0500
@@ -11,6 +11,8 @@
-export([get_header_value/1, get/1, dump/0]).
-export([send/1, write_chunk/1]).
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-03-17 09:27:20 UTC (rev 104137)
+++ trunk/dports/databases/couchdb-devel/files/patch-parameterized-modules-r16b-bug.38395.patch 2013-03-17 11:46:08 UTC (rev 104138)
@@ -1,6 +1,6 @@
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-16 13:20:40.000000000 -0500
++++ ./src/mochiweb/Makefile.am 2013-03-17 01:44:16.000000000 -0500
@@ -17,6 +17,7 @@
mochiwebebindir = $(localerlanglibdir)/mochiweb-1.4.1/ebin
@@ -17,15 +17,18 @@
mochifmt.beam \
mochifmt_records.beam \
mochifmt_std.beam \
-@@ -107,4 +109,4 @@
+@@ -106,5 +108,7 @@
+ mochijson2.beam: mochijson2.erl
$(ERLC) $(ERLC_FLAGS) $(MOCHIJSON_ERLC_FLAGS) $<
++mochifmt_records.beam mochifmt_std.beam mochiweb_request.beam mochiweb_response.beam: pmod_pt.beam
++
%.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-16 13:23:15.000000000 -0500
++++ ./src/mochiweb/mochifmt_records.erl 2013-03-17 01:43:55.000000000 -0500
@@ -13,6 +13,8 @@
-author('bob at mochimedia.com').
-export([get_value/2]).
@@ -37,7 +40,7 @@
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-16 13:23:15.000000000 -0500
++++ ./src/mochiweb/mochifmt_std.erl 2013-03-17 01:43:55.000000000 -0500
@@ -7,6 +7,8 @@
-author('bob at mochimedia.com').
-export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
@@ -49,7 +52,7 @@
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-16 13:23:15.000000000 -0500
++++ ./src/mochiweb/mochiweb_request.erl 2013-03-17 01:43:55.000000000 -0500
@@ -23,6 +23,8 @@
-export([accepted_encodings/1]).
-export([accepts_content_type/1]).
@@ -61,7 +64,7 @@
-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-16 13:23:15.000000000 -0500
++++ ./src/mochiweb/mochiweb_response.erl 2013-03-17 01:43:55.000000000 -0500
@@ -11,6 +11,8 @@
-export([get_header_value/1, get/1, dump/0]).
-export([send/1, write_chunk/1]).
@@ -73,7 +76,7 @@
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-16 13:19:00.000000000 -0500
++++ ./src/mochiweb/pmod_pt.erl 2013-03-17 01:43:55.000000000 -0500
@@ -0,0 +1,463 @@
+%%
+%% %CopyrightBegin%
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130317/f7e1a234/attachment-0001.html>
More information about the macports-changes
mailing list