Update couchdb to 1.5.0.

Changes since 1.4.0:
- COUCHDB-1781: The official documentation has been overhauled.
- New administration UI, included as an experimental preview.
- COUCHDB-1888: Fixed an issue where admin users would be restricted
  by the public_fields feature.
- Fixed an issue with the JavaScript CLI test runner.
- COUCHDB-1867: An experimental plugin feature has been added.
- COUCHDB-1894: An experimental Node.js-based query server runtime added.
- COUCHDB-1901: Better retry mechanism for transferring attachments during
  replication.

6 files changed, 337 insertions, 132 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 22307d601db..27b61298180 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2013/10/19 09:07:01 adam Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/02 17:10:22 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.4.0
+DISTNAME=		apache-couchdb-1.5.0
 PKGNAME=		${DISTNAME:S/apache-//}
-PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
 
@@ -69,9 +68,8 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths+=	configure bin/couchdb.tpl.in
-SUBST_SED.paths=	-e 's,@EGDIR@,${COUCH_EGDIR},g'
-SUBST_SED.paths+=	-e 's,@RUNDIR@,${COUCH_RUNDIR},g'
-SUBST_SED.paths+=	-e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g'
+SUBST_VARS.paths=	COUCH_EGDIR COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR
+SUBST_SED.paths=	-e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g'
 
 # This works around libtool abuse installing "couchspawnkillable". Will
 # hopefully get fixed properly upstream.
diff --git a/databases/couchdb/Makefile.versions b/databases/couchdb/Makefile.versions
index 898c20791bd..42b8ee644f3 100644
--- a/databases/couchdb/Makefile.versions
+++ b/databases/couchdb/Makefile.versions
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile.versions,v 1.1 2013/09/09 13:39:10 fhajny Exp $
+# $NetBSD: Makefile.versions,v 1.2 2014/01/02 17:10:22 fhajny Exp $
 
 _VERSIONS=					\
 	couch_dbupdates	0.1			\
+	couch_index	0.1			\
+	couch_mrview	0.1			\
+	couch_plugins	0.1			\
+	couch_replicator	0.1		\
 	ejson		0.1.0			\
 	ibrowse		2.2.0			\
 	mochiweb	1.4.1			\
diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST
index e9c965c2777..d6a10d7f81b 100644
--- a/databases/couchdb/PLIST
+++ b/databases/couchdb/PLIST
@@ -1,22 +1,54 @@
-@comment $NetBSD: PLIST,v 1.5 2013/09/09 13:39:10 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/01/02 17:10:22 fhajny Exp $
 bin/couch-config
 bin/couchdb
 bin/couchjs
 info/CouchDB
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.app
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.beam
+lib/erlang/lib/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates_httpd.beam
+lib/erlang/lib/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates.beam
+lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_compactor.beam
+lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_server.beam
+lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_updater.beam
+lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index_util.beam
+lib/erlang/lib/couch_index-${VERSION.couch_index}/ebin/couch_index.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_cleanup.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_compactor.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_http.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_index.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_show.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_test_util.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_updater.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview_util.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview.app
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/ebin/couch_mrview.beam
+lib/erlang/lib/couch_mrview-${VERSION.couch_mrview}/include/couch_mrview.hrl
+lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins_httpd.beam
+lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins.app
+lib/erlang/lib/couch_plugins-${VERSION.couch_plugins}/ebin/couch_plugins.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_api_wrap.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpc_pool.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpc.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_httpd.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_job_sup.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_manager.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_notifier.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_utils.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator_worker.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator.app
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/ebin/couch_replicator.beam
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator_api_wrap.hrl
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator_js_functions.hrl
+lib/erlang/lib/couch_replicator-${VERSION.couch_replicator}/include/couch_replicator.hrl
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_app.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_auth_cache.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_btree.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_changes.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_compaction_daemon.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_compress.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_config.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_config_writer.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_update_notifier.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_config.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_update_notifier_sup.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_update_notifier.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db_updater.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_db.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_doc.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_drv.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_ejson_compare.beam
@@ -24,7 +56,6 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_event_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_external_manager.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_external_server.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_file.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_auth.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_cors.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_db.beam
@@ -35,6 +66,8 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_proxy.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_rewrite.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_stats_handlers.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd_vhost.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_httpd.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_changes.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_key_tree.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_log.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_native_process.beam
@@ -45,8 +78,8 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_primary_sup.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_query_servers.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_ref_counter.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_secondary_sup.beam
-lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server_sup.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_server.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_aggregator.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_collector.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stream.beam
@@ -55,6 +88,8 @@ lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_users_db.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_util.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_uuids.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_work_queue.beam
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.app
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/json_stream_parse.beam
 lib/erlang/lib/couch-${PKGVERSION}/include/couch_db.hrl
 lib/erlang/lib/couch-${PKGVERSION}/include/couch_js_functions.hrl
@@ -62,38 +97,6 @@ lib/erlang/lib/couch-${PKGVERSION}/priv/couchspawnkillable
 lib/erlang/lib/couch-${PKGVERSION}/priv/lib/couch_ejson_compare.la
 lib/erlang/lib/couch-${PKGVERSION}/priv/lib/couch_icu_driver.la
 lib/erlang/lib/couch-${PKGVERSION}/priv/stat_descriptions.cfg
-lib/erlang/lib/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates.beam
-lib/erlang/lib/couch_dbupdates-${VERSION.couch_dbupdates}/ebin/couch_dbupdates_httpd.beam
-lib/erlang/lib/couch_index-0.1/ebin/couch_index.beam
-lib/erlang/lib/couch_index-0.1/ebin/couch_index_compactor.beam
-lib/erlang/lib/couch_index-0.1/ebin/couch_index_server.beam
-lib/erlang/lib/couch_index-0.1/ebin/couch_index_updater.beam
-lib/erlang/lib/couch_index-0.1/ebin/couch_index_util.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview.app
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_cleanup.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_compactor.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_http.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_index.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_show.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_test_util.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_updater.beam
-lib/erlang/lib/couch_mrview-0.1/ebin/couch_mrview_util.beam
-lib/erlang/lib/couch_mrview-0.1/include/couch_mrview.hrl
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator.app
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_api_wrap.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_httpc.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_httpc_pool.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_httpd.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_job_sup.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_manager.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_notifier.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_utils.beam
-lib/erlang/lib/couch_replicator-0.1/ebin/couch_replicator_worker.beam
-lib/erlang/lib/couch_replicator-0.1/include/couch_replicator.hrl
-lib/erlang/lib/couch_replicator-0.1/include/couch_replicator_api_wrap.hrl
-lib/erlang/lib/couch_replicator-0.1/include/couch_replicator_js_functions.hrl
 lib/erlang/lib/ejson-${VERSION.ejson}/ebin/ejson.app
 lib/erlang/lib/ejson-${VERSION.ejson}/ebin/ejson.beam
 lib/erlang/lib/ejson-${VERSION.ejson}/ebin/mochijson2.beam
@@ -102,17 +105,17 @@ lib/erlang/lib/ejson-${VERSION.ejson}/priv/ejson.la
 lib/erlang/lib/erlang-oauth/ebin/oauth.app
 lib/erlang/lib/erlang-oauth/ebin/oauth.beam
 lib/erlang/lib/etap/ebin/etap.beam
-lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.app
-lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_app.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_http_client.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_lb.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_lib.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_sup.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_test.beam
-lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt.beam
+lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.app
+lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt_records.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt_std.beam
+lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochifmt.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiglobal.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochihex.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochijson.beam
@@ -122,27 +125,27 @@ lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochilogfile2.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochinum.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochitemp.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiutf8.beam
-lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.app
-lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_acceptor.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_app.beam
-lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_charref.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_cookies.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_cover.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_echo.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_headers.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_html.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_http.beam
+lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_charref.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_io.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_mime.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_multipart.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_request.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_response.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_skel.beam
-lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_socket.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_socket_server.beam
+lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_socket.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_sup.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb_util.beam
+lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.app
+lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/mochiweb.beam
 lib/erlang/lib/mochiweb-${VERSION.mochiweb}/ebin/reloader.beam
 lib/erlang/lib/snappy-${VERSION.snappy}/ebin/snappy.app
 lib/erlang/lib/snappy-${VERSION.snappy}/ebin/snappy.beam
@@ -158,7 +161,6 @@ share/couchdb/www/couch_tests.html
 share/couchdb/www/custom_test.html
 share/couchdb/www/database.html
 share/couchdb/www/dialog/_admin_party.html
-share/couchdb/www/dialog/_change_password.html
 share/couchdb/www/dialog/_compact_cleanup.html
 share/couchdb/www/dialog/_create_admin.html
 share/couchdb/www/dialog/_create_config.html
@@ -166,6 +168,7 @@ share/couchdb/www/dialog/_create_database.html
 share/couchdb/www/dialog/_database_security.html
 share/couchdb/www/dialog/_delete_database.html
 share/couchdb/www/dialog/_delete_document.html
+share/couchdb/www/dialog/_change_password.html
 share/couchdb/www/dialog/_login.html
 share/couchdb/www/dialog/_save_view_as.html
 share/couchdb/www/dialog/_share_test_reports.html
@@ -176,27 +179,128 @@ share/couchdb/www/docs/_images/futon-editdoc.png
 share/couchdb/www/docs/_images/futon-editeddoc.png
 share/couchdb/www/docs/_images/futon-overview.png
 share/couchdb/www/docs/_images/futon-replform.png
-share/couchdb/www/docs/_sources/api-basics.txt
-share/couchdb/www/docs/_sources/api/authn.txt
-share/couchdb/www/docs/_sources/api/configuration.txt
-share/couchdb/www/docs/_sources/api/database.txt
-share/couchdb/www/docs/_sources/api/design.txt
-share/couchdb/www/docs/_sources/api/documents.txt
+share/couchdb/www/docs/_images/intro-consistency-01.png
+share/couchdb/www/docs/_images/intro-consistency-02.png
+share/couchdb/www/docs/_images/intro-consistency-03.png
+share/couchdb/www/docs/_images/intro-consistency-04.png
+share/couchdb/www/docs/_images/intro-consistency-05.png
+share/couchdb/www/docs/_images/intro-consistency-06.png
+share/couchdb/www/docs/_images/intro-consistency-07.png
+share/couchdb/www/docs/_images/intro-tour-01.png
+share/couchdb/www/docs/_images/intro-tour-02.png
+share/couchdb/www/docs/_images/intro-tour-03.png
+share/couchdb/www/docs/_images/intro-tour-04.png
+share/couchdb/www/docs/_images/intro-tour-05.png
+share/couchdb/www/docs/_images/intro-tour-06.png
+share/couchdb/www/docs/_images/intro-tour-07.png
+share/couchdb/www/docs/_images/intro-tour-08.png
+share/couchdb/www/docs/_images/intro-tour-09.png
+share/couchdb/www/docs/_images/intro-tour-10.png
+share/couchdb/www/docs/_images/intro-why-01.png
+share/couchdb/www/docs/_images/intro-why-02.png
+share/couchdb/www/docs/_images/intro-why-03.png
+share/couchdb/www/docs/_images/views-intro-01.png
+share/couchdb/www/docs/_images/views-intro-02.png
+share/couchdb/www/docs/_images/views-intro-03.png
+share/couchdb/www/docs/_images/views-intro-04.png
+share/couchdb/www/docs/_sources/about.txt
+share/couchdb/www/docs/_sources/api/basics.txt
+share/couchdb/www/docs/_sources/api/database/bulk-api.txt
+share/couchdb/www/docs/_sources/api/database/common.txt
+share/couchdb/www/docs/_sources/api/database/compact.txt
+share/couchdb/www/docs/_sources/api/database/changes.txt
+share/couchdb/www/docs/_sources/api/database/index.txt
+share/couchdb/www/docs/_sources/api/database/misc.txt
+share/couchdb/www/docs/_sources/api/database/security.txt
+share/couchdb/www/docs/_sources/api/database/temp-views.txt
+share/couchdb/www/docs/_sources/api/ddoc/common.txt
+share/couchdb/www/docs/_sources/api/ddoc/index.txt
+share/couchdb/www/docs/_sources/api/ddoc/render.txt
+share/couchdb/www/docs/_sources/api/ddoc/rewrites.txt
+share/couchdb/www/docs/_sources/api/ddoc/views.txt
+share/couchdb/www/docs/_sources/api/document/attachments.txt
+share/couchdb/www/docs/_sources/api/document/common.txt
+share/couchdb/www/docs/_sources/api/document/index.txt
+share/couchdb/www/docs/_sources/api/index.txt
 share/couchdb/www/docs/_sources/api/local.txt
-share/couchdb/www/docs/_sources/api/misc.txt
-share/couchdb/www/docs/_sources/api/reference.txt
-share/couchdb/www/docs/_sources/changelog.txt
-share/couchdb/www/docs/_sources/changes.txt
-share/couchdb/www/docs/_sources/config_reference.txt
-share/couchdb/www/docs/_sources/configuring.txt
+share/couchdb/www/docs/_sources/api/server/authn.txt
+share/couchdb/www/docs/_sources/api/server/common.txt
+share/couchdb/www/docs/_sources/api/server/configuration.txt
+share/couchdb/www/docs/_sources/api/server/index.txt
+share/couchdb/www/docs/_sources/config/auth.txt
+share/couchdb/www/docs/_sources/config/compaction.txt
+share/couchdb/www/docs/_sources/config/couchdb.txt
+share/couchdb/www/docs/_sources/config/externals.txt
+share/couchdb/www/docs/_sources/config/http-handlers.txt
+share/couchdb/www/docs/_sources/config/http.txt
+share/couchdb/www/docs/_sources/config/index.txt
+share/couchdb/www/docs/_sources/config/intro.txt
+share/couchdb/www/docs/_sources/config/logging.txt
+share/couchdb/www/docs/_sources/config/misc.txt
+share/couchdb/www/docs/_sources/config/proxying.txt
+share/couchdb/www/docs/_sources/config/query-servers.txt
+share/couchdb/www/docs/_sources/config/replicator.txt
+share/couchdb/www/docs/_sources/config/services.txt
+share/couchdb/www/docs/_sources/contents.txt
 share/couchdb/www/docs/_sources/contributing.txt
-share/couchdb/www/docs/_sources/ddocs.txt
-share/couchdb/www/docs/_sources/index.txt
-share/couchdb/www/docs/_sources/intro.txt
+share/couchdb/www/docs/_sources/couchapp/ddocs.txt
+share/couchdb/www/docs/_sources/couchapp/index.txt
+share/couchdb/www/docs/_sources/couchapp/views/collation.txt
+share/couchdb/www/docs/_sources/couchapp/views/index.txt
+share/couchdb/www/docs/_sources/couchapp/views/intro.txt
+share/couchdb/www/docs/_sources/couchapp/views/joins.txt
+share/couchdb/www/docs/_sources/couchapp/views/nosql.txt
+share/couchdb/www/docs/_sources/couchapp/views/pagination.txt
+share/couchdb/www/docs/_sources/cve/2010-0009.txt
+share/couchdb/www/docs/_sources/cve/2010-2234.txt
+share/couchdb/www/docs/_sources/cve/2010-3854.txt
+share/couchdb/www/docs/_sources/cve/2012-5641.txt
+share/couchdb/www/docs/_sources/cve/2012-5649.txt
+share/couchdb/www/docs/_sources/cve/2012-5650.txt
+share/couchdb/www/docs/_sources/cve/index.txt
+share/couchdb/www/docs/_sources/experimental.txt
+share/couchdb/www/docs/_sources/externals.txt
+share/couchdb/www/docs/_sources/fauxton/addons.txt
+share/couchdb/www/docs/_sources/fauxton/index.txt
+share/couchdb/www/docs/_sources/fauxton/install.txt
+share/couchdb/www/docs/_sources/install/freebsd.txt
+share/couchdb/www/docs/_sources/install/index.txt
+share/couchdb/www/docs/_sources/install/mac.txt
+share/couchdb/www/docs/_sources/install/unix.txt
+share/couchdb/www/docs/_sources/install/windows.txt
+share/couchdb/www/docs/_sources/intro/api.txt
+share/couchdb/www/docs/_sources/intro/consistency.txt
+share/couchdb/www/docs/_sources/intro/curl.txt
+share/couchdb/www/docs/_sources/intro/futon.txt
+share/couchdb/www/docs/_sources/intro/index.txt
+share/couchdb/www/docs/_sources/intro/overview.txt
+share/couchdb/www/docs/_sources/intro/security.txt
+share/couchdb/www/docs/_sources/intro/tour.txt
+share/couchdb/www/docs/_sources/intro/why.txt
 share/couchdb/www/docs/_sources/json-structure.txt
-share/couchdb/www/docs/_sources/query-servers.txt
-share/couchdb/www/docs/_sources/replication.txt
-share/couchdb/www/docs/_sources/replicator.txt
+share/couchdb/www/docs/_sources/maintenance/compaction.txt
+share/couchdb/www/docs/_sources/maintenance/index.txt
+share/couchdb/www/docs/_sources/maintenance/performance.txt
+share/couchdb/www/docs/_sources/query-server/erlang.txt
+share/couchdb/www/docs/_sources/query-server/index.txt
+share/couchdb/www/docs/_sources/query-server/javascript.txt
+share/couchdb/www/docs/_sources/query-server/protocol.txt
+share/couchdb/www/docs/_sources/replication/conflicts.txt
+share/couchdb/www/docs/_sources/replication/index.txt
+share/couchdb/www/docs/_sources/replication/intro.txt
+share/couchdb/www/docs/_sources/replication/protocol.txt
+share/couchdb/www/docs/_sources/replication/replicator.txt
+share/couchdb/www/docs/_sources/whatsnew/0.10.txt
+share/couchdb/www/docs/_sources/whatsnew/0.11.txt
+share/couchdb/www/docs/_sources/whatsnew/0.8.txt
+share/couchdb/www/docs/_sources/whatsnew/0.9.txt
+share/couchdb/www/docs/_sources/whatsnew/1.0.txt
+share/couchdb/www/docs/_sources/whatsnew/1.1.txt
+share/couchdb/www/docs/_sources/whatsnew/1.2.txt
+share/couchdb/www/docs/_sources/whatsnew/1.3.txt
+share/couchdb/www/docs/_sources/whatsnew/1.4.txt
+share/couchdb/www/docs/_sources/whatsnew/1.5.txt
+share/couchdb/www/docs/_sources/whatsnew/index.txt
 share/couchdb/www/docs/_static/ajax-loader.gif
 share/couchdb/www/docs/_static/basic.css
 share/couchdb/www/docs/_static/comment-bright.png
@@ -220,31 +324,131 @@ share/couchdb/www/docs/_static/underscore.js
 share/couchdb/www/docs/_static/up-pressed.png
 share/couchdb/www/docs/_static/up.png
 share/couchdb/www/docs/_static/websupport.js
-share/couchdb/www/docs/api-basics.html
-share/couchdb/www/docs/api/authn.html
-share/couchdb/www/docs/api/configuration.html
-share/couchdb/www/docs/api/database.html
-share/couchdb/www/docs/api/design.html
-share/couchdb/www/docs/api/documents.html
+share/couchdb/www/docs/about.html
+share/couchdb/www/docs/api/basics.html
+share/couchdb/www/docs/api/database/bulk-api.html
+share/couchdb/www/docs/api/database/common.html
+share/couchdb/www/docs/api/database/compact.html
+share/couchdb/www/docs/api/database/changes.html
+share/couchdb/www/docs/api/database/index.html
+share/couchdb/www/docs/api/database/misc.html
+share/couchdb/www/docs/api/database/security.html
+share/couchdb/www/docs/api/database/temp-views.html
+share/couchdb/www/docs/api/ddoc/common.html
+share/couchdb/www/docs/api/ddoc/index.html
+share/couchdb/www/docs/api/ddoc/render.html
+share/couchdb/www/docs/api/ddoc/rewrites.html
+share/couchdb/www/docs/api/ddoc/views.html
+share/couchdb/www/docs/api/document/attachments.html
+share/couchdb/www/docs/api/document/common.html
+share/couchdb/www/docs/api/document/index.html
+share/couchdb/www/docs/api/index.html
 share/couchdb/www/docs/api/local.html
-share/couchdb/www/docs/api/misc.html
-share/couchdb/www/docs/api/reference.html
-share/couchdb/www/docs/changelog.html
-share/couchdb/www/docs/changes.html
-share/couchdb/www/docs/config_reference.html
-share/couchdb/www/docs/configuring.html
-share/couchdb/www/docs/ddocs.html
-share/couchdb/www/docs/genindex.html
+share/couchdb/www/docs/api/server/authn.html
+share/couchdb/www/docs/api/server/common.html
+share/couchdb/www/docs/api/server/configuration.html
+share/couchdb/www/docs/api/server/index.html
+share/couchdb/www/docs/config-ref.html
+share/couchdb/www/docs/config/auth.html
+share/couchdb/www/docs/config/compaction.html
+share/couchdb/www/docs/config/couchdb.html
+share/couchdb/www/docs/config/externals.html
+share/couchdb/www/docs/config/http-handlers.html
+share/couchdb/www/docs/config/http.html
+share/couchdb/www/docs/config/index.html
+share/couchdb/www/docs/config/intro.html
+share/couchdb/www/docs/config/logging.html
+share/couchdb/www/docs/config/misc.html
+share/couchdb/www/docs/config/proxying.html
+share/couchdb/www/docs/config/query-servers.html
+share/couchdb/www/docs/config/replicator.html
+share/couchdb/www/docs/config/services.html
+share/couchdb/www/docs/contents.html
+share/couchdb/www/docs/contributing.html
+share/couchdb/www/docs/couchapp/ddocs.html
+share/couchdb/www/docs/couchapp/index.html
+share/couchdb/www/docs/couchapp/views/collation.html
+share/couchdb/www/docs/couchapp/views/index.html
+share/couchdb/www/docs/couchapp/views/intro.html
+share/couchdb/www/docs/couchapp/views/joins.html
+share/couchdb/www/docs/couchapp/views/nosql.html
+share/couchdb/www/docs/couchapp/views/pagination.html
+share/couchdb/www/docs/cve/2010-0009.html
+share/couchdb/www/docs/cve/2010-2234.html
+share/couchdb/www/docs/cve/2010-3854.html
+share/couchdb/www/docs/cve/2012-5641.html
+share/couchdb/www/docs/cve/2012-5649.html
+share/couchdb/www/docs/cve/2012-5650.html
+share/couchdb/www/docs/cve/index.html
+share/couchdb/www/docs/download.html
+share/couchdb/www/docs/experimental.html
+share/couchdb/www/docs/externals.html
+share/couchdb/www/docs/fauxton/addons.html
+share/couchdb/www/docs/fauxton/index.html
+share/couchdb/www/docs/fauxton/install.html
+share/couchdb/www/docs/http-api.html
 share/couchdb/www/docs/index.html
-share/couchdb/www/docs/intro.html
+share/couchdb/www/docs/install/freebsd.html
+share/couchdb/www/docs/install/index.html
+share/couchdb/www/docs/install/mac.html
+share/couchdb/www/docs/install/unix.html
+share/couchdb/www/docs/install/windows.html
+share/couchdb/www/docs/intro/api.html
+share/couchdb/www/docs/intro/consistency.html
+share/couchdb/www/docs/intro/curl.html
+share/couchdb/www/docs/intro/futon.html
+share/couchdb/www/docs/intro/index.html
+share/couchdb/www/docs/intro/overview.html
+share/couchdb/www/docs/intro/security.html
+share/couchdb/www/docs/intro/tour.html
+share/couchdb/www/docs/intro/why.html
 share/couchdb/www/docs/json-structure.html
+share/couchdb/www/docs/maintenance/compaction.html
+share/couchdb/www/docs/maintenance/index.html
+share/couchdb/www/docs/maintenance/performance.html
 share/couchdb/www/docs/objects.inv
-share/couchdb/www/docs/query-servers.html
-share/couchdb/www/docs/replication.html
-share/couchdb/www/docs/replicator.html
+share/couchdb/www/docs/query-server/erlang.html
+share/couchdb/www/docs/query-server/index.html
+share/couchdb/www/docs/query-server/javascript.html
+share/couchdb/www/docs/query-server/protocol.html
+share/couchdb/www/docs/replication/conflicts.html
+share/couchdb/www/docs/replication/index.html
+share/couchdb/www/docs/replication/intro.html
+share/couchdb/www/docs/replication/protocol.html
+share/couchdb/www/docs/replication/replicator.html
 share/couchdb/www/docs/search.html
 share/couchdb/www/docs/searchindex.js
+share/couchdb/www/docs/whatsnew/0.10.html
+share/couchdb/www/docs/whatsnew/0.11.html
+share/couchdb/www/docs/whatsnew/0.8.html
+share/couchdb/www/docs/whatsnew/0.9.html
+share/couchdb/www/docs/whatsnew/1.0.html
+share/couchdb/www/docs/whatsnew/1.1.html
+share/couchdb/www/docs/whatsnew/1.2.html
+share/couchdb/www/docs/whatsnew/1.3.html
+share/couchdb/www/docs/whatsnew/1.4.html
+share/couchdb/www/docs/whatsnew/1.5.html
+share/couchdb/www/docs/whatsnew/index.html
 share/couchdb/www/document.html
+share/couchdb/www/fauxton/css/index.css
+share/couchdb/www/fauxton/img/couchdb-site.png
+share/couchdb/www/fauxton/img/couchdblogo.png
+share/couchdb/www/fauxton/img/fontawesome-webfont.eot
+share/couchdb/www/fauxton/img/fontawesome-webfont.svg
+share/couchdb/www/fauxton/img/fontawesome-webfont.ttf
+share/couchdb/www/fauxton/img/fontawesome-webfont.woff
+share/couchdb/www/fauxton/img/FontAwesome.otf
+share/couchdb/www/fauxton/img/fontcustom_fauxton.eot
+share/couchdb/www/fauxton/img/fontcustom_fauxton.svg
+share/couchdb/www/fauxton/img/fontcustom_fauxton.ttf
+share/couchdb/www/fauxton/img/fontcustom_fauxton.woff
+share/couchdb/www/fauxton/img/glyphicons-halflings-white.png
+share/couchdb/www/fauxton/img/glyphicons-halflings.png
+share/couchdb/www/fauxton/img/linen.png
+share/couchdb/www/fauxton/img/loader.gif
+share/couchdb/www/fauxton/img/minilogo.png
+share/couchdb/www/fauxton/index.html
+share/couchdb/www/fauxton/js/require.js
 share/couchdb/www/favicon.ico
 share/couchdb/www/image/add.png
 share/couchdb/www/image/apply.gif
@@ -268,9 +472,9 @@ 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/spinner_33.gif
 share/couchdb/www/image/spinner_6b.gif
+share/couchdb/www/image/spinner.gif
 share/couchdb/www/image/test_failure.gif
 share/couchdb/www/image/test_success.gif
 share/couchdb/www/image/thead-key.gif
@@ -279,11 +483,12 @@ share/couchdb/www/image/toggle-collapse.gif
 share/couchdb/www/image/toggle-expand.gif
 share/couchdb/www/image/twisty.gif
 share/couchdb/www/index.html
+share/couchdb/www/plugins.html
 share/couchdb/www/replicator.html
 share/couchdb/www/script/base64.js
-share/couchdb/www/script/couch.js
 share/couchdb/www/script/couch_test_runner.js
 share/couchdb/www/script/couch_tests.js
+share/couchdb/www/script/couch.js
 share/couchdb/www/script/futon.browse.js
 share/couchdb/www/script/futon.format.js
 share/couchdb/www/script/futon.js
@@ -308,13 +513,12 @@ share/couchdb/www/script/test/attachment_names.js
 share/couchdb/www/script/test/attachment_paths.js
 share/couchdb/www/script/test/attachment_ranges.js
 share/couchdb/www/script/test/attachment_views.js
-share/couchdb/www/script/test/attachments.js
 share/couchdb/www/script/test/attachments_multipart.js
+share/couchdb/www/script/test/attachments.js
 share/couchdb/www/script/test/auth_cache.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/coffee.js
 share/couchdb/www/script/test/compact.js
 share/couchdb/www/script/test/config.js
@@ -331,25 +535,26 @@ 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/changes.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/lorem.txt
 share/couchdb/www/script/test/lots_of_docs.js
 share/couchdb/www/script/test/method_override.js
 share/couchdb/www/script/test/multiple_rows.js
-share/couchdb/www/script/test/oauth.js
 share/couchdb/www/script/test/oauth_users_db.js
+share/couchdb/www/script/test/oauth.js
 share/couchdb/www/script/test/proxyauth.js
 share/couchdb/www/script/test/purge.js
 share/couchdb/www/script/test/reader_acl.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/reduce_false_temp.js
+share/couchdb/www/script/test/reduce_false.js
+share/couchdb/www/script/test/reduce.js
 share/couchdb/www/script/test/replication.js
 share/couchdb/www/script/test/replicator_db_bad_rep_id.js
 share/couchdb/www/script/test/replicator_db_by_doc_id.js
@@ -358,8 +563,8 @@ share/couchdb/www/script/test/replicator_db_continuous.js
 share/couchdb/www/script/test/replicator_db_credential_delegation.js
 share/couchdb/www/script/test/replicator_db_field_validation.js
 share/couchdb/www/script/test/replicator_db_filtered.js
-share/couchdb/www/script/test/replicator_db_identical.js
 share/couchdb/www/script/test/replicator_db_identical_continuous.js
+share/couchdb/www/script/test/replicator_db_identical.js
 share/couchdb/www/script/test/replicator_db_invalid_filter.js
 share/couchdb/www/script/test/replicator_db_security.js
 share/couchdb/www/script/test/replicator_db_simple.js
@@ -375,12 +580,12 @@ 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/users_db.js
 share/couchdb/www/script/test/users_db_security.js
+share/couchdb/www/script/test/users_db.js
 share/couchdb/www/script/test/utf8.js
 share/couchdb/www/script/test/uuids.js
-share/couchdb/www/script/test/view_collation.js
 share/couchdb/www/script/test/view_collation_raw.js
+share/couchdb/www/script/test/view_collation.js
 share/couchdb/www/script/test/view_compaction.js
 share/couchdb/www/script/test/view_conflicts.js
 share/couchdb/www/script/test/view_errors.js
@@ -392,7 +597,6 @@ share/couchdb/www/script/test/view_offsets.js
 share/couchdb/www/script/test/view_pagination.js
 share/couchdb/www/script/test/view_sandboxing.js
 share/couchdb/www/script/test/view_update_seq.js
-share/couchdb/www/script/test/view_xml.js
 share/couchdb/www/session.html
 share/couchdb/www/spec/couch_js_class_methods_spec.js
 share/couchdb/www/spec/couch_js_instance_methods_1_spec.js
@@ -412,9 +616,9 @@ share/doc/couchdb/AUTHORS.gz
 share/doc/couchdb/BUGS.gz
 share/doc/couchdb/CouchDB.pdf.gz
 share/doc/couchdb/DEVELOPERS.gz
+share/doc/couchdb/INSTALL.gz
 share/doc/couchdb/INSTALL.Unix.gz
 share/doc/couchdb/INSTALL.Windows.gz
-share/doc/couchdb/INSTALL.gz
 share/doc/couchdb/LICENSE.gz
 share/doc/couchdb/NOTICE.gz
 share/doc/couchdb/README.gz
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 97550628635..49701005633 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2013/09/09 13:39:10 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2014/01/02 17:10:22 fhajny Exp $
 
-SHA1 (apache-couchdb-1.4.0.tar.gz) = 28ef17c7036fe9133010d53d026eff38a1e308ba
-RMD160 (apache-couchdb-1.4.0.tar.gz) = 7276842985f3126bee711398dd9b7c837683183d
-Size (apache-couchdb-1.4.0.tar.gz) = 3422107 bytes
-SHA1 (patch-aa) = 9b3666dd90392304f43cbf6b42a1476d7956871c
+SHA1 (apache-couchdb-1.5.0.tar.gz) = 283e4bbd4f1727bb334a67d2f988a7d412523bef
+RMD160 (apache-couchdb-1.5.0.tar.gz) = 2290505dffd234a809441da61adde51bdd9f0f56
+Size (apache-couchdb-1.5.0.tar.gz) = 11594978 bytes
+SHA1 (patch-aa) = 2e3d48a1fc7650c04e640420155d2a68d5bbfaba
 SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
 SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872
-SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826
+SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92
 SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e
diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa
index 18082ec7081..105e2e55268 100644
--- a/databases/couchdb/patches/patch-aa
+++ b/databases/couchdb/patches/patch-aa
@@ -1,10 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2013/04/24 12:22:38 jperkin Exp $
+$NetBSD: patch-aa,v 1.6 2014/01/02 17:10:23 fhajny Exp $
 
 Set pkgsrc standard paths.
-
---- configure.orig	2013-03-30 14:46:50.000000000 +0000
+--- configure.orig	2013-10-20 09:38:47.000000000 +0000
 +++ configure
-@@ -646,6 +646,7 @@ localstatelogdir
+@@ -647,6 +647,7 @@ localstatelogdir
  localstatelibdir
  locallibdir
  localdocdir
@@ -12,7 +11,7 @@ Set pkgsrc standard paths.
  localdatadir
  localconfdir
  bug_uri
-@@ -18288,7 +18289,7 @@ fi
+@@ -18326,7 +18327,7 @@ fi
  done
  test -n "$CURL_CONFIG" || CURL_CONFIG="no"
  
@@ -21,7 +20,7 @@ Set pkgsrc standard paths.
  
        :
  
-@@ -18300,7 +18301,7 @@ $as_echo "$as_me: WARNING: You will be u
+@@ -18338,7 +18339,7 @@ $as_echo "$as_me: WARNING: You will be u
  
  else
  
@@ -30,7 +29,7 @@ Set pkgsrc standard paths.
  
  	CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`"
  
-@@ -18310,7 +18311,7 @@ else
+@@ -18348,7 +18349,7 @@ else
  
  fi
  
@@ -39,25 +38,26 @@ Set pkgsrc standard paths.
  
  	CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`"
  
-@@ -19116,13 +19117,15 @@ localdatadir=${datadir}/${package_identi
+@@ -19153,13 +19154,15 @@ localdatadir=${datadir}/${package_identi
  
  localdocdir=${datadir}/doc/${package_identifier}
  
-+localegdir=@EGDIR@
++localegdir=@COUCH_EGDIR@
 +
  locallibdir=${libdir}/${package_identifier}
  
 -localstatelibdir=${localstatedir}/lib/${package_identifier}
-+localstatelibdir=${localstatedir}/db/${package_identifier}
++localstatelibdir=@COUCH_DBDIR@
  
- localstatelogdir=${localstatedir}/log/${package_identifier}
+-localstatelogdir=${localstatedir}/log/${package_identifier}
++localstatelogdir=@COUCH_LOGDIR@
  
 -localstaterundir=${localstatedir}/run/${package_identifier}
-+localstaterundir=@RUNDIR@
++localstaterundir=@COUCH_RUNDIR@
  
+ erlangversion=${erlangversion}
  
- # On Windows we install directly into our erlang distribution.
-@@ -19132,9 +19135,9 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -19174,9 +19177,9 @@ if test x${IS_WINDOWS} = xTRUE; then
      localerlanglibdir=${libdir}
  
  else
diff --git a/databases/couchdb/patches/patch-ad b/databases/couchdb/patches/patch-ad
index 7a19c6e1d32..10a7c4676fd 100644
--- a/databases/couchdb/patches/patch-ad
+++ b/databases/couchdb/patches/patch-ad
@@ -1,15 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2011/07/27 19:20:57 fhajny Exp $
+$NetBSD: patch-ad,v 1.2 2014/01/02 17:10:23 fhajny Exp $
 
-Fix default PID file location in script.
-
---- bin/couchdb.tpl.in.orig	2010-06-25 18:50:03.000000000 +0000
+Set pkgsrc standard paths.
+--- bin/couchdb.tpl.in.orig	2013-10-20 09:38:19.000000000 +0000
 +++ bin/couchdb.tpl.in
-@@ -22,7 +22,7 @@ INTERACTIVE=false
- KILL=false
+@@ -28,7 +28,7 @@ KILL=false
+ PLUGINS_DIR=%locallibdir%/plugins
  LOCAL_CONFIG_DIR=%localconfdir%/local.d
  LOCAL_CONFIG_FILE=%localconfdir%/%localini%
 -PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
-+PID_FILE=@RUNDIR@/couchdb.pid
++PID_FILE=@COUCH_RUNDIR@/couchdb.pid
  RECURSED=false
  RESET_CONFIG=true
  RESPAWN_TIMEOUT=0