Update couchdb to 1.6.0.

- COUCHDB-2200: support Erlang/OTP 17.0 #35e16032
- Fauxton: many improvements in our experimental new user interface,
  including switching the code editor from CodeMirror to Ace as well
  as better support for various browsers.
- Add the max_count option (UUIDs Configuration) to allow rate-limiting
  the amount of UUIDs that can be requested from the /_uuids handler
  in a single request (CVE 2014-2668).
- COUCHDB-1986: increase socket buffer size to improve replication speed
  for large documents and attachments, and fix tests on BSD-like systems.
- COUCHDB-1953: improve performance of multipart/related requests.
- COUCHDB-2221: verify that authentication-related configuration settings
  are well-formed.
- COUCHDB-1922: fix CORS exposed headers.
- Rename proxy_authentification_handler to proxy_authentication_handler.
- COUCHDB-1795: ensure the startup script clears the pid file on termination.
- COUCHDB-1962: replication can now be performed without having write access
  to the source database, the replication checkpoint interval is now
  configurable.
- COUCHDB-2025: add support for SOCKS5 proxies for replication.
- COUCHDB-1930: redirect to the correct page after submitting a new document
  with a different ID than the one suggested by Futon.
- COUCHDB-1923: add support for attachments and att_encoding_info options
  (formerly only available on the documents API) to the view API.
- COUCHDB-1647: for failed replications originating from a document
  in the _replicator database, store the failure reason in the document.
- A number of improvements for the documentation.

3 files changed, 81 insertions, 73 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index a0733bcbbfe..e5981cb6af4 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/05/06 13:50:13 fhajny Exp $
+# $NetBSD: Makefile,v 1.27 2014/06/11 15:34:16 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.5.1
+DISTNAME=		apache-couchdb-1.6.0
 PKGNAME=		${DISTNAME:S/apache-//}
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST
index d6a10d7f81b..0721284a3e4 100644
--- a/databases/couchdb/PLIST
+++ b/databases/couchdb/PLIST
@@ -1,54 +1,22 @@
-@comment $NetBSD: PLIST,v 1.6 2014/01/02 17:10:22 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/06/11 15:34:16 fhajny Exp $
 bin/couch-config
 bin/couchdb
 bin/couchjs
 info/CouchDB
-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
+lib/erlang/lib/couch-${PKGVERSION}/ebin/couch.beam
 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_writer.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_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_db_update_notifier_sup.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
@@ -56,6 +24,7 @@ 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
@@ -66,8 +35,6 @@ 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
@@ -78,8 +45,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_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_stats_aggregator.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stats_collector.beam
 lib/erlang/lib/couch-${PKGVERSION}/ebin/couch_stream.beam
@@ -88,8 +55,6 @@ 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
@@ -97,6 +62,41 @@ 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-${VERSION.couch_index}/ebin/couch_index.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_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}/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}/include/couch_mrview.hrl
+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_plugins-${VERSION.couch_plugins}/ebin/couch_plugins_httpd.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}/ebin/couch_replicator_api_wrap.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_httpc_pool.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}/include/couch_replicator.hrl
+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/ejson-${VERSION.ejson}/ebin/ejson.app
 lib/erlang/lib/ejson-${VERSION.ejson}/ebin/ejson.beam
 lib/erlang/lib/ejson-${VERSION.ejson}/ebin/mochijson2.beam
@@ -105,17 +105,18 @@ 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_socks5.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_sup.beam
 lib/erlang/lib/ibrowse-${VERSION.ibrowse}/ebin/ibrowse_test.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.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
@@ -125,27 +126,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_server.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_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
@@ -161,6 +162,7 @@ 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
@@ -168,7 +170,6 @@ 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
@@ -206,9 +207,9 @@ 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/changes.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
@@ -300,6 +301,7 @@ 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/1.6.txt
 share/couchdb/www/docs/_sources/whatsnew/index.txt
 share/couchdb/www/docs/_static/ajax-loader.gif
 share/couchdb/www/docs/_static/basic.css
@@ -327,9 +329,9 @@ share/couchdb/www/docs/_static/websupport.js
 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/changes.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
@@ -428,16 +430,17 @@ 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/1.6.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/FontAwesome.otf
 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
@@ -448,6 +451,11 @@ 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/ace/mode-javascript.js
+share/couchdb/www/fauxton/js/ace/mode-json.js
+share/couchdb/www/fauxton/js/ace/theme-crimson_editor.js
+share/couchdb/www/fauxton/js/ace/worker-javascript.js
+share/couchdb/www/fauxton/js/ace/worker-json.js
 share/couchdb/www/fauxton/js/require.js
 share/couchdb/www/favicon.ico
 share/couchdb/www/image/add.png
@@ -472,9 +480,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
@@ -486,9 +494,9 @@ 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
@@ -513,12 +521,13 @@ 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_multipart.js
 share/couchdb/www/script/test/attachments.js
+share/couchdb/www/script/test/attachments_multipart.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
@@ -535,26 +544,25 @@ 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_b64.txt
 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/method_override.js
 share/couchdb/www/script/test/multiple_rows.js
-share/couchdb/www/script/test/oauth_users_db.js
 share/couchdb/www/script/test/oauth.js
+share/couchdb/www/script/test/oauth_users_db.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_temp.js
 share/couchdb/www/script/test/reduce_false.js
-share/couchdb/www/script/test/reduce.js
+share/couchdb/www/script/test/reduce_false_temp.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
@@ -563,8 +571,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_continuous.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_invalid_filter.js
 share/couchdb/www/script/test/replicator_db_security.js
 share/couchdb/www/script/test/replicator_db_simple.js
@@ -580,12 +588,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_security.js
 share/couchdb/www/script/test/users_db.js
+share/couchdb/www/script/test/users_db_security.js
 share/couchdb/www/script/test/utf8.js
 share/couchdb/www/script/test/uuids.js
-share/couchdb/www/script/test/view_collation_raw.js
 share/couchdb/www/script/test/view_collation.js
+share/couchdb/www/script/test/view_collation_raw.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
@@ -616,9 +624,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 aac0d97ed31..01ac33195ac 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2014/05/06 13:50:13 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2014/06/11 15:34:16 fhajny Exp $
 
-SHA1 (apache-couchdb-1.5.1.tar.gz) = 5340c79f8f9e11742b723f92e2251d4d59b8247c
-RMD160 (apache-couchdb-1.5.1.tar.gz) = 98b26123c05ddaade3f06d45dab5137c35e3e12b
-Size (apache-couchdb-1.5.1.tar.gz) = 11601057 bytes
+SHA1 (apache-couchdb-1.6.0.tar.gz) = 62f99077c201ad632c1cd144fcaf6f10fa5949ed
+RMD160 (apache-couchdb-1.6.0.tar.gz) = fb53e023ae612c7998818c50d04626a0c38ea995
+Size (apache-couchdb-1.6.0.tar.gz) = 12095192 bytes
 SHA1 (patch-aa) = 2e3d48a1fc7650c04e640420155d2a68d5bbfaba
 SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
 SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872