Ticket #38734: couchdb.38734.1.patch

File couchdb.38734.1.patch, 10.5 KB (added by jeff@…, 11 years ago)

  • Portfile

     
    66
    77name                    couchdb
    88conflicts               couchdb-devel
    9 version                 1.2.2
     9version                 1.3.0
    1010
    1111categories              databases
    1212platforms               darwin
    … …  
    2626master_sites.mirror_subdir ${name}/source/${version}/
    2727distname                apache-${name}-${version}
    2828
    29 checksums               rmd160  9d2df26af8556ef7065484e604d2e59addbeecb5 \
    30                         sha256  6824b9eec0c05d022ef52f663074c67eca5493d848574ff2d73611e92bff8701
     29checksums               rmd160  0803f388673c181eff6ee287a76203a780c0ce8b \
     30                        sha256  591a2a5b92941cee1bba1e16e5a4978df8a81079a8b2efa766c36540b66a37f7
    3131
    3232depends_build           port:help2man
    3333

  • files/patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff

     
    1 --- etc/launchd/org.apache.couchdb.plist.tpl.in.orig    2012-12-20 16:24:07.000000000 -0500
    2 +++ etc/launchd/org.apache.couchdb.plist.tpl.in 2013-03-15 21:23:14.000000000 -0400
     1--- ../apache-couchdb-1.3.0.orig/etc/launchd/org.apache.couchdb.plist.tpl.in    2013-03-30 09:46:38.000000000 -0500
     2+++ ./etc/launchd/org.apache.couchdb.plist.tpl.in       2013-04-05 10:12:43.000000000 -0500
    33@@ -9,8 +9,6 @@
    44     <dict>
    55       <key>HOME</key>

  • files/patch-parameterized-modules-r16b-bug.38395.patch

     
    1 diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/Makefile.in ./src/etap/Makefile.in
    2 --- ../apache-couchdb-1.2.1-orig/src/etap/Makefile.in   2012-12-20 15:28:49.000000000 -0600
    3 +++ ./src/etap/Makefile.in      2013-03-17 01:46:46.000000000 -0500
    4 @@ -109,7 +109,7 @@
    5  ERL = @ERL@
    6  ERLANG_FLAGS = @ERLANG_FLAGS@
    7  ERLC = @ERLC@
    8 -ERLC_FLAGS = @ERLC_FLAGS@
    9 +ERLC_FLAGS = @ERLC_FLAGS@ -pa .
    10  EXEEXT = @EXEEXT@
    11  FGREP = @FGREP@
    12  FLAGS = @FLAGS@
    13 @@ -253,6 +253,7 @@
    14  version_stage = @version_stage@
    15  etapebindir = $(localerlanglibdir)/etap/ebin
    16  etap_file_collection = \
    17 +    pmod_pt.erl \
    18      etap.erl \
    19         etap_application.erl \
    20      etap_can.erl \
    21 @@ -264,6 +265,7 @@
    22         etap_web.erl
     1--- ../apache-couchdb-1.3.0.orig/configure      2013-03-30 09:46:50.000000000 -0500
     2+++ ./configure 2013-04-05 10:12:43.000000000 -0500
     3@@ -18448,7 +18448,7 @@
     4     as_fn_error $? "$erlang_version_error" "$LINENO" 5
     5 fi
    236 
    24  etapebin_make_generated_file_list = \
    25 +    pmod_pt.beam \
    26      etap.beam \
    27         etap_application.beam \
    28      etap_can.beam \
    29 @@ -486,6 +488,7 @@
    30         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    31         uninstall uninstall-am uninstall-etapebinDATA
     7-if test $minor_version -lt 7 -o $minor_version -gt 9; then
     8+if test $minor_version -lt 7; then
     9     as_fn_error $? "$erlang_version_error" "$LINENO" 5
     10 fi
    3211 
    33 +etap_request.beam : pmod_pt.beam
     12--- ../apache-couchdb-1.3.0.orig/src/mochiweb/Makefile.in       2013-03-30 09:46:48.000000000 -0500
     13+++ ./src/mochiweb/Makefile.in  2013-04-05 10:12:43.000000000 -0500
     14@@ -282,6 +282,7 @@
     15 @USE_NATIVE_MOCHIJSON_TRUE@MOCHIJSON_ERLC_FLAGS = +native
     16 mochiwebebindir = $(localerlanglibdir)/mochiweb-1.4.1/ebin
     17 mochiweb_file_collection = \
     18+       pmod_pt.erl \
     19        mochifmt.erl \
     20        mochifmt_records.erl \
     21        mochifmt_std.erl \
     22@@ -320,6 +321,7 @@
     23        reloader.erl
    3424 
     25 mochiwebebin_make_generated_file_list = \
     26+       pmod_pt.beam \
     27        mochifmt.beam \
     28        mochifmt_records.beam \
     29        mochifmt_std.beam \
     30@@ -587,8 +589,10 @@
     31 mochijson2.beam: mochijson2.erl
     32        $(ERLC) $(ERLC_FLAGS) $(MOCHIJSON_ERLC_FLAGS) $<
     33 
     34+mochifmt_records.beam mochifmt_std.beam mochiweb_request.beam mochiweb_response.beam: pmod_pt.beam
     35+
    3536 %.beam: %.erl
    36         $(ERLC) $(ERLC_FLAGS) $<
    37 diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/etap_request.erl ./src/etap/etap_request.erl
    38 --- ../apache-couchdb-1.2.1-orig/src/etap/etap_request.erl      2012-12-20 15:24:07.000000000 -0600
    39 +++ ./src/etap/etap_request.erl 2013-03-17 01:46:16.000000000 -0500
    40 @@ -33,6 +33,8 @@
    41      body_has_string/2
    42  ]).
     37-       $(ERLC) $(ERLC_FLAGS) $<
     38+       $(ERLC) $(ERLC_FLAGS) -pa . $<
    4339 
     40 # Tell versions [3.59,3.63) of GNU make to not export all variables.
     41 # Otherwise a system limit (for SysV at least) may be exceeded.
     42--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochifmt_records.erl      2013-03-30 09:46:38.000000000 -0500
     43+++ ./src/mochiweb/mochifmt_records.erl 2013-04-05 10:12:43.000000000 -0500
     44@@ -13,6 +13,8 @@
     45 -author('bob@mochimedia.com').
     46 -export([get_value/2]).
     47 
    4448+-compile({parse_transform, pmod_pt}).
    4549+
    46  % ---
    47  % Tests
     50 get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) ->
     51     try begin
     52             Atom = list_to_existing_atom(Key),
     53--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochifmt_std.erl  2013-03-30 09:46:38.000000000 -0500
     54+++ ./src/mochiweb/mochifmt_std.erl     2013-04-05 10:12:43.000000000 -0500
     55@@ -7,6 +7,8 @@
     56 -author('bob@mochimedia.com').
     57 -export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
    4858 
    49 diff -ruN ../apache-couchdb-1.2.1-orig/src/etap/pmod_pt.erl ./src/etap/pmod_pt.erl
    50 --- ../apache-couchdb-1.2.1-orig/src/etap/pmod_pt.erl   1969-12-31 18:00:00.000000000 -0600
    51 +++ ./src/etap/pmod_pt.erl      2013-03-17 01:46:16.000000000 -0500
     59+-compile({parse_transform, pmod_pt}).
     60+
     61 format(Format, Args) ->
     62     mochifmt:format(Format, Args, THIS).
     63 
     64--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochiweb_request.erl      2013-03-30 09:46:38.000000000 -0500
     65+++ ./src/mochiweb/mochiweb_request.erl 2013-04-05 10:12:43.000000000 -0500
     66@@ -23,6 +23,8 @@
     67 -export([accepted_encodings/1]).
     68 -export([accepts_content_type/1]).
     69 
     70+-compile({parse_transform, pmod_pt}).
     71+
     72 -define(SAVE_QS, mochiweb_request_qs).
     73 -define(SAVE_PATH, mochiweb_request_path).
     74 -define(SAVE_RECV, mochiweb_request_recv).
     75--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochiweb_response.erl     2013-03-30 09:46:38.000000000 -0500
     76+++ ./src/mochiweb/mochiweb_response.erl        2013-04-05 10:12:43.000000000 -0500
     77@@ -11,6 +11,8 @@
     78 -export([get_header_value/1, get/1, dump/0]).
     79 -export([send/1, write_chunk/1]).
     80 
     81+-compile({parse_transform, pmod_pt}).
     82+
     83 %% @spec get_header_value(string() | atom() | binary()) -> string() | undefined
     84 %% @doc Get the value of the given response header.
     85 get_header_value(K) ->
     86--- ../apache-couchdb-1.3.0.orig/src/mochiweb/pmod_pt.erl       1969-12-31 18:00:00.000000000 -0600
     87+++ ./src/mochiweb/pmod_pt.erl  2013-04-05 10:12:43.000000000 -0500
    5288@@ -0,0 +1,463 @@
    5389+%%
    5490+%% %CopyrightBegin%
    … …  
    513549+    [{var,L,V} | make_vars(N + 1, M, L)];
    514550+make_vars(_, _, _) ->
    515551+    [].
    516 diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/Makefile.in ./src/mochiweb/Makefile.in
    517 --- ../apache-couchdb-1.2.1-orig/src/mochiweb/Makefile.in       2012-12-20 15:28:49.000000000 -0600
    518 +++ ./src/mochiweb/Makefile.in  2013-03-17 01:46:16.000000000 -0500
    519 @@ -109,7 +109,7 @@
    520  ERL = @ERL@
    521  ERLANG_FLAGS = @ERLANG_FLAGS@
    522  ERLC = @ERLC@
    523 -ERLC_FLAGS = @ERLC_FLAGS@
    524 +ERLC_FLAGS = @ERLC_FLAGS@ -pa ../etap
    525  EXEEXT = @EXEEXT@
    526  FGREP = @FGREP@
    527  FLAGS = @FLAGS@
    528 diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_records.erl ./src/mochiweb/mochifmt_records.erl
    529 --- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_records.erl      2012-12-20 15:24:07.000000000 -0600
    530 +++ ./src/mochiweb/mochifmt_records.erl 2013-03-17 01:46:16.000000000 -0500
    531 @@ -13,6 +13,8 @@
    532  -author('bob@mochimedia.com').
    533  -export([get_value/2]).
    534  
    535 +-compile({parse_transform, pmod_pt}).
    536 +
    537  get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) ->
    538      try begin
    539              Atom = list_to_existing_atom(Key),
    540 diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_std.erl ./src/mochiweb/mochifmt_std.erl
    541 --- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochifmt_std.erl  2012-12-20 15:24:07.000000000 -0600
    542 +++ ./src/mochiweb/mochifmt_std.erl     2013-03-17 01:46:16.000000000 -0500
    543 @@ -7,6 +7,8 @@
    544  -author('bob@mochimedia.com').
    545  -export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
    546  
    547 +-compile({parse_transform, pmod_pt}).
    548 +
    549  format(Format, Args) ->
    550      mochifmt:format(Format, Args, THIS).
    551  
    552 diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_request.erl ./src/mochiweb/mochiweb_request.erl
    553 --- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_request.erl      2012-12-20 15:24:07.000000000 -0600
    554 +++ ./src/mochiweb/mochiweb_request.erl 2013-03-17 01:46:16.000000000 -0500
    555 @@ -23,6 +23,8 @@
    556  -export([accepted_encodings/1]).
    557  -export([accepts_content_type/1]).
    558  
    559 +-compile({parse_transform, pmod_pt}).
    560 +
    561  -define(SAVE_QS, mochiweb_request_qs).
    562  -define(SAVE_PATH, mochiweb_request_path).
    563  -define(SAVE_RECV, mochiweb_request_recv).
    564 diff -ruN ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_response.erl ./src/mochiweb/mochiweb_response.erl
    565 --- ../apache-couchdb-1.2.1-orig/src/mochiweb/mochiweb_response.erl     2012-12-20 15:24:07.000000000 -0600
    566 +++ ./src/mochiweb/mochiweb_response.erl        2013-03-17 01:46:16.000000000 -0500
    567 @@ -11,6 +11,8 @@
    568  -export([get_header_value/1, get/1, dump/0]).
    569  -export([send/1, write_chunk/1]).
    570  
    571 +-compile({parse_transform, pmod_pt}).
    572 +
    573  %% @spec get_header_value(string() | atom() | binary()) -> string() | undefined
    574  %% @doc Get the value of the given response header.
    575  get_header_value(K) ->

  • files/patch-src-couchdb-priv-Makefile.in.diff

     
    1 --- src/couchdb/priv/Makefile.in.orig   2012-12-20 15:28:49.000000000 -0600
    2 +++ src/couchdb/priv/Makefile.in        2013-01-13 20:59:36.000000000 -0600
    3 @@ -352,7 +352,7 @@
     1--- ../apache-couchdb-1.3.0.orig/src/couchdb/priv/Makefile.in   2013-03-30 09:46:48.000000000 -0500
     2+++ ./src/couchdb/priv/Makefile.in      2013-04-05 10:12:43.000000000 -0500
     3@@ -382,7 +382,7 @@
    44        couch_js/util.c
    55 
    66 couchjs_SOURCES = $(COUCHJS_SRCS)
    77-couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
    88+couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
    9  couchjs_LDFLAGS = $(JS_LDFLAGS)
    109 couchjs_LDADD = $(CURL_LIBS) $(JS_LIBS)
    1110 couchpriv_DATA = stat_descriptions.cfg
     11 @WINDOWS_TRUE@couchspawnkillable_SOURCES = spawnkillable/couchspawnkillable_win.c