CVS commit: pkgsrc/databases/couchdb

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Tue Nov  7 15:33:27 UTC 2017

Modified Files:
        pkgsrc/databases/couchdb: Makefile PLIST distinfo
        pkgsrc/databases/couchdb/patches: patch-aa
            patch-rel_overlay_bin_couchdb patch-rel_overlay_etc_default.ini

Log Message:
Update databases/couchdb to 2.1.1.

couchdb 2.1.1
- CouchDB now supports compilation and running under Erlang/OTP 20.x
- The couch_peruser functionality is now really fixed
- The cookie domain for AuthSession cookies, used in a proxy
  authentication configuration, can now be customized via the ini file
- It is now possible to modify shard maps for system databases
- Due to an Erlang bug (ERL-343), invalid paths can be returned if
  volumes are mounted containing whitespace in their name (fixed)
- The current node's local interface can now be accessed at
  /_node/_local/{endpoint} as well as at
  /_node/<nodename>@<hostname>/{endpoint}.- The Dockerfile in the source
  repository has been retired
- Fauxton now uses a version of React with a BSD license.
- CouchDB now no longer decompresses documents just to determine their
  uncompressed size
- The design document cache (ddoc_cache) has been rewritten to improve
  performance
- Mango now supports partial indexes
- Mango queries can now be paginated
- Mango _find accepts an execution_stats parameter
- Mango now requires that all of the fields in a candidate index must
  exist in a query's selector
- Other minor improvements.

couchdb 2.1.0
- The Mango _find endpoint supports a new combination operator,
  $allMatch.
- New scheduling replicator.
- Other minor improvements.

See changelog for the 2.1.x branch for more:

  http://docs.couchdb.org/en/latest/whatsnew/2.1.html


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/databases/couchdb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/couchdb/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/couchdb/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/couchdb/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb \
    pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/couchdb/Makefile
diff -u pkgsrc/databases/couchdb/Makefile:1.43 pkgsrc/databases/couchdb/Makefile:1.44
--- pkgsrc/databases/couchdb/Makefile:1.43      Mon Sep 18 09:53:13 2017
+++ pkgsrc/databases/couchdb/Makefile   Tue Nov  7 15:33:27 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2017/09/18 09:53:13 maya Exp $
+# $NetBSD: Makefile,v 1.44 2017/11/07 15:33:27 fhajny Exp $
 #
 
-DISTNAME=              apache-couchdb-2.0.0
+DISTNAME=              apache-couchdb-2.1.1
 PKGNAME=               ${DISTNAME:S/apache-//}
-PKGREVISION=           6
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
 
@@ -14,9 +13,8 @@ LICENSE=              apache-2.0
 
 HAS_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            gmake install-info pax pkg-config
+USE_TOOLS+=            gmake pax pkg-config
 USE_LIBTOOL=           yes
-INFO_FILES=            yes
 BUILD_DEFS+=           VARBASE
 
 BUILD_DEPENDS+=                help2man-[0-9]*:../../converters/help2man
@@ -66,6 +64,8 @@ SUBST_FILES.paths+=   rel/overlay/etc/defa
 SUBST_FILES.paths+=    src/config/src/config_app.erl
 SUBST_VARS.paths=      COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR PREFIX PKG_SYSCONFDIR
 
+CHECK_PORTABILITY_SKIP+=       build-aux/print-committerlist.sh
+
 CONFIGURE_ARGS+=       --rebar\ ${PREFIX}/bin/rebar
 CONFIGURE_ARGS+=       --user\ ${COUCH_USER}
 CONFIGURE_ARGS+=       --skip-deps
@@ -75,8 +75,8 @@ BUILD_TARGET=         release
 
 INSTALLATION_DIRS+=    bin couchdb/lib
 INSTALLATION_DIRS+=    couchdb/share/server couchdb/share/www/docs
-INSTALLATION_DIRS+=    ${PKGINFODIR} ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    share/doc/couchdb share/examples/couchdb
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    share/examples/couchdb
 
 RCD_SCRIPTS+=          couchdb
 
@@ -88,6 +88,9 @@ GENERATE_PLIST=               cd ${DESTDIR}${PREFIX};
                                couchdb/erts-* couchdb/lib                      \
                                \( -type f -o -type l \) -print |               \
                                ${SORT} -u;
+# Ignore dynamically generated parts when doing print-PLIST
+PRINT_PLIST_AWK+=      /^couchdb\/erts-/ { next; }
+PRINT_PLIST_AWK+=      /^couchdb\/lib\// { next; }
 
 # We need to know the version of erts and subst it inside the SMF manifest
 .include "../../lang/erlang/Makefile.versions"
@@ -100,12 +103,8 @@ do-install:
                ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/rel/couchdb/bin/couchjs                    \
                ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_INFO} ${WRKSRC}/rel/couchdb/share/docs/CouchDB.info           \
-               ${DESTDIR}${PREFIX}/${PKGINFODIR}/CouchDB.info
        ${INSTALL_MAN} ${WRKSRC}/rel/couchdb/share/docs/couchdb.1               \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA} ${WRKSRC}/share/docs/pdf/CouchDB.pdf                    \
-               ${DESTDIR}${PREFIX}/share/doc/couchdb
        cd ${WRKSRC}/rel/couchdb/share && ${PAX} -rw -pp server www             \
                ${DESTDIR}${PREFIX}/couchdb/share
        cd ${WRKSRC}/rel/couchdb/etc && ${PAX} -rw -pp *.ini vm.args            \

Index: pkgsrc/databases/couchdb/PLIST
diff -u pkgsrc/databases/couchdb/PLIST:1.8 pkgsrc/databases/couchdb/PLIST:1.9
--- pkgsrc/databases/couchdb/PLIST:1.8  Wed Nov 16 15:59:29 2016
+++ pkgsrc/databases/couchdb/PLIST      Tue Nov  7 15:33:27 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/11/16 15:59:29 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/11/07 15:33:27 fhajny Exp $
 bin/couchdb
 bin/couchjs
 couchdb/releases/${PKGVERSION}/couchdb.boot
@@ -11,9 +11,9 @@ couchdb/releases/${PKGVERSION}/sys.confi
 couchdb/releases/${PKGVERSION}/vm.args
 couchdb/releases/RELEASES
 couchdb/releases/start_erl.data
-couchdb/share/server/coffee-script.js
+couchdb/share/server/main-coffee.js
 couchdb/share/server/main.js
-couchdb/share/www/dashboard.assets/ZeroClipboard.swf
+couchdb/share/www/dashboard.assets/css/styles.25bdeac6d2ce92b30461.css
 couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.eot
 couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.ttf
 couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.woff
@@ -31,7 +31,9 @@ couchdb/share/www/dashboard.assets/img/g
 couchdb/share/www/dashboard.assets/img/linkedin.png
 couchdb/share/www/dashboard.assets/img/loader.gif
 couchdb/share/www/dashboard.assets/img/twitter.png
-couchdb/share/www/dashboard.assets/js/bundle-b8e0ba71119195edb7ec64b98f53d9b9.js
+couchdb/share/www/dashboard.assets/js/bundle.25bdeac6d2ce92b30461.js
+couchdb/share/www/dashboard.assets/js/manifest.9900c5a8eb329caf2817.js
+couchdb/share/www/dashboard.assets/js/vendor.884175873da25bb4e526.js
 couchdb/share/www/docs/_images/intro-consistency-01.png
 couchdb/share/www/docs/_images/intro-consistency-02.png
 couchdb/share/www/docs/_images/intro-consistency-03.png
@@ -42,135 +44,157 @@ couchdb/share/www/docs/_images/intro-con
 couchdb/share/www/docs/_images/intro-why-01.png
 couchdb/share/www/docs/_images/intro-why-02.png
 couchdb/share/www/docs/_images/intro-why-03.png
+couchdb/share/www/docs/_images/replication-state-diagram.svg
 couchdb/share/www/docs/_images/views-intro-01.png
 couchdb/share/www/docs/_images/views-intro-02.png
 couchdb/share/www/docs/_images/views-intro-03.png
 couchdb/share/www/docs/_images/views-intro-04.png
-couchdb/share/www/docs/_sources/about.txt
-couchdb/share/www/docs/_sources/api/basics.txt
-couchdb/share/www/docs/_sources/api/database/bulk-api.txt
-couchdb/share/www/docs/_sources/api/database/changes.txt
-couchdb/share/www/docs/_sources/api/database/common.txt
-couchdb/share/www/docs/_sources/api/database/compact.txt
-couchdb/share/www/docs/_sources/api/database/find.txt
-couchdb/share/www/docs/_sources/api/database/index.txt
-couchdb/share/www/docs/_sources/api/database/misc.txt
-couchdb/share/www/docs/_sources/api/database/security.txt
-couchdb/share/www/docs/_sources/api/ddoc/common.txt
-couchdb/share/www/docs/_sources/api/ddoc/index.txt
-couchdb/share/www/docs/_sources/api/ddoc/render.txt
-couchdb/share/www/docs/_sources/api/ddoc/rewrites.txt
-couchdb/share/www/docs/_sources/api/ddoc/views.txt
-couchdb/share/www/docs/_sources/api/document/attachments.txt
-couchdb/share/www/docs/_sources/api/document/common.txt
-couchdb/share/www/docs/_sources/api/document/index.txt
-couchdb/share/www/docs/_sources/api/index.txt
-couchdb/share/www/docs/_sources/api/local.txt
-couchdb/share/www/docs/_sources/api/server/authn.txt
-couchdb/share/www/docs/_sources/api/server/common.txt
-couchdb/share/www/docs/_sources/api/server/configuration.txt
-couchdb/share/www/docs/_sources/api/server/index.txt
-couchdb/share/www/docs/_sources/cluster/databases.txt
-couchdb/share/www/docs/_sources/cluster/index.txt
-couchdb/share/www/docs/_sources/cluster/nodes.txt
-couchdb/share/www/docs/_sources/cluster/setup.txt
-couchdb/share/www/docs/_sources/cluster/sharding.txt
-couchdb/share/www/docs/_sources/cluster/theory.txt
-couchdb/share/www/docs/_sources/config/auth.txt
-couchdb/share/www/docs/_sources/config/compaction.txt
-couchdb/share/www/docs/_sources/config/couch-peruser.txt
-couchdb/share/www/docs/_sources/config/couchdb.txt
-couchdb/share/www/docs/_sources/config/externals.txt
-couchdb/share/www/docs/_sources/config/http-handlers.txt
-couchdb/share/www/docs/_sources/config/http.txt
-couchdb/share/www/docs/_sources/config/index.txt
-couchdb/share/www/docs/_sources/config/intro.txt
-couchdb/share/www/docs/_sources/config/logging.txt
-couchdb/share/www/docs/_sources/config/misc.txt
-couchdb/share/www/docs/_sources/config/proxying.txt
-couchdb/share/www/docs/_sources/config/query-servers.txt
-couchdb/share/www/docs/_sources/config/replicator.txt
-couchdb/share/www/docs/_sources/config/services.txt
-couchdb/share/www/docs/_sources/contents.txt
-couchdb/share/www/docs/_sources/contributing.txt
-couchdb/share/www/docs/_sources/couchapp/ddocs.txt
-couchdb/share/www/docs/_sources/couchapp/index.txt
-couchdb/share/www/docs/_sources/couchapp/views/collation.txt
-couchdb/share/www/docs/_sources/couchapp/views/index.txt
-couchdb/share/www/docs/_sources/couchapp/views/intro.txt
-couchdb/share/www/docs/_sources/couchapp/views/joins.txt
-couchdb/share/www/docs/_sources/couchapp/views/nosql.txt
-couchdb/share/www/docs/_sources/couchapp/views/pagination.txt
-couchdb/share/www/docs/_sources/cve/2010-0009.txt
-couchdb/share/www/docs/_sources/cve/2010-2234.txt
-couchdb/share/www/docs/_sources/cve/2010-3854.txt
-couchdb/share/www/docs/_sources/cve/2012-5641.txt
-couchdb/share/www/docs/_sources/cve/2012-5649.txt
-couchdb/share/www/docs/_sources/cve/2012-5650.txt
-couchdb/share/www/docs/_sources/cve/2014-2668.txt
-couchdb/share/www/docs/_sources/cve/index.txt
-couchdb/share/www/docs/_sources/experimental.txt
-couchdb/share/www/docs/_sources/externals.txt
-couchdb/share/www/docs/_sources/fauxton/addons.txt
-couchdb/share/www/docs/_sources/fauxton/index.txt
-couchdb/share/www/docs/_sources/fauxton/install.txt
-couchdb/share/www/docs/_sources/install/freebsd.txt
-couchdb/share/www/docs/_sources/install/index.txt
-couchdb/share/www/docs/_sources/install/mac.txt
-couchdb/share/www/docs/_sources/install/troubleshooting.txt
-couchdb/share/www/docs/_sources/install/unix.txt
-couchdb/share/www/docs/_sources/install/windows.txt
-couchdb/share/www/docs/_sources/intro/api.txt
-couchdb/share/www/docs/_sources/intro/consistency.txt
-couchdb/share/www/docs/_sources/intro/curl.txt
-couchdb/share/www/docs/_sources/intro/index.txt
-couchdb/share/www/docs/_sources/intro/overview.txt
-couchdb/share/www/docs/_sources/intro/security.txt
-couchdb/share/www/docs/_sources/intro/tour.txt
-couchdb/share/www/docs/_sources/intro/why.txt
-couchdb/share/www/docs/_sources/json-structure.txt
-couchdb/share/www/docs/_sources/maintenance/compaction.txt
-couchdb/share/www/docs/_sources/maintenance/index.txt
-couchdb/share/www/docs/_sources/maintenance/performance.txt
-couchdb/share/www/docs/_sources/query-server/erlang.txt
-couchdb/share/www/docs/_sources/query-server/index.txt
-couchdb/share/www/docs/_sources/query-server/javascript.txt
-couchdb/share/www/docs/_sources/query-server/protocol.txt
-couchdb/share/www/docs/_sources/replication/conflicts.txt
-couchdb/share/www/docs/_sources/replication/index.txt
-couchdb/share/www/docs/_sources/replication/intro.txt
-couchdb/share/www/docs/_sources/replication/protocol.txt
-couchdb/share/www/docs/_sources/replication/replicator.txt
-couchdb/share/www/docs/_sources/whatsnew/0.10.txt
-couchdb/share/www/docs/_sources/whatsnew/0.11.txt
-couchdb/share/www/docs/_sources/whatsnew/0.8.txt
-couchdb/share/www/docs/_sources/whatsnew/0.9.txt
-couchdb/share/www/docs/_sources/whatsnew/1.0.txt
-couchdb/share/www/docs/_sources/whatsnew/1.1.txt
-couchdb/share/www/docs/_sources/whatsnew/1.2.txt
-couchdb/share/www/docs/_sources/whatsnew/1.3.txt
-couchdb/share/www/docs/_sources/whatsnew/1.4.txt
-couchdb/share/www/docs/_sources/whatsnew/1.5.txt
-couchdb/share/www/docs/_sources/whatsnew/1.6.txt
-couchdb/share/www/docs/_sources/whatsnew/2.0.txt
-couchdb/share/www/docs/_sources/whatsnew/index.txt
+couchdb/share/www/docs/_sources/about.rst.txt
+couchdb/share/www/docs/_sources/api/basics.rst.txt
+couchdb/share/www/docs/_sources/api/database/bulk-api.rst.txt
+couchdb/share/www/docs/_sources/api/database/changes.rst.txt
+couchdb/share/www/docs/_sources/api/database/common.rst.txt
+couchdb/share/www/docs/_sources/api/database/compact.rst.txt
+couchdb/share/www/docs/_sources/api/database/find.rst.txt
+couchdb/share/www/docs/_sources/api/database/index.rst.txt
+couchdb/share/www/docs/_sources/api/database/misc.rst.txt
+couchdb/share/www/docs/_sources/api/database/security.rst.txt
+couchdb/share/www/docs/_sources/api/ddoc/common.rst.txt
+couchdb/share/www/docs/_sources/api/ddoc/index.rst.txt
+couchdb/share/www/docs/_sources/api/ddoc/render.rst.txt
+couchdb/share/www/docs/_sources/api/ddoc/rewrites.rst.txt
+couchdb/share/www/docs/_sources/api/ddoc/views.rst.txt
+couchdb/share/www/docs/_sources/api/document/attachments.rst.txt
+couchdb/share/www/docs/_sources/api/document/common.rst.txt
+couchdb/share/www/docs/_sources/api/document/index.rst.txt
+couchdb/share/www/docs/_sources/api/index.rst.txt
+couchdb/share/www/docs/_sources/api/local.rst.txt
+couchdb/share/www/docs/_sources/api/server/authn.rst.txt
+couchdb/share/www/docs/_sources/api/server/common.rst.txt
+couchdb/share/www/docs/_sources/api/server/configuration.rst.txt
+couchdb/share/www/docs/_sources/api/server/index.rst.txt
+couchdb/share/www/docs/_sources/cluster/databases.rst.txt
+couchdb/share/www/docs/_sources/cluster/index.rst.txt
+couchdb/share/www/docs/_sources/cluster/nodes.rst.txt
+couchdb/share/www/docs/_sources/cluster/setup.rst.txt
+couchdb/share/www/docs/_sources/cluster/sharding.rst.txt
+couchdb/share/www/docs/_sources/cluster/theory.rst.txt
+couchdb/share/www/docs/_sources/config/auth.rst.txt
+couchdb/share/www/docs/_sources/config/cluster.rst.txt
+couchdb/share/www/docs/_sources/config/compaction.rst.txt
+couchdb/share/www/docs/_sources/config/couch-peruser.rst.txt
+couchdb/share/www/docs/_sources/config/couchdb.rst.txt
+couchdb/share/www/docs/_sources/config/externals.rst.txt
+couchdb/share/www/docs/_sources/config/http-handlers.rst.txt
+couchdb/share/www/docs/_sources/config/http.rst.txt
+couchdb/share/www/docs/_sources/config/index.rst.txt
+couchdb/share/www/docs/_sources/config/intro.rst.txt
+couchdb/share/www/docs/_sources/config/logging.rst.txt
+couchdb/share/www/docs/_sources/config/misc.rst.txt
+couchdb/share/www/docs/_sources/config/proxying.rst.txt
+couchdb/share/www/docs/_sources/config/query-servers.rst.txt
+couchdb/share/www/docs/_sources/config/replicator.rst.txt
+couchdb/share/www/docs/_sources/config/services.rst.txt
+couchdb/share/www/docs/_sources/contributing.rst.txt
+couchdb/share/www/docs/_sources/cve/2010-0009.rst.txt
+couchdb/share/www/docs/_sources/cve/2010-2234.rst.txt
+couchdb/share/www/docs/_sources/cve/2010-3854.rst.txt
+couchdb/share/www/docs/_sources/cve/2012-5641.rst.txt
+couchdb/share/www/docs/_sources/cve/2012-5649.rst.txt
+couchdb/share/www/docs/_sources/cve/2012-5650.rst.txt
+couchdb/share/www/docs/_sources/cve/2014-2668.rst.txt
+couchdb/share/www/docs/_sources/cve/index.rst.txt
+couchdb/share/www/docs/_sources/ddocs/ddocs.rst.txt
+couchdb/share/www/docs/_sources/ddocs/index.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/collation.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/index.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/intro.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/joins.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/nosql.rst.txt
+couchdb/share/www/docs/_sources/ddocs/views/pagination.rst.txt
+couchdb/share/www/docs/_sources/experimental.rst.txt
+couchdb/share/www/docs/_sources/externals.rst.txt
+couchdb/share/www/docs/_sources/fauxton/index.rst.txt
+couchdb/share/www/docs/_sources/fauxton/install.rst.txt
+couchdb/share/www/docs/_sources/index.rst.txt
+couchdb/share/www/docs/_sources/install/docker.rst.txt
+couchdb/share/www/docs/_sources/install/freebsd.rst.txt
+couchdb/share/www/docs/_sources/install/index.rst.txt
+couchdb/share/www/docs/_sources/install/mac.rst.txt
+couchdb/share/www/docs/_sources/install/setup.rst.txt
+couchdb/share/www/docs/_sources/install/snap.rst.txt
+couchdb/share/www/docs/_sources/install/troubleshooting.rst.txt
+couchdb/share/www/docs/_sources/install/unix.rst.txt
+couchdb/share/www/docs/_sources/install/upgrading.rst.txt
+couchdb/share/www/docs/_sources/install/windows.rst.txt
+couchdb/share/www/docs/_sources/intro/api.rst.txt
+couchdb/share/www/docs/_sources/intro/consistency.rst.txt
+couchdb/share/www/docs/_sources/intro/curl.rst.txt
+couchdb/share/www/docs/_sources/intro/index.rst.txt
+couchdb/share/www/docs/_sources/intro/overview.rst.txt
+couchdb/share/www/docs/_sources/intro/security.rst.txt
+couchdb/share/www/docs/_sources/intro/tour.rst.txt
+couchdb/share/www/docs/_sources/intro/why.rst.txt
+couchdb/share/www/docs/_sources/json-structure.rst.txt
+couchdb/share/www/docs/_sources/maintenance/compaction.rst.txt
+couchdb/share/www/docs/_sources/maintenance/index.rst.txt
+couchdb/share/www/docs/_sources/maintenance/performance.rst.txt
+couchdb/share/www/docs/_sources/query-server/erlang.rst.txt
+couchdb/share/www/docs/_sources/query-server/index.rst.txt
+couchdb/share/www/docs/_sources/query-server/javascript.rst.txt
+couchdb/share/www/docs/_sources/query-server/protocol.rst.txt
+couchdb/share/www/docs/_sources/replication/conflicts.rst.txt
+couchdb/share/www/docs/_sources/replication/index.rst.txt
+couchdb/share/www/docs/_sources/replication/intro.rst.txt
+couchdb/share/www/docs/_sources/replication/protocol.rst.txt
+couchdb/share/www/docs/_sources/replication/replicator.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/0.10.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/0.11.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/0.8.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/0.9.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.0.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.1.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.2.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.3.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.4.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.5.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/1.6.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/2.0.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/2.1.rst.txt
+couchdb/share/www/docs/_sources/whatsnew/index.rst.txt
 couchdb/share/www/docs/_static/ajax-loader.gif
 couchdb/share/www/docs/_static/basic.css
 couchdb/share/www/docs/_static/comment-bright.png
 couchdb/share/www/docs/_static/comment-close.png
 couchdb/share/www/docs/_static/comment.png
+couchdb/share/www/docs/_static/css/badge_only.css
+couchdb/share/www/docs/_static/css/rtd_theme.css
+couchdb/share/www/docs/_static/css/theme.css
 couchdb/share/www/docs/_static/doctools.js
 couchdb/share/www/docs/_static/down-pressed.png
 couchdb/share/www/docs/_static/down.png
 couchdb/share/www/docs/_static/favicon.ico
 couchdb/share/www/docs/_static/file.png
+couchdb/share/www/docs/_static/fonts/Inconsolata-Bold.ttf
+couchdb/share/www/docs/_static/fonts/Inconsolata-Regular.ttf
+couchdb/share/www/docs/_static/fonts/Lato-Bold.ttf
+couchdb/share/www/docs/_static/fonts/Lato-Regular.ttf
+couchdb/share/www/docs/_static/fonts/RobotoSlab-Bold.ttf
+couchdb/share/www/docs/_static/fonts/RobotoSlab-Regular.ttf
+couchdb/share/www/docs/_static/fonts/fontawesome-webfont.eot
+couchdb/share/www/docs/_static/fonts/fontawesome-webfont.svg
+couchdb/share/www/docs/_static/fonts/fontawesome-webfont.ttf
+couchdb/share/www/docs/_static/fonts/fontawesome-webfont.woff
+couchdb/share/www/docs/_static/jquery-3.1.0.js
 couchdb/share/www/docs/_static/jquery.js
+couchdb/share/www/docs/_static/js/modernizr.min.js
+couchdb/share/www/docs/_static/js/theme.js
 couchdb/share/www/docs/_static/logo.png
 couchdb/share/www/docs/_static/minus.png
 couchdb/share/www/docs/_static/plus.png
 couchdb/share/www/docs/_static/pygments.css
-couchdb/share/www/docs/_static/rtd.css
 couchdb/share/www/docs/_static/searchtools.js
+couchdb/share/www/docs/_static/underscore-1.3.1.js
 couchdb/share/www/docs/_static/underscore.js
 couchdb/share/www/docs/_static/up-pressed.png
 couchdb/share/www/docs/_static/up.png
@@ -207,6 +231,7 @@ couchdb/share/www/docs/cluster/sharding.
 couchdb/share/www/docs/cluster/theory.html
 couchdb/share/www/docs/config-ref.html
 couchdb/share/www/docs/config/auth.html
+couchdb/share/www/docs/config/cluster.html
 couchdb/share/www/docs/config/compaction.html
 couchdb/share/www/docs/config/couch-peruser.html
 couchdb/share/www/docs/config/couchdb.html
@@ -221,16 +246,7 @@ couchdb/share/www/docs/config/proxying.h
 couchdb/share/www/docs/config/query-servers.html
 couchdb/share/www/docs/config/replicator.html
 couchdb/share/www/docs/config/services.html
-couchdb/share/www/docs/contents.html
 couchdb/share/www/docs/contributing.html
-couchdb/share/www/docs/couchapp/ddocs.html
-couchdb/share/www/docs/couchapp/index.html
-couchdb/share/www/docs/couchapp/views/collation.html
-couchdb/share/www/docs/couchapp/views/index.html
-couchdb/share/www/docs/couchapp/views/intro.html
-couchdb/share/www/docs/couchapp/views/joins.html
-couchdb/share/www/docs/couchapp/views/nosql.html
-couchdb/share/www/docs/couchapp/views/pagination.html
 couchdb/share/www/docs/cve/2010-0009.html
 couchdb/share/www/docs/cve/2010-2234.html
 couchdb/share/www/docs/cve/2010-3854.html
@@ -239,19 +255,30 @@ couchdb/share/www/docs/cve/2012-5649.htm
 couchdb/share/www/docs/cve/2012-5650.html
 couchdb/share/www/docs/cve/2014-2668.html
 couchdb/share/www/docs/cve/index.html
+couchdb/share/www/docs/ddocs/ddocs.html
+couchdb/share/www/docs/ddocs/index.html
+couchdb/share/www/docs/ddocs/views/collation.html
+couchdb/share/www/docs/ddocs/views/index.html
+couchdb/share/www/docs/ddocs/views/intro.html
+couchdb/share/www/docs/ddocs/views/joins.html
+couchdb/share/www/docs/ddocs/views/nosql.html
+couchdb/share/www/docs/ddocs/views/pagination.html
 couchdb/share/www/docs/download.html
 couchdb/share/www/docs/experimental.html
 couchdb/share/www/docs/externals.html
-couchdb/share/www/docs/fauxton/addons.html
 couchdb/share/www/docs/fauxton/index.html
 couchdb/share/www/docs/fauxton/install.html
 couchdb/share/www/docs/http-api.html
 couchdb/share/www/docs/index.html
+couchdb/share/www/docs/install/docker.html
 couchdb/share/www/docs/install/freebsd.html
 couchdb/share/www/docs/install/index.html
 couchdb/share/www/docs/install/mac.html
+couchdb/share/www/docs/install/setup.html
+couchdb/share/www/docs/install/snap.html
 couchdb/share/www/docs/install/troubleshooting.html
 couchdb/share/www/docs/install/unix.html
+couchdb/share/www/docs/install/upgrading.html
 couchdb/share/www/docs/install/windows.html
 couchdb/share/www/docs/intro/api.html
 couchdb/share/www/docs/intro/consistency.html
@@ -289,11 +316,11 @@ couchdb/share/www/docs/whatsnew/1.4.html
 couchdb/share/www/docs/whatsnew/1.5.html
 couchdb/share/www/docs/whatsnew/1.6.html
 couchdb/share/www/docs/whatsnew/2.0.html
+couchdb/share/www/docs/whatsnew/2.1.html
 couchdb/share/www/docs/whatsnew/index.html
 couchdb/share/www/index.html
-info/CouchDB.info
 man/man1/couchdb.1
-share/doc/couchdb/CouchDB.pdf
 share/examples/couchdb/default.ini
 share/examples/couchdb/local.ini
 share/examples/couchdb/vm.args
+@pkgdir couchdb/erts-${VERSION.erts}/man

Index: pkgsrc/databases/couchdb/distinfo
diff -u pkgsrc/databases/couchdb/distinfo:1.15 pkgsrc/databases/couchdb/distinfo:1.16
--- pkgsrc/databases/couchdb/distinfo:1.15      Wed Nov 16 15:59:29 2016
+++ pkgsrc/databases/couchdb/distinfo   Tue Nov  7 15:33:27 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2016/11/16 15:59:29 fhajny Exp $
+$NetBSD: distinfo,v 1.16 2017/11/07 15:33:27 fhajny Exp $
 
-SHA1 (apache-couchdb-2.0.0.tar.gz) = ea59ff4be4550acdf5fd75e4b83d3e67dea38fd9
-RMD160 (apache-couchdb-2.0.0.tar.gz) = 7229c189e342a505e032f61d5f35c82d007ac545
-SHA512 (apache-couchdb-2.0.0.tar.gz) = a22b50823be9b71dcc10d130ce378aa2af9f27d21d27fb5bfc71ecf6501cbc1cfe49d5b258fd21776c9d8ffb5ba95ddebc1c8bde46ab66044cd5e7252599d9aa
-Size (apache-couchdb-2.0.0.tar.gz) = 13494157 bytes
-SHA1 (patch-aa) = f3e0451e68cfc6ab9ba7eef94680d1481a013ff4
-SHA1 (patch-rel_overlay_bin_couchdb) = 4c0c88bee25cd8c539bf4e61d4fbaf684c77176e
-SHA1 (patch-rel_overlay_etc_default.ini) = 628a8b506cd578afaa31c65bf03171cc3f5b0c81
+SHA1 (apache-couchdb-2.1.1.tar.gz) = 794db4292b4772bdb9f199d906a368b8ff7499f3
+RMD160 (apache-couchdb-2.1.1.tar.gz) = 99e47849d631d9e3f9ae7e65f1af31ebc2c6263f
+SHA512 (apache-couchdb-2.1.1.tar.gz) = 01fc71a85455e72319004cc9bf4afc66d03293ed465719598b040291e3f7f80ed93f612076ce76b961046ebeca437289c5399ecbe267b1dc0301ecb622a7bc26
+Size (apache-couchdb-2.1.1.tar.gz) = 12132981 bytes
+SHA1 (patch-aa) = 0c6531bb466ca2ee96a9fc2a6bc11e2e80ca3027
+SHA1 (patch-rel_overlay_bin_couchdb) = 51106f746b5ecedf27b1f607ec9a8b8dfe4518c9
+SHA1 (patch-rel_overlay_etc_default.ini) = 9df3705739753733f4e42779acff7d2c874996f8
 SHA1 (patch-src_config_src_config__app.erl) = 6c0be4a23c47973234ede0435fe4573a620fae6f
 SHA1 (patch-src_couch_rebar.config.script) = d68ffff8e0d368e8f071293b9bcb5525acc2b30f

Index: pkgsrc/databases/couchdb/patches/patch-aa
diff -u pkgsrc/databases/couchdb/patches/patch-aa:1.9 pkgsrc/databases/couchdb/patches/patch-aa:1.10
--- pkgsrc/databases/couchdb/patches/patch-aa:1.9       Wed Nov 16 15:59:29 2016
+++ pkgsrc/databases/couchdb/patches/patch-aa   Tue Nov  7 15:33:27 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.9 2016/11/16 15:59:29 fhajny Exp $
+$NetBSD: patch-aa,v 1.10 2017/11/07 15:33:27 fhajny Exp $
 
 Set pkgsrc standard paths. Portability.
 
---- configure.orig     2016-09-12 09:34:26.000000000 +0000
+--- configure.orig     2017-11-01 02:52:10.000000000 +0000
 +++ configure
-@@ -82,7 +82,7 @@ parse_opts() {
+@@ -85,7 +85,7 @@ parse_opts() {
  
              --rebar)
                  if [ -x "$2" ]; then
@@ -13,7 +13,7 @@ Set pkgsrc standard paths. Portability.
                      if [ $? -ne 0 ]; then
                          printf 'Rebar >=2.6.0 and <3.0.0 required' >&2
                          exit 1
-@@ -147,11 +147,11 @@ cat > rel/couchdb.config << EOF
+@@ -150,11 +150,11 @@ cat > rel/couchdb.config << EOF
  % The contents of this file are auto-generated by configure
  %
  {package_author_name, "$PACKAGE_AUTHOR_NAME"}.
@@ -28,5 +28,5 @@ Set pkgsrc standard paths. Portability.
 +{log_file, "@COUCH_LOGDIR@/couch.log"}.
 +{fauxton_root, "@PREFIX@/couchdb/share/www"}.
  {user, "$COUCHDB_USER"}.
- {node_name, "-name couchdb@localhost"}.
+ {node_name, "-name couchdb@127.0.0.1"}.
  {cluster_port, 5984}.

Index: pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb
diff -u pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb:1.1 pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb:1.2
--- pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb:1.1  Wed Nov 16 15:59:29 2016
+++ pkgsrc/databases/couchdb/patches/patch-rel_overlay_bin_couchdb      Tue Nov  7 15:33:27 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-rel_overlay_bin_couchdb,v 1.1 2016/11/16 15:59:29 fhajny Exp $
+$NetBSD: patch-rel_overlay_bin_couchdb,v 1.2 2017/11/07 15:33:27 fhajny Exp $
 
 Set pkgsrc standard paths.
 
---- rel/overlay/bin/couchdb.orig       2016-09-12 09:34:26.000000000 +0000
+--- rel/overlay/bin/couchdb.orig       2017-07-30 22:11:20.000000000 +0000
 +++ rel/overlay/bin/couchdb
 @@ -12,11 +12,7 @@
  # License for the specific language governing permissions and limitations under
@@ -23,4 +23,4 @@ Set pkgsrc standard paths.
  exec "$BINDIR/erlexec" -boot "$ROOTDIR/releases/$APP_VSN/couchdb" \
 -     -args_file "$ROOTDIR/etc/vm.args" \
 +     -args_file "@PKG_SYSCONFDIR@/vm.args" \
-      -config "$ROOTDIR/releases/$APP_VSN/sys.config"
+      -config "$ROOTDIR/releases/$APP_VSN/sys.config" "$@"
Index: pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini
diff -u pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini:1.1 pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini:1.2
--- pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini:1.1      Wed Nov 16 15:59:29 2016
+++ pkgsrc/databases/couchdb/patches/patch-rel_overlay_etc_default.ini  Tue Nov  7 15:33:27 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-rel_overlay_etc_default.ini,v 1.1 2016/11/16 15:59:29 fhajny Exp $
+$NetBSD: patch-rel_overlay_etc_default.ini,v 1.2 2017/11/07 15:33:27 fhajny Exp $
 
 Set pkgsrc standard paths.
 
---- rel/overlay/etc/default.ini.orig   2016-09-12 09:34:26.000000000 +0000
+--- rel/overlay/etc/default.ini.orig   2017-07-30 22:11:20.000000000 +0000
 +++ rel/overlay/etc/default.ini
-@@ -204,8 +204,8 @@ credentials = false
- use_users_db = false
+@@ -203,8 +203,8 @@ credentials = false
+ ; hosts =
  
  [query_servers]
 -javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
@@ -15,16 +15,21 @@ Set pkgsrc standard paths.
  
  ; enable mango query engine
  [native_query_servers]
-@@ -461,10 +461,10 @@ min_file_size = 131072
- ; here if you want to implement your own
- ; writer. See couch_log_writer.erl for
- ; more information on the (simple) API.
+@@ -492,7 +492,7 @@ level = info
+ ; rsyslog writer for deployments that need to have logs sent
+ ; over the network.
+ ;
 -writer = stderr
 +writer = file
- 
- ; Options for the file writer
--; file = /path/to/couch.log
-+ file = @COUCH_LOGDIR@/couch.log
- ; write_buffer = size_in_bytes
- ; write_delay = time_in_milliseconds
- 
+ ;
+ ; File Writer Options:
+ ;
+@@ -500,7 +500,7 @@ writer = stderr
+ ; to reopen its file. This is useful for people that configure
+ ; logrotate to move log files periodically.
+ ;
+-; file = ./couch.log ; Path name to write logs to
++file = @COUCH_LOGDIR@/couch.log
+ ;
+ ; Write operations will happen either every write_buffer bytes
+ ; or write_delay milliseconds. These are passed directly to the