[105098] trunk/dports/databases/couchdb

ciserlohn at macports.org ciserlohn at macports.org
Wed Apr 10 00:18:10 PDT 2013


Revision: 105098
          https://trac.macports.org/changeset/105098
Author:   ciserlohn at macports.org
Date:     2013-04-10 00:18:10 -0700 (Wed, 10 Apr 2013)
Log Message:
-----------
couchdb: update to version 1.3.0 (#38734; maintainer)

Modified Paths:
--------------
    trunk/dports/databases/couchdb/Portfile
    trunk/dports/databases/couchdb/files/patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff
    trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch
    trunk/dports/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2013-04-10 02:06:05 UTC (rev 105097)
+++ trunk/dports/databases/couchdb/Portfile	2013-04-10 07:18:10 UTC (rev 105098)
@@ -6,7 +6,7 @@
 
 name                    couchdb
 conflicts               couchdb-devel
-version                 1.2.2
+version                 1.3.0
 
 categories              databases
 platforms               darwin
@@ -26,8 +26,8 @@
 master_sites.mirror_subdir ${name}/source/${version}/
 distname                apache-${name}-${version}
 
-checksums               rmd160  9d2df26af8556ef7065484e604d2e59addbeecb5 \
-                        sha256  6824b9eec0c05d022ef52f663074c67eca5493d848574ff2d73611e92bff8701
+checksums               rmd160  0803f388673c181eff6ee287a76203a780c0ce8b \
+                        sha256  591a2a5b92941cee1bba1e16e5a4978df8a81079a8b2efa766c36540b66a37f7
 
 depends_build           port:help2man
 

Modified: trunk/dports/databases/couchdb/files/patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff	2013-04-10 02:06:05 UTC (rev 105097)
+++ trunk/dports/databases/couchdb/files/patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff	2013-04-10 07:18:10 UTC (rev 105098)
@@ -1,5 +1,5 @@
---- etc/launchd/org.apache.couchdb.plist.tpl.in.orig	2012-12-20 16:24:07.000000000 -0500
-+++ etc/launchd/org.apache.couchdb.plist.tpl.in	2013-03-15 21:23:14.000000000 -0400
+--- ../apache-couchdb-1.3.0.orig/etc/launchd/org.apache.couchdb.plist.tpl.in	2013-03-30 09:46:38.000000000 -0500
++++ ./etc/launchd/org.apache.couchdb.plist.tpl.in	2013-04-05 10:12:43.000000000 -0500
 @@ -9,8 +9,6 @@
      <dict>
        <key>HOME</key>

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-04-10 02:06:05 UTC (rev 105097)
+++ trunk/dports/databases/couchdb/files/patch-parameterized-modules-r16b-bug.38395.patch	2013-04-10 07:18:10 UTC (rev 105098)
@@ -1,54 +1,90 @@
-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-17 01:46:46.000000000 -0500
-@@ -109,7 +109,7 @@
- ERL = @ERL@
- ERLANG_FLAGS = @ERLANG_FLAGS@
- ERLC = @ERLC@
--ERLC_FLAGS = @ERLC_FLAGS@
-+ERLC_FLAGS = @ERLC_FLAGS@ -pa .
- EXEEXT = @EXEEXT@
- FGREP = @FGREP@
- FLAGS = @FLAGS@
-@@ -253,6 +253,7 @@
- version_stage = @version_stage@
- etapebindir = $(localerlanglibdir)/etap/ebin
- etap_file_collection = \
-+    pmod_pt.erl \
-     etap.erl \
-    	etap_application.erl \
-     etap_can.erl \
-@@ -264,6 +265,7 @@
-    	etap_web.erl
+--- ../apache-couchdb-1.3.0.orig/configure	2013-03-30 09:46:50.000000000 -0500
++++ ./configure	2013-04-05 10:12:43.000000000 -0500
+@@ -18448,7 +18448,7 @@
+     as_fn_error $? "$erlang_version_error" "$LINENO" 5
+ fi
  
- etapebin_make_generated_file_list = \
-+    pmod_pt.beam \
-     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
+-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
  
-+etap_request.beam : pmod_pt.beam
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/Makefile.in	2013-03-30 09:46:48.000000000 -0500
++++ ./src/mochiweb/Makefile.in	2013-04-05 10:12:43.000000000 -0500
+@@ -282,6 +282,7 @@
+ @USE_NATIVE_MOCHIJSON_TRUE at MOCHIJSON_ERLC_FLAGS = +native
+ mochiwebebindir = $(localerlanglibdir)/mochiweb-1.4.1/ebin
+ mochiweb_file_collection = \
++	pmod_pt.erl \
+ 	mochifmt.erl \
+ 	mochifmt_records.erl \
+ 	mochifmt_std.erl \
+@@ -320,6 +321,7 @@
+ 	reloader.erl
  
+ mochiwebebin_make_generated_file_list = \
++	pmod_pt.beam \
+ 	mochifmt.beam \
+ 	mochifmt_records.beam \
+ 	mochifmt_std.beam \
+@@ -587,8 +589,10 @@
+ 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) $<
-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-17 01:46:16.000000000 -0500
-@@ -33,6 +33,8 @@
-     body_has_string/2
- ]).
+-	$(ERLC) $(ERLC_FLAGS) $<
++	$(ERLC) $(ERLC_FLAGS) -pa . $<
  
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochifmt_records.erl	2013-03-30 09:46:38.000000000 -0500
++++ ./src/mochiweb/mochifmt_records.erl	2013-04-05 10:12:43.000000000 -0500
+@@ -13,6 +13,8 @@
+ -author('bob at mochimedia.com').
+ -export([get_value/2]).
+ 
 +-compile({parse_transform, pmod_pt}).
 +
- % ---
- % Tests
+ get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) ->
+     try begin
+             Atom = list_to_existing_atom(Key),
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochifmt_std.erl	2013-03-30 09:46:38.000000000 -0500
++++ ./src/mochiweb/mochifmt_std.erl	2013-04-05 10:12:43.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]).
  
-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-17 01:46:16.000000000 -0500
++-compile({parse_transform, pmod_pt}).
++
+ format(Format, Args) ->
+     mochifmt:format(Format, Args, THIS).
+ 
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochiweb_request.erl	2013-03-30 09:46:38.000000000 -0500
++++ ./src/mochiweb/mochiweb_request.erl	2013-04-05 10:12:43.000000000 -0500
+@@ -23,6 +23,8 @@
+ -export([accepted_encodings/1]).
+ -export([accepts_content_type/1]).
+ 
++-compile({parse_transform, pmod_pt}).
++
+ -define(SAVE_QS, mochiweb_request_qs).
+ -define(SAVE_PATH, mochiweb_request_path).
+ -define(SAVE_RECV, mochiweb_request_recv).
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/mochiweb_response.erl	2013-03-30 09:46:38.000000000 -0500
++++ ./src/mochiweb/mochiweb_response.erl	2013-04-05 10:12:43.000000000 -0500
+@@ -11,6 +11,8 @@
+ -export([get_header_value/1, get/1, dump/0]).
+ -export([send/1, write_chunk/1]).
+ 
++-compile({parse_transform, pmod_pt}).
++
+ %% @spec get_header_value(string() | atom() | binary()) -> string() | undefined
+ %% @doc Get the value of the given response header.
+ get_header_value(K) ->
+--- ../apache-couchdb-1.3.0.orig/src/mochiweb/pmod_pt.erl	1969-12-31 18:00:00.000000000 -0600
++++ ./src/mochiweb/pmod_pt.erl	2013-04-05 10:12:43.000000000 -0500
 @@ -0,0 +1,463 @@
 +%%
 +%% %CopyrightBegin%
@@ -513,63 +549,3 @@
 +    [{var,L,V} | make_vars(N + 1, M, L)];
 +make_vars(_, _, _) ->
 +    [].
-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-17 01:46:16.000000000 -0500
-@@ -109,7 +109,7 @@
- ERL = @ERL@
- ERLANG_FLAGS = @ERLANG_FLAGS@
- ERLC = @ERLC@
--ERLC_FLAGS = @ERLC_FLAGS@
-+ERLC_FLAGS = @ERLC_FLAGS@ -pa ../etap
- EXEEXT = @EXEEXT@
- FGREP = @FGREP@
- 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-17 01:46:16.000000000 -0500
-@@ -13,6 +13,8 @@
- -author('bob at mochimedia.com').
- -export([get_value/2]).
- 
-+-compile({parse_transform, pmod_pt}).
-+
- get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) ->
-     try begin
-             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-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]).
- 
-+-compile({parse_transform, pmod_pt}).
-+
- format(Format, Args) ->
-     mochifmt:format(Format, Args, THIS).
- 
-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-17 01:46:16.000000000 -0500
-@@ -23,6 +23,8 @@
- -export([accepted_encodings/1]).
- -export([accepts_content_type/1]).
- 
-+-compile({parse_transform, pmod_pt}).
-+
- -define(SAVE_QS, mochiweb_request_qs).
- -define(SAVE_PATH, mochiweb_request_path).
- -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-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]).
- 
-+-compile({parse_transform, pmod_pt}).
-+
- %% @spec get_header_value(string() | atom() | binary()) -> string() | undefined
- %% @doc Get the value of the given response header.
- get_header_value(K) ->

Modified: trunk/dports/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff	2013-04-10 02:06:05 UTC (rev 105097)
+++ trunk/dports/databases/couchdb/files/patch-src-couchdb-priv-Makefile.in.diff	2013-04-10 07:18:10 UTC (rev 105098)
@@ -1,11 +1,11 @@
---- src/couchdb/priv/Makefile.in.orig	2012-12-20 15:28:49.000000000 -0600
-+++ src/couchdb/priv/Makefile.in	2013-01-13 20:59:36.000000000 -0600
-@@ -352,7 +352,7 @@
+--- ../apache-couchdb-1.3.0.orig/src/couchdb/priv/Makefile.in	2013-03-30 09:46:48.000000000 -0500
++++ ./src/couchdb/priv/Makefile.in	2013-04-05 10:12:43.000000000 -0500
+@@ -382,7 +382,7 @@
  	couch_js/util.c
  
  couchjs_SOURCES = $(COUCHJS_SRCS)
 -couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
 +couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
- couchjs_LDFLAGS = $(JS_LDFLAGS)
  couchjs_LDADD = $(CURL_LIBS) $(JS_LIBS)
  couchpriv_DATA = stat_descriptions.cfg
+ @WINDOWS_TRUE at couchspawnkillable_SOURCES = spawnkillable/couchspawnkillable_win.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130410/7332432e/attachment.html>


More information about the macports-changes mailing list