Re: UPDATE: apache-couchdb-0.10.0

Benoit Chesneau Sun, 01 Nov 2009 07:43:47 -0800


On Nov 1, 2009, at 2:44 PM, Federico G. Schwindt wrote:

On Sun, Nov 01, 2009 at 01:13:37PM +0000, Federico G. Schwindt wrote:

On Sat, Oct 31, 2009 at 11:15:18AM +0100, Benoit Chesneau wrote:

Hi,

New version of the patch with modification of msf (thanks!) that
create ${SYSCONFDIR}/couchdb/default.d and ${SYSCONFDIR}/couchdb/
local.d dirs. local.d dir will allow other package to add their
configuration.

All tests (make regress and http tests suite) pass on amd64.


 i will test today and let you know.

below is an updated diff that includes the removal of the pythonquery

server that you were so keen to do and correctly creates default.d and
local.d as directories.

 f.-

This patch is wrong. Apache CouchDB doesn't include nor supportpython view server it only support right now the js view setrver andoptionally (switch in ini file) the erlang view server. Also yourpatch remove the only supported view server javascript. Please don'tdo that.

If you want to patch something and ass support of this python viewserver patch the python-couchdb port and add right ini file in ${SYSCONFDIR}/etc/couchdb/local.d . This is the way to follow.


- benoit


Index: databases/apache-couchdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/Makefile,v
retrieving revision 1.4
diff -N -u -p databases/apache-couchdb/Makefile
--- databases/apache-couchdb/Makefile   17 Aug 2009 14:45:13 -0000      1.4
+++ databases/apache-couchdb/Makefile   1 Nov 2009 13:41:16 -0000
@@ -2,11 +2,11 @@

COMMENT =       distributed, document-oriented database

-COUCH_VER =    0.9.1
+COUCH_VER =    0.10.0
DISTNAME =      apache-couchdb-${COUCH_VER}
CATEGORIES =    databases

-HOMEPAGE =     http://incubator.apache.org/couchdb/
+HOMEPAGE =     http://couchdb.apache.org/

MAINTAINER =    Benoit Chesneau <[email protected]>

@@ -44,7 +44,7 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
# The 'erl -version' test in configure needs HOME to be set.
CONFIGURE_ENV = HOME=${PORTHOME}

-NO_REGRESS =   Yes
+REGRESS_TARGET = check
PORTHOME =      ${WRKDIR}

SUBST_VARS +=   COUCH_VER
Index: databases/apache-couchdb/distinfo
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/distinfo,v
retrieving revision 1.3
diff -N -u -p databases/apache-couchdb/distinfo
--- databases/apache-couchdb/distinfo   17 Aug 2009 14:45:13 -0000      1.3
+++ databases/apache-couchdb/distinfo   1 Nov 2009 13:41:16 -0000
@@ -1,5 +1,5 @@
-MD5 (apache-couchdb-0.9.1.tar.gz) = lYPvrlrfs/kEPpcP74JVYQ==
-RMD160 (apache-couchdb-0.9.1.tar.gz) = uK57bTMgnCCPCOj17T2pYLi9eu4=
-SHA1 (apache-couchdb-0.9.1.tar.gz) = OvtffGX+hqYiVGeWpzfgKpv/mwk=

-SHA256 (apache-couchdb-0.9.1.tar.gz) =sW86ELQG0BVSiT01bNv39Ckgn5OK59OqWJ7nBN+MtNI=

-SIZE (apache-couchdb-0.9.1.tar.gz) = 698409
+MD5 (apache-couchdb-0.10.0.tar.gz) = IniGtey7a8u9xTiqxFkrDg==
+RMD160 (apache-couchdb-0.10.0.tar.gz) = UA65mtcqJlTNsOMp2ovQJggkces=
+SHA1 (apache-couchdb-0.10.0.tar.gz) = 7+WdTbWNtAJ5MnuOuUE3a+BcHWk=

+SHA256 (apache-couchdb-0.10.0.tar.gz) =CiDA9TTOYF184rzCIyL4j34eEyvYrxdxA8ymTcFk4O0=

+SIZE (apache-couchdb-0.10.0.tar.gz) = 850687
Index: databases/apache-couchdb/patches/patch-Makefile_in
===================================================================

RCS file: /cvs/ports/databases/apache-couchdb/patches/patch-Makefile_in,v

retrieving revision 1.3
diff -N -u -p databases/apache-couchdb/patches/patch-Makefile_in

--- databases/apache-couchdb/patches/patch-Makefile_in 17 Aug 200914:45:13 -0000 1.3+++ databases/apache-couchdb/patches/patch-Makefile_in 1 Nov 200913:41:16 -0000

@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2009/08/17 14:45:13 bernd Exp $
---- Makefile.in.orig   Thu Jul 16 22:59:35 2009
-+++ Makefile.in        Sat Aug  1 10:30:56 2009
-@@ -230,7 +230,7 @@ version_release = @version_release@
+$OpenBSD$
+--- Makefile.in.orig   Wed Oct 21 23:29:10 2009
++++ Makefile.in        Wed Oct 21 23:31:35 2009
+@@ -234,7 +234,7 @@ version_release = @version_release@
 version_revision = @version_revision@
 version_stage = @version_stage@

- SUBDIRS = bin etc src/couchdb src/ibrowse src/mochiweb share testvar utils

+ SUBDIRS = bin etc src share test var utils

-localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gzTHANKS.gz

+localdoc_DATA = AUTHORS BUGS CHANGES NEWS README THANKS
 DISTCLEANFILES = $(localdoc_DATA)
- EXTRA_DIST = AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS

+ EXTRA_DIST = AUTHORS BUGS CHANGES LICENSE NEWS NOTICE READMETHANKS license.skip

 all: config.h

Index: databases/apache-couchdb/patches/patch-etc_couchdb_default_ini_tpl_in

===================================================================

RCS file: /cvs/ports/databases/apache-couchdb/patches/patch-etc_couchdb_default_ini_tpl_in,v

retrieving revision 1.1

diff -N -u -p databases/apache-couchdb/patches/patch-etc_couchdb_default_ini_tpl_in--- databases/apache-couchdb/patches/patch-etc_couchdb_default_ini_tpl_in 6 Apr 2009 14:43:18 -0000 1.1

+++ /dev/null   28 Sep 2008 10:50:08 -0000
@@ -1,11 +0,0 @@

-$OpenBSD: patch-etc_couchdb_default_ini_tpl_in,v 1.1 2009/04/0614:43:18 fgsch Exp $

---- etc/couchdb/default.ini.tpl.in.orig        Sat Apr  4 20:54:44 2009
-+++ etc/couchdb/default.ini.tpl.in     Sat Apr  4 20:55:55 2009
-@@ -23,6 +23,7 @@ level = info
-
- [query_servers]

- javascript = %bindir%/%couchjs_command_name% %localdatadir%/server/main.js

-+python = %bindir%/couchpy
-

- ; enable external as an httpd handler, then link it with commandshere.

- ; note, this api is still under consideration.
Index: databases/apache-couchdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p databases/apache-couchdb/pkg/PLIST
--- databases/apache-couchdb/pkg/PLIST  17 Aug 2009 14:45:13 -0000      1.3
+++ databases/apache-couchdb/pkg/PLIST  1 Nov 2009 13:41:16 -0000
@@ -12,6 +12,8 @@ lib/couchdb/erlang/lib/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch.app
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_batch_save.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_batch_save_sup.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_btree.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_config.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_config_writer.beam@@ -25,19 +27,28 @@ lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_elib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_external_server.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_file.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_auth.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_db.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_external.beamlib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_misc_handlers.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_oauth.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_show.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_stats_handlers.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_view.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_key_tree.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_log.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_native_process.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_os_process.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_query_servers.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_ref_counter.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_att.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_changes_feed.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_httpc.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_missing_revs.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_reader.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_sup.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_writer.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_server.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_server_sup.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_stats_aggregator.beam@@ -46,24 +57,46 @@ lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_s

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_task_status.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_util.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view.beam

+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_compactor.beam

lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_group.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_updater.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/include/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/include/couch_db.hrl
lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/couchspawnkillable
lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_erl_driver.a
lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_erl_driver.la
-lib/couchdb/erlang/lib/ibrowse-1.4.1/
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.app
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_app.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_http_client.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lb.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lib.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_sup.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_test.beam
+lib/couchdb/erlang/lib/erlang-oauth/
+lib/couchdb/erlang/lib/erlang-oauth/ebin/
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.app
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_hmac_sha1.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_http.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_plaintext.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_unix.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_uri.beam
+lib/couchdb/erlang/lib/etap/
+lib/couchdb/erlang/lib/etap/ebin/
+lib/couchdb/erlang/lib/etap/ebin/etap.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_application.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_can.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_exception.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_process.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_report.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_request.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_string.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_web.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.app
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_app.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_http_client.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lb.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lib.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_sup.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_test.beam
lib/couchdb/erlang/lib/mochiweb-r97/
lib/couchdb/erlang/lib/mochiweb-r97/ebin/
lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt.beam
@@ -99,11 +132,11 @@ share/couchdb/www/
share/couchdb/www/_sidebar.html
share/couchdb/www/config.html
share/couchdb/www/couch_tests.html
+share/couchdb/www/custom_test.html
share/couchdb/www/database.html
share/couchdb/www/dialog/
share/couchdb/www/dialog/_compact_database.html
share/couchdb/www/dialog/_create_database.html
-share/couchdb/www/dialog/_create_document.html
share/couchdb/www/dialog/_delete_database.html
share/couchdb/www/dialog/_delete_document.html
share/couchdb/www/dialog/_save_view_as.html
@@ -131,6 +164,7 @@ share/couchdb/www/image/run-mini.png
share/couchdb/www/image/run.png
share/couchdb/www/image/running.png
share/couchdb/www/image/save.png
+share/couchdb/www/image/sidebar-toggle.png
share/couchdb/www/image/spinner.gif
share/couchdb/www/image/test_failure.gif
share/couchdb/www/image/test_success.gif
@@ -157,6 +191,8 @@ share/couchdb/www/script/jquery.js
share/couchdb/www/script/jquery.resizer.js
share/couchdb/www/script/jquery.suggest.js
share/couchdb/www/script/json2.js
+share/couchdb/www/script/oauth.js
+share/couchdb/www/script/sha1.js
share/couchdb/www/script/test/
share/couchdb/www/script/test/all_docs.js
share/couchdb/www/script/test/attachment_names.js

@@ -164,32 +200,44 @@ share/couchdb/www/script/test/attachment_paths.js

share/couchdb/www/script/test/attachment_views.js
share/couchdb/www/script/test/attachments.js
share/couchdb/www/script/test/basics.js
+share/couchdb/www/script/test/batch_save.js
share/couchdb/www/script/test/bulk_docs.js
+share/couchdb/www/script/test/changes.js
share/couchdb/www/script/test/compact.js
share/couchdb/www/script/test/config.js
share/couchdb/www/script/test/conflicts.js
share/couchdb/www/script/test/content_negotiation.js
+share/couchdb/www/script/test/cookie_auth.js
share/couchdb/www/script/test/copy_doc.js
share/couchdb/www/script/test/delayed_commits.js
share/couchdb/www/script/test/design_docs.js
share/couchdb/www/script/test/design_options.js
share/couchdb/www/script/test/design_paths.js
+share/couchdb/www/script/test/erlang_views.js
share/couchdb/www/script/test/etags_head.js
share/couchdb/www/script/test/etags_views.js
+share/couchdb/www/script/test/form_submit.js
+share/couchdb/www/script/test/http.js
share/couchdb/www/script/test/invalid_docids.js
+share/couchdb/www/script/test/jsonp.js
share/couchdb/www/script/test/large_docs.js
share/couchdb/www/script/test/list_views.js
+share/couchdb/www/script/test/lorem.txt
+share/couchdb/www/script/test/lorem_b64.txt
share/couchdb/www/script/test/lots_of_docs.js
share/couchdb/www/script/test/multiple_rows.js
+share/couchdb/www/script/test/oauth.js
share/couchdb/www/script/test/purge.js
share/couchdb/www/script/test/recreate_doc.js
share/couchdb/www/script/test/reduce.js
+share/couchdb/www/script/test/reduce_builtin.js
share/couchdb/www/script/test/reduce_false.js
share/couchdb/www/script/test/replication.js
share/couchdb/www/script/test/rev_stemming.js
share/couchdb/www/script/test/security_validation.js
share/couchdb/www/script/test/show_documents.js
share/couchdb/www/script/test/stats.js
+share/couchdb/www/script/test/update_documents.js
share/couchdb/www/script/test/utf8.js
share/couchdb/www/script/test/uuids.js
share/couchdb/www/script/test/view_collation.js
@@ -215,6 +263,8 @@ share/doc/couchdb/README
share/doc/couchdb/THANKS
share/examples/couchdb/
@sample ${SYSCONFDIR}/couchdb/
+...@sample ${SYSCONFDIR}/couchdb/default.d/
+...@sample ${SYSCONFDIR}/couchdb/local.d/
share/examples/couchdb/default.ini
@sample ${SYSCONFDIR}/couchdb/default.ini
share/examples/couchdb/local.ini

Re: UPDATE: apache-couchdb-0.10.0

Reply via email to