Updated databases/couchdb to 1.1.0.

Also fixed INSTALL_PROGRAM patch to not break install-sh.

Changes since 1.0.1
============================================================================

HTTP Interface:

 * Native SSL support.
 * Added support for HTTP range requests for attachments.
 * Added built-in filters for '_changes': '_doc_ids' and '_design'.
 * Added configuration option for TCP_NODELAY aka "Nagle".
 * Allow POSTing arguments to '_changes'.
 * Allow 'keys' parameter for GET requests to views.
 * Allow wildcards in vhosts definitions.
 * More granular ETag support for views.
 * More flexible URL rewriter.
 * Added support for recognizing "Q values" and media parameters in
   HTTP Accept headers.
 * Validate doc ids that come from a PUT to a URL.

Externals:

 * Added OS Process module to manage daemons outside of CouchDB.
 * Added HTTP Proxy handler for more scalable externals.

Replicator:

 * Added '_replicator' database to manage replications.
 * Fixed issues when an endpoint is a remote database accessible via SSL.
 * Added support for continuous by-doc-IDs replication.
 * Fix issue where revision info was omitted when replicating attachments.
 * Integrity of attachment replication is now verified by MD5.

Storage System:

 * Multiple micro-optimizations when reading data.

View Server:

 * Added CommonJS support to map functions.
 * Added 'stale=update_after' query option that triggers a view update after
   returning a 'stale=ok' response.
 * Warn about empty result caused by 'startkey' and 'endkey' limiting.
 * Built-in reduce function '_sum' now accepts lists of integers as input.
 * Added view query aliases start_key, end_key, start_key_doc_id and
   end_key_doc_id.

Futon:

 * Added a "change password"-feature to Futon.

URL Rewriter & Vhosts:

 * Fix for variable substituion

1 files changed, 7 insertions, 8 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index a269ec6b909..9fc7654de55 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2011/06/19 02:32:52 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/27 19:20:57 fhajny Exp $
 #
 
-DISTNAME=		apache-couchdb-1.0.1
+DISTNAME=		apache-couchdb-1.1.0
 PKGNAME=		${DISTNAME:S/apache-//}
-PKGREVISION=		3
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/1.0.1/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=couchdb/1.1.0/}
 
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://couchdb.apache.org/
@@ -14,8 +13,8 @@ LICENSE=		apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-VERSION.ibrowse=	1.5.2
-VERSION.mochiweb=	r113
+VERSION.ibrowse=	2.2.0
+VERSION.mochiweb=	7c2bc2
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c c++
@@ -72,7 +71,7 @@ REPLACE_FILES.sh=	bin/couchdb.tpl.in bin/couchjs.tpl.in
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
 SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths+=	configure
+SUBST_FILES.paths+=	configure bin/couchdb.tpl.in
 SUBST_SED.paths=	-e 's,@EGDIR@,${COUCH_EGDIR},g'
 SUBST_SED.paths+=	-e 's,@RUNDIR@,${COUCH_RUNDIR},g'
 SUBST_SED.paths+=	-e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g'
@@ -83,7 +82,7 @@ SUBST_CLASSES+=		unstrip
 SUBST_MESSAGE.unstrip=	Avoiding trying to strip a shell script
 SUBST_STAGE.unstrip=	post-configure
 SUBST_FILES.unstrip+=	src/couchdb/priv/Makefile
-SUBST_SED.unstrip=	-e '/^INSTALL_PROGRAM =/s,-s,,'
+SUBST_SED.unstrip=	-e '/^INSTALL_PROGRAM =/s, -s,,'
 
 PLIST_SUBST+=		VERSION.ibrowse=${VERSION.ibrowse}
 PLIST_SUBST+=		VERSION.mochiweb=${VERSION.mochiweb}