From nobody@FreeBSD.org  Sun Jun 10 15:36:38 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBCBA106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jun 2012 15:36:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D48688FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jun 2012 15:36:38 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q5AFac9A093010
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jun 2012 15:36:38 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q5AFacV4093002;
	Sun, 10 Jun 2012 15:36:38 GMT
	(envelope-from nobody)
Message-Id: <201206101536.q5AFacV4093002@red.freebsd.org>
Date: Sun, 10 Jun 2012 15:36:38 GMT
From: Adam Strohl <adams-ports@ateamsystems.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Upgraded CouchDB port (1.2.0)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: till@php.net

>Number:         168923
>Category:       ports
>Synopsis:       Upgraded databases/couchdb (1.2.0)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 10 15:40:05 UTC 2012
>Closed-Date:    Mon Jul 02 21:37:42 UTC 2012
>Last-Modified:  Mon Jul  2 21:40:09 UTC 2012
>Originator:     Adam Strohl
>Release:        8.2 & 9.0
>Organization:
A-Team Systems
>Environment:
FreeBSD mako.dsn 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011     root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
FreeBSD freebsd-clean.dsn 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
I have tried contacting the CouchDB (database/couchdb) maintainer via email with an updated port + diffs but have heard nothing back.

CouchDB 1.2.0 has been out for ~2 months now and has a number of performance and security enhancements (no security bug fixes, just architectural changes and better practices).
>How-To-Repeat:

>Fix:
See the attached diff file for the changes to upgrade the port from 1.1.0 to 1.2.0.

Basically I got tired of waiting and decided to further clean up the port which had several issues, the most notable being:

 - local.ini which is where local customizations and administrative account information is contain is erroneously removed on deinstall.  I've setup the recommended system of comparing against a local.ini.sample and only removing it if it is identical.  Its unfortunate that anyone upgrading will lose their local.ini because of the 1.1.0 port missing this, at least its fixed now.

 - Shifted the default DB storage location from /var/lib/couchdb to /var/db/couchdb to make it consistent with other DB storage engine ports which use /var/db as their base (ie; mySQL).

I tested this out on a clean 9.0-R system build and operational testing showed no problems.

Patch attached with submission follows:

diff -ruN /usr/ports/databases/couchdb/Makefile couchdb.new/Makefile
--- /usr/ports/databases/couchdb/Makefile	2012-03-28 01:05:53.000000000 +0700
+++ couchdb.new/Makefile	2012-06-10 20:23:26.000000000 +0700
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	couchdb
-PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTVERSION=	1.2.0
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	couchdb/${PORTVERSION}
+MASTER_SITE_SUBDIR=	couchdb/releases/${PORTVERSION}
 DISTNAME=	apache-couchdb-${PORTVERSION}
 
 MAINTAINER=	till@php.net
@@ -53,7 +53,9 @@
 
 pre-fetch:
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible."
+	@${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible"
+	@${ECHO_MSG} "and that you have BACKED UP YOUR DB directory before proceeding!"
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Upgrading also might require you to rebuild your views entirely."
 	@${ECHO_MSG} ""
 
@@ -63,10 +65,22 @@
 	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e '179s|install  -s|install|' ${WRKSRC}/src/couchdb/priv/Makefile
+
+pre-install:
+	@${REINPLACE_CMD} -e '6s|database_dir = /var/lib/couchdb|database_dir = /var/db/couchdb|' ${WRKSRC}/etc/couchdb/default.ini
+	@${REINPLACE_CMD} -e '7s|view_index_dir = /var/lib/couchdb|view_index_dir = /var/db/couchdb|' ${WRKSRC}/etc/couchdb/default.ini
+
 post-install:
 .ifndef PACKAGE_BUILDING
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	@${CAT} ${PKGMESSAGE}
+	${CP} -p ${WRKSRC}/etc/couchdb/local.ini ${PREFIX}/etc/couchdb/local.ini.sample
+
+	@if [ ! -f ${PREFIX}/etc/couchdb/local.ini ]; then \
+		${CP} -p ${PREFIX}/etc/couchdb/local.ini.sample ${PREFIX}/etc/couchdb/local.ini; \
+	fi
+	@${CAT} ${PKGMESSAGE} | ${SED} -e s:"_PREFIX_":"${PREFIX}":g
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/databases/couchdb/distinfo couchdb.new/distinfo
--- /usr/ports/databases/couchdb/distinfo	2011-08-18 20:24:48.000000000 +0700
+++ couchdb.new/distinfo	2012-06-05 18:57:21.000000000 +0700
@@ -1,2 +1,2 @@
-SHA256 (apache-couchdb-1.1.0.tar.gz) = 08432165e72fa55e128e90d34b5b5e2d3b9af228fa2b30d3a3fa70a88a3c6498
-SIZE (apache-couchdb-1.1.0.tar.gz) = 1088226
+SHA256 (apache-couchdb-1.2.0.tar.gz) = 0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37
+SIZE (apache-couchdb-1.2.0.tar.gz) = 1326925
diff -ruN /usr/ports/databases/couchdb/pkg-deinstall couchdb.new/pkg-deinstall
--- /usr/ports/databases/couchdb/pkg-deinstall	2011-08-18 20:24:48.000000000 +0700
+++ couchdb.new/pkg-deinstall	2012-06-10 18:19:05.000000000 +0700
@@ -4,10 +4,10 @@
 
 COUCH_DBDIR=/var/db/couchdb
 COUCH_LOGDIR=/var/log/couchdb
-COUCH_LIBDIR=/var/lib/couchdb
+COUCH_RUNDIR=/var/run/couchdb
 
 if [ "$2" = "POST-DEINSTALL" ]; then
-	for i in ${COUCH_LIBDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR}; do
+	for i in ${COUCH_RUNDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR}; do
 		${RMDIR} ${i} 2>/dev/null
 	done
 fi
diff -ruN /usr/ports/databases/couchdb/pkg-install couchdb.new/pkg-install
--- /usr/ports/databases/couchdb/pkg-install	2011-08-18 20:24:48.000000000 +0700
+++ couchdb.new/pkg-install	2012-06-10 18:35:01.000000000 +0700
@@ -8,13 +8,13 @@
 
 COUCH_DBDIR=/var/db/couchdb
 COUCH_LOGDIR=/var/log/couchdb
-COUCH_LIBDIR=/var/lib/couchdb
+COUCH_RUNDIR=/var/run/couchdb
 
 if [ "$2" = "POST-INSTALL" ]; then
-	${MKDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR} ${COUCH_LIBDIR}
+	${MKDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR} ${COUCH_RUNDIR}
 	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_DBDIR}
 	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LOGDIR}
-	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LIBDIR}
+	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_RUNDIR}
 fi
 
 exit 0
diff -ruN /usr/ports/databases/couchdb/pkg-message couchdb.new/pkg-message
--- /usr/ports/databases/couchdb/pkg-message	2009-06-17 21:10:30.000000000 +0700
+++ couchdb.new/pkg-message	2012-06-10 19:25:31.000000000 +0700
@@ -1,8 +1,33 @@
 ===>  COMPATIBILITY NOTE:
-      CouchDB is still pre-stable; between 0.8 and 0.9 the database format
-      changed which breaks BC. In current trunk, the format changed again, so
-      please double-check in case you are updating an existing installation.
+      Between 0.8 and 0.9 the database format changed which breaks BC. In
+      current trunk, the format changed again, so please double-check in case
+      you are updating an existing installation.
 
       More info:
         * http://wiki.apache.org/couchdb/Breaking_changes?action=show&redirect=BreakingChanges
         * http://wiki.apache.org/couchdb/BreakingChangesUpdateTrunkTo0Dot9
+
+===>  CONFIGURATION NOTES:
+
+      PERFORMANCE
+         For best response (minimal delay) most sites will wish to uncomment this line
+         from _PREFIX_/etc/couchdb/local.ini:
+
+            socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+
+         Otherwise you'll see a large delay when establishing connections to the DB.
+      
+      ADMIN ACCOUNT
+         By default no admin password or account is configured which leaves the DB server open
+         to the public.  Add accounts to the bottom of _PREFIX_/etc/couchdb/local.ini
+         to secure your installation (by default the DB server listsn on localhost only).
+
+      DATABASE LOCATION
+	 The DB files themselves are now stored in /var/db/couchdb by default.
+	 Previous versions of this port defaulted to /var/lib/couchdb, and if
+	 you installed directly from source /usr/local/lib/couchdb.
+
+	 If you are upgrading you may need to move your DB files to /var/db/couchdb
+	 if you are not specifying database_dir and view_index_dir locations
+         in local.ini.
+
diff -ruN /usr/ports/databases/couchdb/pkg-plist couchdb.new/pkg-plist
--- /usr/ports/databases/couchdb/pkg-plist	2011-08-18 20:24:48.000000000 +0700
+++ couchdb.new/pkg-plist	2012-06-10 22:09:30.000000000 +0700
@@ -1,7 +1,9 @@
 bin/couchdb
 bin/couchjs
 etc/couchdb/default.ini
-etc/couchdb/local.ini
+@unexec if cmp -s %D/etc/couchdb/local.ini.sample %D/etc/couchdb/local.ini; then rm -f %D/etc/couchdb/local.ini; fi
+etc/couchdb/local.ini.sample
+@exec if [ ! -f %D/etc/couchdb/local.ini ] ; then cp -p %D/%F %B/local.ini; fi
 etc/logrotate.d/couchdb
 lib/couchdb/bin/couchjs
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch.app
@@ -37,14 +39,7 @@
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_os_process.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_query_servers.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_ref_counter.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_att.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_changes_feed.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_httpc.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_missing_revs.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_reader.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_sup.beam
-lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_writer.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_server.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_server_sup.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stats_aggregator.beam
@@ -62,12 +57,33 @@
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_vhost.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_os_daemons.beam
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_replication_manager.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_api_wrap.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_api_wrap_httpc.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_compaction_daemon.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_compress.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_drv.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_ejson_compare.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpc_pool.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_replicator.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_primary_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_replication_notifier.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_replicator.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_replicator_worker.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_replicator_utils.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_secondary_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_users_db.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/json_stream_parse.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_api_wrap.hrl
 lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_db.hrl
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_replicator.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_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/lib/couch_ejson_compare.a
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_ejson_compare.la
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_ejson_compare.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
@@ -93,41 +109,54 @@
 lib/couchdb/erlang/lib/ibrowse-2.2.0/ebin/ibrowse_lib.beam
 lib/couchdb/erlang/lib/ibrowse-2.2.0/ebin/ibrowse_sup.beam
 lib/couchdb/erlang/lib/ibrowse-2.2.0/ebin/ibrowse_test.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochifmt.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochifmt_records.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochifmt_std.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiglobal.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochihex.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochijson.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochijson2.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochilists.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochilogfile2.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochinum.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochitemp.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiutf8.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb.app
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_acceptor.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_app.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_charref.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_cookies.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_cover.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_echo.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_headers.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_html.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_http.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_io.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_mime.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_multipart.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_request.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_response.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_skel.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_socket.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_socket_server.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_sup.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/mochiweb_util.beam
-lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin/reloader.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochifmt.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochifmt_records.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochifmt_std.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiglobal.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochihex.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochijson.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochijson2.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochilists.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochilogfile2.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochinum.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochitemp.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiutf8.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb.app
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_acceptor.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_app.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_charref.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_cookies.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_cover.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_echo.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_headers.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_html.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_http.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_io.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_mime.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_multipart.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_request.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_response.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_skel.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_socket.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_socket_server.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_sup.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/mochiweb_util.beam
+lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin/reloader.beam
+lib/couchdb/erlang/lib/ejson-0.1.0/ebin/ejson.app
+lib/couchdb/erlang/lib/ejson-0.1.0/ebin/ejson.beam
+lib/couchdb/erlang/lib/ejson-0.1.0/ebin/mochijson2.beam
+lib/couchdb/erlang/lib/ejson-0.1.0/ebin/mochinum.beam
+lib/couchdb/erlang/lib/ejson-0.1.0/priv/ejson.so
+lib/couchdb/erlang/lib/ejson-0.1.0/priv/ejson.la
+lib/couchdb/erlang/lib/ejson-0.1.0/priv/ejson.a
+lib/couchdb/erlang/lib/snappy-1.0.3/ebin/snappy.app
+lib/couchdb/erlang/lib/snappy-1.0.3/ebin/snappy.beam
+lib/couchdb/erlang/lib/snappy-1.0.3/priv/snappy_nif.so
+lib/couchdb/erlang/lib/snappy-1.0.3/priv/snappy_nif.la
+lib/couchdb/erlang/lib/snappy-1.0.3/priv/snappy_nif.a
 %%DATADIR%%/server/main.js
+%%DATADIR%%/server/main-coffee.js
 %%DATADIR%%/www/_sidebar.html
 %%DATADIR%%/www/config.html
 %%DATADIR%%/www/couch_tests.html
@@ -206,7 +235,6 @@
 %%DATADIR%%/www/script/oauth.js
 %%DATADIR%%/www/script/sha1.js
 %%DATADIR%%/www/script/test/all_docs.js
-%%DATADIR%%/www/script/test/attachment_conflicts.js
 %%DATADIR%%/www/script/test/attachment_names.js
 %%DATADIR%%/www/script/test/attachment_paths.js
 %%DATADIR%%/www/script/test/attachment_ranges.js
@@ -276,6 +304,10 @@
 %%DATADIR%%/www/script/test/view_sandboxing.js
 %%DATADIR%%/www/script/test/view_update_seq.js
 %%DATADIR%%/www/script/test/view_xml.js
+%%DATADIR%%/www/script/test/coffee.js
+%%DATADIR%%/www/script/test/oauth_users_db.js
+%%DATADIR%%/www/script/test/replicator_db_security.js
+%%DATADIR%%/www/script/test/users_db_security.js
 %%DATADIR%%/www/spec/couch_js_class_methods_spec.js
 %%DATADIR%%/www/spec/couch_js_instance_methods_1_spec.js
 %%DATADIR%%/www/spec/couch_js_instance_methods_2_spec.js
@@ -288,6 +320,7 @@
 %%DATADIR%%/www/spec/run.html
 %%DATADIR%%/www/session.html
 %%DATADIR%%/www/status.html
+%%DATADIR%%/www/verify_install.html
 %%DATADIR%%/www/style/layout.css
 %%DATADIR%%/www/style/jquery-ui-1.8.11.custom.css
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
@@ -303,8 +336,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.gz
 %%PORTDOCS%%%%DOCSDIR%%/THANKS.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/couchdb/erlang/lib/mochiweb-7c2bc2/ebin
-@dirrm lib/couchdb/erlang/lib/mochiweb-7c2bc2
+@dirrm lib/couchdb/erlang/lib/mochiweb-1.4.1/ebin
+@dirrm lib/couchdb/erlang/lib/mochiweb-1.4.1
 @dirrm lib/couchdb/erlang/lib/ibrowse-2.2.0/ebin
 @dirrm lib/couchdb/erlang/lib/ibrowse-2.2.0
 @dirrm lib/couchdb/erlang/lib/etap/ebin
@@ -316,6 +349,12 @@
 @dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include
 @dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin
 @dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%
+@dirrm lib/couchdb/erlang/lib/ejson-0.1.0/ebin
+@dirrm lib/couchdb/erlang/lib/ejson-0.1.0/priv
+@dirrm lib/couchdb/erlang/lib/ejson-0.1.0
+@dirrm lib/couchdb/erlang/lib/snappy-1.0.3/ebin
+@dirrm lib/couchdb/erlang/lib/snappy-1.0.3/priv
+@dirrm lib/couchdb/erlang/lib/snappy-1.0.3
 @dirrm lib/couchdb/erlang/lib
 @dirrm lib/couchdb/erlang
 @dirrm lib/couchdb/bin


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Jun 10 20:37:34 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168923 

From: Adam Strohl <adams-ports@ateamsystems.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168923: Upgraded databases/couchdb (1.2.0)
Date: Thu, 14 Jun 2012 00:58:09 +0700

 I've done a bunch more testing and clean up and have a new diff/patch 
 which should be used instead of the one I initially attached to the PR:
 
 http://www.ateamsystems.com/software/dist/couchdb-port-1.1.0-to-1.2.0.diff
 
 It includes the alert to consult UPDATING and a bunch of other 
 fixes/tweaks.  The Makefile needs to have <date> swapped in for the 
 UPDATING dateline.
 
 Here is some sample text for the UPDATING entry:
 
 20120613:
    AFFECTS: users of database/couchdb
    AUTHOR: adams-ports@ateamsystems.com
 
    CouchDB has been updated to 1.2.0.  In the previous version of
    the port (1.1.0) there is an error in the pkg-plist which will
    cause /usr/local/etc/couchdb/local.ini to be removed.  This file
    contains CouchDB configuration information and admin accounts.
 
    To avoid this an interlock was placed when building the 1.2.0
    port if local.ini exists and local.ini.sample does not (new
    in 1.2.0).
 
    If you are upgrading from a previous version of the CouchDB
    port copy your local.ini file to a safe location before
    uninstalling the old port:
 
    # cp /usr/local/etc/couchdb/local.ini 
 /usr/local/etc/couchdb/local.ini.bak
 
    Once you have installed the new port copy it back:
 
    # cp /usr/local/etc/couchdb/local.ini.bak 
 /usr/local/etc/couchdb/local.ini
 
    Additionally the default database directory is now
    /var/db/couchdb (formerly /var/lib/couchdb), you may need to
    move your DB files to the new location if you are not manually
    specifying a location in local.ini.
 
 -- 
 Adam Strohl
 http://www.ateamsystems.com/
 

From: Adam Strohl <adams-ports@ateamsystems.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168923: Upgraded databases/couchdb (1.2.0)
Date: Thu, 14 Jun 2012 01:03:47 +0700

 Doh.  Updated content: changed cp to mv, because otherwise the IGNORE 
 statement in the Makefile will still trigger.  Check the example 
 commands and feel free to trim/edit.
 
 20120613:
    AFFECTS: users of database/couchdb
    AUTHOR: adams-ports@ateamsystems.com
 
    CouchDB has been updated to 1.2.0.  In the previous version of
    the port (1.1.0) there is an error in the pkg-plist which will
    cause /usr/local/etc/couchdb/local.ini to be removed.  This file
    contains CouchDB configuration information and admin accounts.
 
    To avoid this an interlock was placed when building the 1.2.0
    port if local.ini exists and local.ini.sample does not (new
    in 1.2.0).
 
    If you are upgrading from a previous version of the CouchDB
    port move your local.ini file to a safe location before
    uninstalling the old port:
 
    # mv /usr/local/etc/couchdb/local.ini 
 /usr/local/etc/couchdb/local.ini.bak
 
    With local.ini out of the way 'make build' will work:
 
    # cd /usr/ports/database/couchdb && make build deinstall install
 
    Once you have installed the new port move it back:
 
    # mv /usr/local/etc/couchdb/local.ini.bak 
 /usr/local/etc/couchdb/local.ini
 
    Additionally the default database directory is now
    /var/db/couchdb (formerly /var/lib/couchdb), you may need to
    move your DB files to the new location if you are not manually
    specifying a location in local.ini.
 
 
 -- 
 Adam Strohl
 http://www.ateamsystems.com/
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 17 12:53:38 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168923 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: till@php.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/168923: Upgraded databases/couchdb (1.2.0)
Date: Sun, 17 Jun 2012 12:53:36 UT

 Maintainer of databases/couchdb,
 
 Please note that PR ports/168923 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/168923
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Chris Rees <utisoft@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/168923
Date: Sun, 17 Jun 2012 13:57:23 +0100

 I've replaced the IGNORE with a pre-everything target that also checks
 if an older version is installed; otherwise the IGNORE will be
 triggered if 1.2.0 is deinstalled (.sample will be removed, .ini will
 not; ignore triggered false alarm-- I should have thought of that when
 suggesting it before!).
 
 I've also OPTIONSngified it, and fixed a few minor nits, and used
 pkg-message.in to properly substitute PREFIX for package installation.
 
 Great patch to work from though, thanks!
 
 Till, is it OK?
 
 http://www.bayofrum.net/~crees/patches/couchdb-1.2.0.diff
 
 Chris
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Mon Jul 2 21:37:41 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168923 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168923: commit references a PR
Date: Mon,  2 Jul 2012 21:31:37 +0000 (UTC)

 crees       2012-07-02 21:31:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/couchdb    Makefile distinfo pkg-deinstall 
                          pkg-install pkg-plist 
     databases/couchdb/files couchdb.in 
   Added files:
     databases/couchdb/files pkg-message.in 
   Removed files:
     databases/couchdb    pkg-message 
   Log:
   - Update to 1.2.0
   
   - OPTIONSngify
   
   - Error out on build if older version installed with config file present; this
     must be backed up or it will be lost on deinstall.
   
   - Shift default DB storage location from /var/lib/couchdb to
     /var/db/couchdb to make it consistent with other DB storage engine ports
     which use /var/db as their base (eg; mySQL).
   
   PR:             ports/168923
   Submitted by:   Adam Strohl <adams-ports@ateamsystems.com>
   Approved by:    maintainer timeout (till@php.net, >14 days)
   
   Revision  Changes    Path
   1.21      +35 -11    ports/databases/couchdb/Makefile
   1.8       +2 -2      ports/databases/couchdb/distinfo
   1.11      +3 -1      ports/databases/couchdb/files/couchdb.in
   1.1       +30 -0     ports/databases/couchdb/files/pkg-message.in (new)
   1.2       +2 -2      ports/databases/couchdb/pkg-deinstall
   1.4       +3 -3      ports/databases/couchdb/pkg-install
   1.2       +0 -8      ports/databases/couchdb/pkg-message (dead)
   1.7       +85 -45    ports/databases/couchdb/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168923: commit references a PR
Date: Mon,  2 Jul 2012 21:36:57 +0000 (UTC)

 crees       2012-07-02 21:36:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    UPDATING 
     databases/couchdb    Makefile 
   Log:
   Document upgrade procedure for couchdb to avoid loss of local.ini file.
   
   Correct date in Makefile's reference to UPDATING entry.
   
   PR:             ports/168923
   
   Revision  Changes    Path
   1.1261    +13 -1     ports/UPDATING
   1.22      +1 -1      ports/databases/couchdb/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
