Ticket #37641: couchdb-devel-git-migration.3.patch

Portfile

@@ -6 +6 @@
 
 name                couchdb-devel
 conflicts           couchdb
-svn.revision        1177555
-version             1.3.0a${svn.revision}
-revision            1
+version             1.4.0a-20130215
 
 categories          databases
 platforms           darwin
@@ -23 +21 @@
         improve scalability and to relax users' lives.
 
 homepage            http://couchdb.apache.org/
-master_sites        ${homepage}
 
-distname            couchdb-${version}
-fetch.type          svn
-svn.url             http://svn.apache.org/repos/asf/couchdb/trunk
-worksrcdir          trunk
+fetch.type          git
+git.url             https://git-wip-us.apache.org/repos/asf/couchdb.git
+git.branch          6beb66c7179cca8b578934b6c4b6f47437e0c663
 
+depends_build       port:pkgconfig \
+                    port:autoconf-archive
+
 depends_lib     port:automake \
     port:autoconf \
     port:libtool \
@@ -51 +50 @@
     system "cd ${worksrcpath}; ./bootstrap"
 }
 
+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}${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.
@@ -83 +98 @@
 "
 
 livecheck.type  regex
-livecheck.url   http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/
-livecheck.version       ${svn.revision}
-livecheck.regex  (\[0-9\]+)
+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>
+
+

files/patch-automake-1.13.diff

@@ -1 @@
---- 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 () {

files/patch-configure.ac.diff

@@ -1 @@
---- 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 @@
+--- configure.ac.orig   2013-01-15 08:45:09.000000000 -0600
++++ configure.ac        2013-01-15 08:45:25.000000000 -0600
+@@ -433,10 +433,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=`\
+-    ${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?])
+     AC_MSG_ERROR([Could not find the Erlang crypto library.

files/patch-src-couchdb-priv-Makefile.am.diff

@@ -1 +1 @@
 --- 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)