Modified: trunk/dports/databases/couchdb/Portfile (118444 => 118445)
--- trunk/dports/databases/couchdb/Portfile 2014-04-02 14:53:30 UTC (rev 118444)
+++ trunk/dports/databases/couchdb/Portfile 2014-04-02 14:54:18 UTC (rev 118445)
@@ -6,7 +6,7 @@
name couchdb
conflicts couchdb-devel
-version 1.4.0
+version 1.5.0
categories databases
platforms darwin
@@ -26,10 +26,11 @@
master_sites.mirror_subdir ${name}/source/${version}/
distname apache-${name}-${version}
-checksums rmd160 7276842985f3126bee711398dd9b7c837683183d \
- sha256 bdbb9c35c2738ae0fe63280bd818a50443253f3db2184f8b9c386e5615ae02b5
+checksums rmd160 2290505dffd234a809441da61adde51bdd9f0f56 \
+ sha256 abbdb2a6433124a4a4b902856f6a8a070d53bf7a55faa7aa8b6feb7127638fef
-depends_build port:help2man
+depends_build port:help2man \
+ port:pkgconfig
depends_lib port:icu \
port:spidermonkey185 \
@@ -40,15 +41,13 @@
universal_variant no
patchfiles patch-etc-launchd-org.apache.couchdb.plist.tpl.in.diff \
+ patch-support-dual-spidermonkey.diff \
patch-src-couchdb-priv-Makefile.in.diff
require_active_variants erlang ssl
-configure.cppflags -I${prefix}/include/mozjs185 -I${prefix}/include
+configure.args --enable-js-trunk
-configure.args --with-erlang=${prefix}/lib/erlang/usr/include \
- --enable-js-trunk
-
set dbgroup couchdb
set dbuser couchdb
set logdir ${prefix}/var/log/couchdb
Added: trunk/dports/databases/couchdb/files/patch-support-dual-spidermonkey.diff (0 => 118445)
--- trunk/dports/databases/couchdb/files/patch-support-dual-spidermonkey.diff (rev 0)
+++ trunk/dports/databases/couchdb/files/patch-support-dual-spidermonkey.diff 2014-04-02 14:54:18 UTC (rev 118445)
@@ -0,0 +1,14 @@
+--- ../apache-couchdb-1.5.0.orig/configure 2013-10-20 02:38:47.000000000 -0700
++++ ./configure 2013-11-11 19:55:07.000000000 -0800
+@@ -17411,11 +17411,8 @@
+ *) :
+
+ CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+- CPPFLAGS="$CPPFLAGS -I/opt/local/include/js"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+- CPPFLAGS="$CPPFLAGS -I/usr/local/include/js"
+ CPPFLAGS="$CPPFLAGS -I/usr/include"
+- CPPFLAGS="$CPPFLAGS -I/usr/include/js"
+ LDFLAGS="$LDFLAGS -L/opt/local/lib"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ ;; #(