Tue May 6 13:50:13 2014 UTC ()
Update couchdb to 1.5.1.

Changes since 1.5.0:
- Add the max_count option (UUIDs Configuration) to allow rate-limiting
  the amount of UUIDs that can be requested from the /_uuids handler
  in a single request.


(fhajny)
diff -r1.25 -r1.26 pkgsrc/databases/couchdb/Makefile
diff -r1.8 -r1.9 pkgsrc/databases/couchdb/distinfo
cvs diff -r1.25 -r1.26 pkgsrc/databases/couchdb/Makefile (switch to unified diff)

--- pkgsrc/databases/couchdb/Makefile 2014/04/09 07:27:03 1.25
+++ pkgsrc/databases/couchdb/Makefile 2014/05/06 13:50:13 1.26
@@ -1,99 +1,98 @@ @@ -1,99 +1,98 @@
1# $NetBSD: Makefile,v 1.25 2014/04/09 07:27:03 obache Exp $ 1# $NetBSD: Makefile,v 1.26 2014/05/06 13:50:13 fhajny Exp $
2# 2#
3 3
4DISTNAME= apache-couchdb-1.5.0 4DISTNAME= apache-couchdb-1.5.1
5PKGNAME= ${DISTNAME:S/apache-//} 5PKGNAME= ${DISTNAME:S/apache-//}
6PKGREVISION= 2 
7CATEGORIES= databases 6CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
9 8
10MAINTAINER= filip@joyent.com 9MAINTAINER= filip@joyent.com
11HOMEPAGE= http://couchdb.apache.org/ 10HOMEPAGE= http://couchdb.apache.org/
12COMMENT= Document database server, accessible via a RESTful JSON API 11COMMENT= Document database server, accessible via a RESTful JSON API
13LICENSE= apache-2.0 12LICENSE= apache-2.0
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19INFO_FILES= yes 18INFO_FILES= yes
20BUILD_DEFS+= VARBASE 19BUILD_DEFS+= VARBASE
21 20
22BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man 21BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man
23 22
24.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
25 24
26COUCH_DBDIR?= ${VARBASE}/db/couchdb 25COUCH_DBDIR?= ${VARBASE}/db/couchdb
27COUCH_EGDIR= ${PREFIX}/share/examples/couchdb 26COUCH_EGDIR= ${PREFIX}/share/examples/couchdb
28COUCH_LOGDIR?= ${VARBASE}/log/couchdb 27COUCH_LOGDIR?= ${VARBASE}/log/couchdb
29COUCH_USER?= couchdb 28COUCH_USER?= couchdb
30COUCH_GROUP?= ${COUCH_USER} 29COUCH_GROUP?= ${COUCH_USER}
31 30
32PKG_GROUPS+= ${COUCH_GROUP} 31PKG_GROUPS+= ${COUCH_GROUP}
33PKG_USERS+= ${COUCH_USER}:${COUCH_GROUP} 32PKG_USERS+= ${COUCH_USER}:${COUCH_GROUP}
34PKG_GECOS.${COUCH_USER}=CouchDB Server User 33PKG_GECOS.${COUCH_USER}=CouchDB Server User
35PKG_HOME.${COUCH_USER}= ${COUCH_DBDIR} 34PKG_HOME.${COUCH_USER}= ${COUCH_DBDIR}
36PKG_SHELL.${COUCH_USER}=${COMMAND_SHELL} 35PKG_SHELL.${COUCH_USER}=${COMMAND_SHELL}
37 36
38# Solaris /var/run is root only 37# Solaris /var/run is root only
39.if ${OPSYS} == "SunOS" 38.if ${OPSYS} == "SunOS"
40COUCH_RUNDIR?= ${VARBASE}/spool/couchdb 39COUCH_RUNDIR?= ${VARBASE}/spool/couchdb
41.else 40.else
42COUCH_RUNDIR?= ${VARBASE}/run/couchdb 41COUCH_RUNDIR?= ${VARBASE}/run/couchdb
43.endif 42.endif
44 43
45FILES_SUBST+= COUCH_USER=${COUCH_USER} 44FILES_SUBST+= COUCH_USER=${COUCH_USER}
46FILES_SUBST+= COUCH_GROUP=${COUCH_GROUP} 45FILES_SUBST+= COUCH_GROUP=${COUCH_GROUP}
47FILES_SUBST+= COUCH_DBDIR=${COUCH_DBDIR} 46FILES_SUBST+= COUCH_DBDIR=${COUCH_DBDIR}
48 47
49OWN_DIRS= ${COUCH_LOGDIR} ${COUCH_DBDIR} ${COUCH_RUNDIR} ${PKG_SYSCONFDIR} 48OWN_DIRS= ${COUCH_LOGDIR} ${COUCH_DBDIR} ${COUCH_RUNDIR} ${PKG_SYSCONFDIR}
50OWN_DIRS_PERMS+= ${COUCH_DBDIR} ${COUCH_USER} ${COUCH_GROUP} 0770 49OWN_DIRS_PERMS+= ${COUCH_DBDIR} ${COUCH_USER} ${COUCH_GROUP} 0770
51OWN_DIRS_PERMS+= ${COUCH_LOGDIR} ${COUCH_USER} ${COUCH_GROUP} 0770 50OWN_DIRS_PERMS+= ${COUCH_LOGDIR} ${COUCH_USER} ${COUCH_GROUP} 0770
52OWN_DIRS_PERMS+= ${COUCH_RUNDIR} ${COUCH_USER} ${COUCH_GROUP} 0770 51OWN_DIRS_PERMS+= ${COUCH_RUNDIR} ${COUCH_USER} ${COUCH_GROUP} 0770
53 52
54PKG_SYSCONFSUBDIR= couchdb 53PKG_SYSCONFSUBDIR= couchdb
55PKG_SYSCONFDIR_PERMS= ${COUCH_USER} ${COUCH_GROUP} 0775 54PKG_SYSCONFDIR_PERMS= ${COUCH_USER} ${COUCH_GROUP} 0775
56CONF_FILES_PERMS+= ${COUCH_EGDIR}/default.ini ${PKG_SYSCONFDIR}/default.ini ${COUCH_USER} ${COUCH_GROUP} 0660 55CONF_FILES_PERMS+= ${COUCH_EGDIR}/default.ini ${PKG_SYSCONFDIR}/default.ini ${COUCH_USER} ${COUCH_GROUP} 0660
57CONF_FILES_PERMS+= ${COUCH_EGDIR}/local.ini ${PKG_SYSCONFDIR}/local.ini ${COUCH_USER} ${COUCH_GROUP} 0660 56CONF_FILES_PERMS+= ${COUCH_EGDIR}/local.ini ${PKG_SYSCONFDIR}/local.ini ${COUCH_USER} ${COUCH_GROUP} 0660
58 57
59CONFIGURE_ARGS+= --disable-init 58CONFIGURE_ARGS+= --disable-init
60CONFIGURE_ARGS+= --localstatedir=${VARBASE} 59CONFIGURE_ARGS+= --localstatedir=${VARBASE}
61CONFIGURE_ARGS+= --with-erlang=${BUILDLINK_PREFIX.erlang}/lib/erlang/usr/include 60CONFIGURE_ARGS+= --with-erlang=${BUILDLINK_PREFIX.erlang}/lib/erlang/usr/include
62CONFIGURE_ARGS+= --with-js-include=${BUILDLINK_PREFIX.spidermonkey} 61CONFIGURE_ARGS+= --with-js-include=${BUILDLINK_PREFIX.spidermonkey}
63CONFIGURE_ARGS+= --with-js-lib=${BUILDLINK_PREFIX.spidermonkey} 62CONFIGURE_ARGS+= --with-js-lib=${BUILDLINK_PREFIX.spidermonkey}
64 63
65.if ${OPSYS} == "SunOS" 64.if ${OPSYS} == "SunOS"
66REPLACE_INTERPRETER+= sh 65REPLACE_INTERPRETER+= sh
67REPLACE.sh.old= /bin/sh 66REPLACE.sh.old= /bin/sh
68REPLACE.sh.new= /bin/ksh 67REPLACE.sh.new= /bin/ksh
69REPLACE_FILES.sh= bin/couchdb.tpl.in 68REPLACE_FILES.sh= bin/couchdb.tpl.in
70.endif 69.endif
71 70
72SUBST_CLASSES+= paths 71SUBST_CLASSES+= paths
73SUBST_MESSAGE.paths= Setting standard paths 72SUBST_MESSAGE.paths= Setting standard paths
74SUBST_STAGE.paths= pre-configure 73SUBST_STAGE.paths= pre-configure
75SUBST_FILES.paths+= configure bin/couchdb.tpl.in 74SUBST_FILES.paths+= configure bin/couchdb.tpl.in
76SUBST_VARS.paths= COUCH_EGDIR COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR 75SUBST_VARS.paths= COUCH_EGDIR COUCH_DBDIR COUCH_LOGDIR COUCH_RUNDIR
77SUBST_SED.paths= -e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g' 76SUBST_SED.paths= -e 's,@ERLANG_PREFIX@,${BUILDLINK_PREFIX.erlang},g'
78 77
79# This works around libtool abuse installing "couchspawnkillable". Will 78# This works around libtool abuse installing "couchspawnkillable". Will
80# hopefully get fixed properly upstream. 79# hopefully get fixed properly upstream.
81SUBST_CLASSES+= unstrip 80SUBST_CLASSES+= unstrip
82SUBST_MESSAGE.unstrip= Avoiding trying to strip a shell script 81SUBST_MESSAGE.unstrip= Avoiding trying to strip a shell script
83SUBST_STAGE.unstrip= post-configure 82SUBST_STAGE.unstrip= post-configure
84SUBST_FILES.unstrip+= src/couchdb/priv/Makefile 83SUBST_FILES.unstrip+= src/couchdb/priv/Makefile
85SUBST_SED.unstrip= -e '/^INSTALL_PROGRAM =/s, -s,,' 84SUBST_SED.unstrip= -e '/^INSTALL_PROGRAM =/s, -s,,'
86 85
87PLIST_SUBST+= VERSION.ejson=${VERSION.ejson} 86PLIST_SUBST+= VERSION.ejson=${VERSION.ejson}
88PLIST_SUBST+= VERSION.ibrowse=${VERSION.ibrowse} 87PLIST_SUBST+= VERSION.ibrowse=${VERSION.ibrowse}
89PLIST_SUBST+= VERSION.mochiweb=${VERSION.mochiweb} 88PLIST_SUBST+= VERSION.mochiweb=${VERSION.mochiweb}
90PLIST_SUBST+= VERSION.snappy=${VERSION.snappy} 89PLIST_SUBST+= VERSION.snappy=${VERSION.snappy}
91 90
92.include "Makefile.versions" 91.include "Makefile.versions"
93 92
94.include "../../lang/erlang/buildlink3.mk" 93.include "../../lang/erlang/buildlink3.mk"
95.include "../../lang/spidermonkey/buildlink3.mk" 94.include "../../lang/spidermonkey/buildlink3.mk"
96.include "../../security/openssl/buildlink3.mk" 95.include "../../security/openssl/buildlink3.mk"
97.include "../../textproc/icu/buildlink3.mk" 96.include "../../textproc/icu/buildlink3.mk"
98.include "../../www/curl/buildlink3.mk" 97.include "../../www/curl/buildlink3.mk"
99.include "../../mk/bsd.pkg.mk" 98.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/databases/couchdb/distinfo (switch to unified diff)

--- pkgsrc/databases/couchdb/distinfo 2014/01/02 17:10:22 1.8
+++ pkgsrc/databases/couchdb/distinfo 2014/05/06 13:50:13 1.9
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.8 2014/01/02 17:10:22 fhajny Exp $ 1$NetBSD: distinfo,v 1.9 2014/05/06 13:50:13 fhajny Exp $
2 2
3SHA1 (apache-couchdb-1.5.0.tar.gz) = 283e4bbd4f1727bb334a67d2f988a7d412523bef 3SHA1 (apache-couchdb-1.5.1.tar.gz) = 5340c79f8f9e11742b723f92e2251d4d59b8247c
4RMD160 (apache-couchdb-1.5.0.tar.gz) = 2290505dffd234a809441da61adde51bdd9f0f56 4RMD160 (apache-couchdb-1.5.1.tar.gz) = 98b26123c05ddaade3f06d45dab5137c35e3e12b
5Size (apache-couchdb-1.5.0.tar.gz) = 11594978 bytes 5Size (apache-couchdb-1.5.1.tar.gz) = 11601057 bytes
6SHA1 (patch-aa) = 2e3d48a1fc7650c04e640420155d2a68d5bbfaba 6SHA1 (patch-aa) = 2e3d48a1fc7650c04e640420155d2a68d5bbfaba
7SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a 7SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
8SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872 8SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872
9SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92 9SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92
10SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e 10SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e