[104096] trunk/dports/databases/couchdb-devel
larryv at macports.org
larryv at macports.org
Fri Mar 15 14:36:37 PDT 2013
Revision: 104096
https://trac.macports.org/changeset/104096
Author: larryv at macports.org
Date: 2013-03-15 14:36:37 -0700 (Fri, 15 Mar 2013)
Log Message:
-----------
couchdb-devel: Update to 1.4.0a-20130227, etc (#37641).
Modified Paths:
--------------
trunk/dports/databases/couchdb-devel/Portfile
trunk/dports/databases/couchdb-devel/files/patch-automake-1.13.diff
trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff
trunk/dports/databases/couchdb-devel/files/patch-src-couchdb-priv-Makefile.am.diff
Modified: trunk/dports/databases/couchdb-devel/Portfile
===================================================================
--- trunk/dports/databases/couchdb-devel/Portfile 2013-03-15 19:36:55 UTC (rev 104095)
+++ trunk/dports/databases/couchdb-devel/Portfile 2013-03-15 21:36:37 UTC (rev 104096)
@@ -1,49 +1,48 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
-PortGroup active_variants 1.1
+PortSystem 1.0
+PortGroup active_variants 1.1
-name couchdb-devel
-conflicts couchdb
-svn.revision 1177555
-version 1.3.0a${svn.revision}
-revision 1
+name couchdb-devel
+conflicts couchdb
+version 1.4.0a-20130227
-categories databases
-platforms darwin
+categories databases
+platforms darwin
-description CouchDB is a document database server
-maintainers jsnider.net:jeff \
- openmaintainer
-long_description ${description} with a restful HTTP API, capable of \
- storing arbitrary JSON documents, building powerful data views, \
- defined in JavaScript, and processed in parallel using Map/Reduce. \
- It leaves out SQL and transactions for simplicity's sake, to \
- improve scalability and to relax users' lives.
+description CouchDB is a document database server
+maintainers jsnider.net:jeff \
+ openmaintainer
+long_description ${description} with a restful HTTP API, capable of \
+ storing arbitrary JSON documents, building powerful data views, \
+ defined in JavaScript, and processed in parallel using Map/Reduce. \
+ It leaves out SQL and transactions for simplicity's sake, to \
+ improve scalability and to relax users' lives.
+homepage http://couchdb.apache.org/
+license Apache-2
-homepage http://couchdb.apache.org/
-master_sites ${homepage}
+fetch.type git
+git.url https://git-wip-us.apache.org/repos/asf/couchdb.git
+git.branch 5917dd80bce470f38b9b83bde46666324487a9b1
-distname couchdb-${version}
-fetch.type svn
-svn.url http://svn.apache.org/repos/asf/couchdb/trunk
-worksrcdir trunk
+depends_build port:automake \
+ port:autoconf \
+ port:libtool \
+ port:help2man \
+ port:pkgconfig \
+ port:autoconf-archive
-depends_lib port:automake \
- port:autoconf \
- port:libtool \
- port:help2man \
- port:icu \
- port:spidermonkey \
- port:erlang
+depends_lib port:icu \
+ port:spidermonkey \
+ port:erlang \
+ port:curl
# erlang is not universal
-universal_variant no
+universal_variant no
-patchfiles patch-automake-1.13.diff \
- patch-configure.ac.diff \
- patch-src-couchdb-priv-Makefile.am.diff
+patchfiles patch-automake-1.13.diff \
+ patch-src-couchdb-priv-Makefile.am.diff
require_active_variants erlang ssl
@@ -51,38 +50,53 @@
system "cd ${worksrcpath}; ./bootstrap"
}
-set dbgroup couchdb
-set dbuser couchdb
-set logdir ${prefix}/var/log/couchdb
-set dbdir ${prefix}/var/lib/couchdb
-set plistdir /Library/LaunchDaemons
-startupitem.uniquename org.apache.couchdb
-set plist ${startupitem.uniquename}.plist
+configure.args --with-js-include=${prefix}/include/js \
+ --with-erlang=${prefix}/lib/erlang/usr/include \
+ --enable-js-trunk
+set dbgroup couchdb
+set dbuser couchdb
+set logdir ${prefix}/var/log/couchdb
+set dbdir ${prefix}/var/lib/couchdb
+set confdir ${prefix}/etc/couchdb
+set rundir ${prefix}/var/run/couchdb
+set plistdir /Library/LaunchDaemons
+startupitem.uniquename org.apache.couchdb
+set plist ${startupitem.uniquename}.plist
+
+add_users ${dbuser} group=${dbgroup}
+
post-destroot {
- addgroup ${dbgroup}
- adduser ${dbuser} gid=[existsgroup ${dbgroup}]
+ move ${destroot}${confdir}/local.ini ${destroot}${confdir}/local.ini.sample
xinstall -m 755 -o ${dbuser} -g ${dbgroup} -d \
- ${destroot}${dbdir} \
- ${destroot}${logdir} \
- ${destroot}${plistdir}
+ ${destroot}${dbdir} \
+ ${destroot}${logdir} \
+ ${destroot}${plistdir} \
+ ${destroot}${rundir}
destroot.keepdirs-append \
${destroot}${dbdir} \
- ${destroot}${logdir}
+ ${destroot}${logdir} \
+ ${destroot}${rundir}
system "cd ${destroot}${plistdir} && ln -sf ${prefix}${plistdir}/${plist}"
}
+post-activate {
+ if {![file exists ${confdir}/local.ini]} {
+ xinstall -m 640 -o ${dbuser} -g ${dbgroup} ${confdir}/local.ini.sample ${confdir}/local.ini
+ }
+}
+
+
notes "
-Changes in CouchDB r753448 make older database files incompatible.\
-See http://wiki.apache.org/couchdb/BreakingChanges for details.
-
Run the following command to load the CouchDB launchd plist\
in order to start the service now and at system startup:
-sudo launchctl load -w ${plistdir}/${plist}
+sudo port load couchdb
"
-livecheck.type regex
-livecheck.url http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/
-livecheck.version ${svn.revision}
-livecheck.regex (\[0-9\]+)
+livecheck.type regex
+livecheck.url "https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commit;h=refs/heads/master"
+livecheck.version ${git.branch}
+livecheck.regex <tr><td>commit</td><td class="sha1">(\[a-f0-9\]{40})</td></tr>
+
+
Modified: trunk/dports/databases/couchdb-devel/files/patch-automake-1.13.diff
===================================================================
--- trunk/dports/databases/couchdb-devel/files/patch-automake-1.13.diff 2013-03-15 19:36:55 UTC (rev 104095)
+++ trunk/dports/databases/couchdb-devel/files/patch-automake-1.13.diff 2013-03-15 21:36:37 UTC (rev 104096)
@@ -1,12 +1,14 @@
---- configure.ac.orig 2011-09-15 10:44:37.000000000 -0500
-+++ configure.ac 2013-01-14 01:35:34.000000000 -0600
-@@ -18,8 +18,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
+--- bootstrap.orig 2013-01-15 08:43:05.000000000 -0600
++++ bootstrap 2013-01-15 08:42:39.000000000 -0600
+@@ -84,9 +84,9 @@
+ }
--AM_CONFIG_HEADER([config.h])
--AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h])
-+AC_CONFIG_HEADERS([config.h src/snappy/google-snappy/config.h])
+ LIBTOOLIZE=`find_program glibtoolize libtoolize`
+-ACLOCAL=`find_program aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
++ACLOCAL=`find_program aclocal`
+ AUTOHEADER=`find_program autoheader`
+-AUTOMAKE=`find_program automake-1.11 automake-1.10 automake-1.9 automake`
++AUTOMAKE=`find_program automake`
+ AUTOCONF=`find_program autoconf`
- AM_INIT_AUTOMAKE([1.6.3 foreign])
-
+ get_aclocal_dir_list () {
Modified: trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff 2013-03-15 19:36:55 UTC (rev 104095)
+++ trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff 2013-03-15 21:36:37 UTC (rev 104096)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2011-09-15 10:44:37.000000000 -0500
-+++ configure.ac 2013-01-14 02:18:15.000000000 -0600
-@@ -349,7 +348,7 @@
- AM_CONDITIONAL([USE_OTP_NIFS], [test x$otp_release \> xR13B03])
- AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], [test x$otp_release \> xR14B03])
-
--has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
-+has_crypto=""
-
- if test -n "$has_crypto"; then
- AC_MSG_ERROR([Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?])
Modified: trunk/dports/databases/couchdb-devel/files/patch-src-couchdb-priv-Makefile.am.diff
===================================================================
--- trunk/dports/databases/couchdb-devel/files/patch-src-couchdb-priv-Makefile.am.diff 2013-03-15 19:36:55 UTC (rev 104095)
+++ trunk/dports/databases/couchdb-devel/files/patch-src-couchdb-priv-Makefile.am.diff 2013-03-15 21:36:37 UTC (rev 104096)
@@ -1,6 +1,6 @@
--- src/couchdb/priv/Makefile.am.orig 2011-09-01 23:03:05.000000000 -0500
+++ src/couchdb/priv/Makefile.am 2013-01-14 05:13:47.000000000 -0600
-@@ -55,7 +55,7 @@
+@@ -70,7 +70,7 @@
locallibbin_PROGRAMS = couchjs
couchjs_SOURCES = $(COUCHJS_SRCS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130315/6bfe7f36/attachment.html>
More information about the macports-changes
mailing list