[1]: Update to 1.0.0

[2]: Fix bug in RC script
[3]: Add pre-fetch message about possibly needing to rebuild the views

PR:		[1]: ports/148803
		[2]: ports/149028
		[3]: ports/149030
Submitted by:	[1]: Tomas Sedovic <tomas@sedovic.cz>
		[2]: Till Klampaeckel <till@php.net> (maintainer)
		[3]: Till Klampaeckel <till@php.net> (maintainer)
Approved by:	[1]: Till Klampaeckel <till@php.net> (maintainer)

4 files changed, 76 insertions, 41 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 647c974432f9..535fbb0efa5f 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	couchdb
-PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_APACHE}
@@ -26,6 +25,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 COUCH_VARDIR?=	/var
 COUCH_DBDIR?=	${COUCH_VARDIR}/db/couchdb
 COUCH_LOGDIR?=	${COUCH_VARDIR}/log/couchdb
+COUCH_LIBDIR?=	${COUCH_VARDIR}/lib/couchdb
 COUCH_USER?=	couchdb
 
 USE_RC_SUBR=	couchdb
@@ -44,10 +44,11 @@ MAN1=	couchdb.1 couchjs.1
 pre-fetch:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible."
+	@${ECHO_MSG} "Upgrading also might require you to rebuild your views entirely."
 	@${ECHO_MSG} ""
 
 post-patch:
-	${REINPLACE_CMD} -e '117s|@INSTALL_PROGRAM@|@INSTALL_SCRIPT@|' ${WRKSRC}/src/couchdb/priv/Makefile.in
+	${REINPLACE_CMD} -e '169s|@INSTALL_PROGRAM@|@INSTALL_SCRIPT@|' ${WRKSRC}/src/couchdb/priv/Makefile.in
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
 .endif
@@ -60,5 +61,6 @@ post-install:
 	${MKDIR} ${COUCH_DBDIR}
 	${CHOWN} ${COUCH_USER} ${COUCH_DBDIR}
 	${CHOWN} ${COUCH_USER} ${COUCH_LOGDIR}
+	${CHOWN} ${COUCH_USER} ${COUCH_LIBDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
index 2f036edaadb8..0b5618b57afe 100644
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-couchdb-0.10.1.tar.gz) = a34dae8bf402299e378d7e8c13b7ba46
-SHA256 (apache-couchdb-0.10.1.tar.gz) = 2c6af7216537d0e399674a83e4505dc04a02abe1bdd966f69074564c3521c66b
-SIZE (apache-couchdb-0.10.1.tar.gz) = 883259
+MD5 (apache-couchdb-1.0.0.tar.gz) = 71e89c4b21c62417f2f413d74a38f079
+SHA256 (apache-couchdb-1.0.0.tar.gz) = ca38de6823a51dbfa521f65089683b5ff3aa405e78c807aaf1e1ad24b83c2f57
+SIZE (apache-couchdb-1.0.0.tar.gz) = 951979
diff --git a/databases/couchdb/files/couchdb.in b/databases/couchdb/files/couchdb.in
index 2feceb0e3d97..dea224b7c36d 100644
--- a/databases/couchdb/files/couchdb.in
+++ b/databases/couchdb/files/couchdb.in
@@ -35,7 +35,7 @@ pidfile="/var/run/${name}/${name}.pid"
 etcdir="%%PREFIX%%/etc/${name}"
 respawn=""
 
-if [ "$couchdb_respawn" > 0 ]
+if [ "$couchdb_respawn" -gt 0 ]
     then
         respawn="-r ${couchdb_respawn} "
 fi
diff --git a/databases/couchdb/pkg-plist b/databases/couchdb/pkg-plist
index 99538d248a72..865ccf53cd1f 100644
--- a/databases/couchdb/pkg-plist
+++ b/databases/couchdb/pkg-plist
@@ -5,9 +5,11 @@ etc/couchdb/local.ini
 etc/logrotate.d/couchdb
 lib/couchdb/bin/couchjs
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch.app
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_batch_save.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_batch_save_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_app.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_auth_cache.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_btree.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_changes.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_config.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_config_writer.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_db.beam
@@ -25,6 +27,7 @@ lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_db.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_external.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_misc_handlers.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_oauth.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_rewrite.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_show.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_stats_handlers.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_view.beam
@@ -49,15 +52,19 @@ lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stats_collector.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stream.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_task_status.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_util.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_uuids.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_compactor.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_group.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_updater.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_work_queue.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_db.hrl
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_js_functions.hrl
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/couchspawnkillable
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.a
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.la
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.so
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_icu_driver.a
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_icu_driver.la
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_icu_driver.so
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/stat_descriptions.cfg
 lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.app
 lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.beam
 lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_hmac_sha1.beam
@@ -82,41 +89,46 @@ lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lb.beam
 lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lib.beam
 lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_sup.beam
 lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_test.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_records.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_std.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochihex.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochijson.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochijson2.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochinum.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb.app
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_app.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_charref.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_cookies.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_echo.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_headers.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_html.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_http.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_multipart.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_request.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_response.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_skel.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_socket_server.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_sup.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_util.beam
-lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt_records.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt_std.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochihex.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochijson.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochijson2.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochinum.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb.app
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_app.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_charref.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_cookies.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_echo.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_headers.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_html.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_http.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_multipart.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_request.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_response.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_skel.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_socket_server.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_sup.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_util.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam
 %%DATADIR%%/server/main.js
 %%DATADIR%%/www/_sidebar.html
 %%DATADIR%%/www/config.html
 %%DATADIR%%/www/couch_tests.html
 %%DATADIR%%/www/custom_test.html
 %%DATADIR%%/www/database.html
-%%DATADIR%%/www/dialog/_compact_database.html
+%%DATADIR%%/www/dialog/_admin_party.html
+%%DATADIR%%/www/dialog/_compact_cleanup.html
+%%DATADIR%%/www/dialog/_create_admin.html
 %%DATADIR%%/www/dialog/_create_database.html
+%%DATADIR%%/www/dialog/_database_security.html
 %%DATADIR%%/www/dialog/_delete_database.html
 %%DATADIR%%/www/dialog/_delete_document.html
+%%DATADIR%%/www/dialog/_login.html
 %%DATADIR%%/www/dialog/_save_view_as.html
+%%DATADIR%%/www/dialog/_signup.html
 %%DATADIR%%/www/dialog/_upload_attachment.html
 %%DATADIR%%/www/document.html
 %%DATADIR%%/www/favicon.ico
@@ -129,6 +141,7 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 %%DATADIR%%/www/image/delete.png
 %%DATADIR%%/www/image/grippie.gif
 %%DATADIR%%/www/image/hgrad.gif
+%%DATADIR%%/www/image/key.png
 %%DATADIR%%/www/image/load.png
 %%DATADIR%%/www/image/logo.png
 %%DATADIR%%/www/image/order-asc.gif
@@ -151,13 +164,13 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 %%DATADIR%%/www/image/twisty.gif
 %%DATADIR%%/www/index.html
 %%DATADIR%%/www/replicator.html
+%%DATADIR%%/www/script/base64.js
 %%DATADIR%%/www/script/couch.js
 %%DATADIR%%/www/script/couch_test_runner.js
 %%DATADIR%%/www/script/couch_tests.js
 %%DATADIR%%/www/script/futon.browse.js
 %%DATADIR%%/www/script/futon.format.js
 %%DATADIR%%/www/script/futon.js
-%%DATADIR%%/www/script/jquery.cookies.js
 %%DATADIR%%/www/script/jquery.couch.js
 %%DATADIR%%/www/script/jquery.dialog.js
 %%DATADIR%%/www/script/jquery.editinline.js
@@ -173,6 +186,8 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 %%DATADIR%%/www/script/test/attachment_paths.js
 %%DATADIR%%/www/script/test/attachment_views.js
 %%DATADIR%%/www/script/test/attachments.js
+%%DATADIR%%/www/script/test/attachments_multipart.js
+%%DATADIR%%/www/script/test/auth_cache.js
 %%DATADIR%%/www/script/test/basics.js
 %%DATADIR%%/www/script/test/batch_save.js
 %%DATADIR%%/www/script/test/bulk_docs.js
@@ -199,22 +214,30 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 %%DATADIR%%/www/script/test/lorem.txt
 %%DATADIR%%/www/script/test/lorem_b64.txt
 %%DATADIR%%/www/script/test/lots_of_docs.js
+%%DATADIR%%/www/script/test/method_override.js
 %%DATADIR%%/www/script/test/multiple_rows.js
 %%DATADIR%%/www/script/test/oauth.js
+%%DATADIR%%/www/script/test/proxyauth.js
 %%DATADIR%%/www/script/test/purge.js
+%%DATADIR%%/www/script/test/reader_acl.js
 %%DATADIR%%/www/script/test/recreate_doc.js
 %%DATADIR%%/www/script/test/reduce.js
 %%DATADIR%%/www/script/test/reduce_builtin.js
 %%DATADIR%%/www/script/test/reduce_false.js
+%%DATADIR%%/www/script/test/reduce_false_temp.js
 %%DATADIR%%/www/script/test/replication.js
 %%DATADIR%%/www/script/test/rev_stemming.js
+%%DATADIR%%/www/script/test/rewrite.js
 %%DATADIR%%/www/script/test/security_validation.js
 %%DATADIR%%/www/script/test/show_documents.js
 %%DATADIR%%/www/script/test/stats.js
 %%DATADIR%%/www/script/test/update_documents.js
+%%DATADIR%%/www/script/test/users_db.js
 %%DATADIR%%/www/script/test/utf8.js
 %%DATADIR%%/www/script/test/uuids.js
 %%DATADIR%%/www/script/test/view_collation.js
+%%DATADIR%%/www/script/test/view_collation_raw.js
+%%DATADIR%%/www/script/test/view_compaction.js
 %%DATADIR%%/www/script/test/view_conflicts.js
 %%DATADIR%%/www/script/test/view_errors.js
 %%DATADIR%%/www/script/test/view_include_docs.js
@@ -224,18 +247,26 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 %%DATADIR%%/www/script/test/view_offsets.js
 %%DATADIR%%/www/script/test/view_pagination.js
 %%DATADIR%%/www/script/test/view_sandboxing.js
+%%DATADIR%%/www/script/test/view_update_seq.js
 %%DATADIR%%/www/script/test/view_xml.js
+%%DATADIR%%/www/session.html
 %%DATADIR%%/www/status.html
 %%DATADIR%%/www/style/layout.css
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.gz
+%%PORTDOCS%%%%DOCSDIR%%/DEVELOPERS.gz
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.Unix.gz
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.Windows.gz
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.gz
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.gz
+%%PORTDOCS%%%%DOCSDIR%%/NOTICE.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.gz
 %%PORTDOCS%%%%DOCSDIR%%/THANKS.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/couchdb/erlang/lib/mochiweb-r97/ebin
-@dirrm lib/couchdb/erlang/lib/mochiweb-r97
+@dirrm lib/couchdb/erlang/lib/mochiweb-r113/ebin
+@dirrm lib/couchdb/erlang/lib/mochiweb-r113
 @dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin
 @dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2
 @dirrm lib/couchdb/erlang/lib/etap/ebin
@@ -252,9 +283,11 @@ lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam
 @dirrm lib/couchdb/bin
 @dirrm lib/couchdb
 @dirrm etc/logrotate.d
+@exec mkdir -p %D/etc/couchdb/default.d
 @dirrm etc/couchdb/default.d
+@exec mkdir -p %D/etc/couchdb/local.d
 @dirrm etc/couchdb/local.d
-@dirrm etc/couchdb
+@dirrmtry etc/couchdb
 @dirrm %%DATADIR%%/www/style
 @dirrm %%DATADIR%%/www/script/test
 @dirrm %%DATADIR%%/www/script