Update couchdb to 1.4.0.

CouchDB 1.4.0
* We now support Erlang/OTP R16B and R16B01; the minimum required
  version is R14B.
* User document role values must now be strings. Other types of values
  will be refused when saving the user document.
* COUCHDB-1684: Support for server-wide changes feed reporting on
  creation, updates and deletion of databases.
* COUCHDB-1139: it's possible to apply list functions to _all_docs view.
* Automatic loading of CouchDB plugins.
* COUCHDB-1634: Reduce PBKDF2 work factor.
* Allow storing pre-hashed admin passwords via _config API.
* COUCHDB-1772: Prevent invalid JSON output when using all_or_nothing
  _bulk_docs API.
* Add a configurable whitelist of user document properties.
* COUCHDB-1852: Support Last-Event-ID header in EventSource changes
  feeds.
* Much improved documentation, including an expanded description of
  validate_doc_update functions and a description of how CouchDB handles
  JSON number values.
* COUCHDB-1632: Ignore epilogues in multipart/related MIME attachments.
* Split up replicator_db tests into multiple independent tests.

CouchDB 1.3.1
* Tolerate missing source and target fields in _replicator docs (COUCHDB-1788).
* Don't log about missing .compact files.
* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
* Improve documentation: better structure, improve language, less duplication.
* Improvements to test suite and VPATH build system.

4 files changed, 55 insertions, 44 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 92d3e735204..8a824757459 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,26 +1,21 @@
-# $NetBSD: Makefile,v 1.19 2013/05/31 12:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2013/09/09 13:39:10 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.3.0
+DISTNAME=		apache-couchdb-1.4.0
 PKGNAME=		${DISTNAME:S/apache-//}
-PKGREVISION=		2
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/source/1.3.0/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
 
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://couchdb.apache.org/
 COMMENT=		Document database server, accessible via a RESTful JSON API
 LICENSE=		apache-2.0
 
-VERSION.ejson=		0.1.0
-VERSION.ibrowse=	2.2.0
-VERSION.mochiweb=	1.4.1
-VERSION.snappy=		1.0.3
-
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
+INFO_FILES=		yes
 BUILD_DEFS+=		VARBASE
 
 BUILD_DEPENDS+=		help2man-[0-9]*:../../converters/help2man
@@ -90,6 +85,8 @@ PLIST_SUBST+=		VERSION.ibrowse=${VERSION.ibrowse}
 PLIST_SUBST+=		VERSION.mochiweb=${VERSION.mochiweb}
 PLIST_SUBST+=		VERSION.snappy=${VERSION.snappy}
 
+.include "Makefile.versions"
+
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../lang/spidermonkey/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/databases/couchdb/Makefile.versions b/databases/couchdb/Makefile.versions
new file mode 100644
index 00000000000..898c20791bd
--- /dev/null
+++ b/databases/couchdb/Makefile.versions
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.versions,v 1.1 2013/09/09 13:39:10 fhajny Exp $
+
+_VERSIONS=					\
+	couch_dbupdates	0.1			\
+	ejson		0.1.0			\
+	ibrowse		2.2.0			\
+	mochiweb	1.4.1			\
+	snappy		1.0.5
+
+PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
+
+.for name version in ${_VERSIONS}
+VERSION.${name}=${version}
+PLIST_SUBST+=	VERSION.${name}=${version}
+.endfor
+
+# Generate PLIST
+.for _pkg_ _version_ in $(_VERSIONS)
+PRINT_PLIST_AWK+=	{if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
+.endfor
diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST
index 6c71fd26e5c..e9c965c2777 100644
--- a/databases/couchdb/PLIST
+++ b/databases/couchdb/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2013/04/24 12:22:37 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/09/09 13:39:10 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-${PKGVERSION}/ebin/couch_app.beam
@@ -61,6 +62,8 @@ 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
@@ -98,11 +101,6 @@ lib/erlang/lib/ejson-${VERSION.ejson}/ebin/mochinum.beam
 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/erlang-oauth/ebin/oauth_hmac_sha1.beam
-lib/erlang/lib/erlang-oauth/ebin/oauth_http.beam
-lib/erlang/lib/erlang-oauth/ebin/oauth_plaintext.beam
-lib/erlang/lib/erlang-oauth/ebin/oauth_unix.beam
-lib/erlang/lib/erlang-oauth/ebin/oauth_uri.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
@@ -182,7 +180,6 @@ 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/dbmaint.txt
 share/couchdb/www/docs/_sources/api/design.txt
 share/couchdb/www/docs/_sources/api/documents.txt
 share/couchdb/www/docs/_sources/api/local.txt
@@ -190,23 +187,16 @@ 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/commonjs.txt
 share/couchdb/www/docs/_sources/config_reference.txt
 share/couchdb/www/docs/_sources/configuring.txt
-share/couchdb/www/docs/_sources/cors.txt
+share/couchdb/www/docs/_sources/contributing.txt
 share/couchdb/www/docs/_sources/ddocs.txt
-share/couchdb/www/docs/_sources/errors.txt
-share/couchdb/www/docs/_sources/http-proxying.txt
 share/couchdb/www/docs/_sources/index.txt
 share/couchdb/www/docs/_sources/intro.txt
 share/couchdb/www/docs/_sources/json-structure.txt
-share/couchdb/www/docs/_sources/os-daemons.txt
-share/couchdb/www/docs/_sources/pretty_urls.txt
 share/couchdb/www/docs/_sources/query-servers.txt
-share/couchdb/www/docs/_sources/range.txt
-share/couchdb/www/docs/_sources/release.txt
 share/couchdb/www/docs/_sources/replication.txt
-share/couchdb/www/docs/_sources/ssl.txt
+share/couchdb/www/docs/_sources/replicator.txt
 share/couchdb/www/docs/_static/ajax-loader.gif
 share/couchdb/www/docs/_static/basic.css
 share/couchdb/www/docs/_static/comment-bright.png
@@ -234,7 +224,6 @@ 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/dbmaint.html
 share/couchdb/www/docs/api/design.html
 share/couchdb/www/docs/api/documents.html
 share/couchdb/www/docs/api/local.html
@@ -242,27 +231,19 @@ 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/commonjs.html
 share/couchdb/www/docs/config_reference.html
 share/couchdb/www/docs/configuring.html
-share/couchdb/www/docs/cors.html
 share/couchdb/www/docs/ddocs.html
-share/couchdb/www/docs/errors.html
 share/couchdb/www/docs/genindex.html
-share/couchdb/www/docs/http-proxying.html
 share/couchdb/www/docs/index.html
 share/couchdb/www/docs/intro.html
 share/couchdb/www/docs/json-structure.html
 share/couchdb/www/docs/objects.inv
-share/couchdb/www/docs/os-daemons.html
-share/couchdb/www/docs/pretty_urls.html
 share/couchdb/www/docs/query-servers.html
-share/couchdb/www/docs/range.html
-share/couchdb/www/docs/release.html
 share/couchdb/www/docs/replication.html
+share/couchdb/www/docs/replicator.html
 share/couchdb/www/docs/search.html
 share/couchdb/www/docs/searchindex.js
-share/couchdb/www/docs/ssl.html
 share/couchdb/www/document.html
 share/couchdb/www/favicon.ico
 share/couchdb/www/image/add.png
@@ -320,6 +301,7 @@ share/couchdb/www/script/jspec/jspec.jquery.js
 share/couchdb/www/script/jspec/jspec.js
 share/couchdb/www/script/jspec/jspec.xhr.js
 share/couchdb/www/script/oauth.js
+share/couchdb/www/script/replicator_db_inc.js
 share/couchdb/www/script/sha1.js
 share/couchdb/www/script/test/all_docs.js
 share/couchdb/www/script/test/attachment_names.js
@@ -369,8 +351,24 @@ 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/replication.js
-share/couchdb/www/script/test/replicator_db.js
+share/couchdb/www/script/test/replicator_db_bad_rep_id.js
+share/couchdb/www/script/test/replicator_db_by_doc_id.js
+share/couchdb/www/script/test/replicator_db_compact_rep_db.js
+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_invalid_filter.js
 share/couchdb/www/script/test/replicator_db_security.js
+share/couchdb/www/script/test/replicator_db_simple.js
+share/couchdb/www/script/test/replicator_db_successive.js
+share/couchdb/www/script/test/replicator_db_survives.js
+share/couchdb/www/script/test/replicator_db_swap_rep_db.js
+share/couchdb/www/script/test/replicator_db_update_security.js
+share/couchdb/www/script/test/replicator_db_user_ctx.js
+share/couchdb/www/script/test/replicator_db_write_auth.js
 share/couchdb/www/script/test/rev_stemming.js
 share/couchdb/www/script/test/rewrite.js
 share/couchdb/www/script/test/security_validation.js
@@ -412,20 +410,16 @@ share/couchdb/www/style/layout.css
 share/couchdb/www/verify_install.html
 share/doc/couchdb/AUTHORS.gz
 share/doc/couchdb/BUGS.gz
-share/doc/couchdb/CHANGES.gz
 share/doc/couchdb/CouchDB.pdf.gz
 share/doc/couchdb/DEVELOPERS.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/NEWS.gz
 share/doc/couchdb/NOTICE.gz
 share/doc/couchdb/README.gz
 share/doc/couchdb/THANKS.gz
 share/examples/couchdb/default.ini
 share/examples/couchdb/local.ini
-share/info/CouchDB
-share/info/dir
 @pkgdir share/examples/couchdb/local.d
 @pkgdir share/examples/couchdb/default.d
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 7194b3493dc..97550628635 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/04/24 12:22:37 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2013/09/09 13:39:10 fhajny Exp $
 
-SHA1 (apache-couchdb-1.3.0.tar.gz) = 1085297fcabb020f407283aba1f74302c9923fa0
-RMD160 (apache-couchdb-1.3.0.tar.gz) = 0803f388673c181eff6ee287a76203a780c0ce8b
-Size (apache-couchdb-1.3.0.tar.gz) = 3420515 bytes
+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 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
 SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872