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

File couchdb-devel-git-migration.patch, 4.2 KB (added by jeff-macports@…, 12 years ago)

Missed pkgconfig as a dependency.

  • Portfile

     
    66
    77name                couchdb-devel
    88conflicts           couchdb
    9 svn.revision        1177555
    10 version             1.3.0a${svn.revision}
    11 revision            1
     9version             1.4.0a-20130112
    1210
    1311categories          databases
    1412platforms           darwin
     
    2220        improve scalability and to relax users' lives.
    2321
    2422homepage            http://couchdb.apache.org/
    25 master_sites        ${homepage}
    2623
    27 distname            couchdb-${version}
    28 fetch.type          svn
    29 svn.url             http://svn.apache.org/repos/asf/couchdb/trunk
    30 worksrcdir          trunk
     24fetch.type          git
     25git.url             https://git-wip-us.apache.org/repos/asf/couchdb.git
     26git.branch          fd4b78671c4367f4f6469156e428176648c07a76
    3127
     28depends_build       port:pkgconfig \
     29                    port:autoconf-archive
     30
    3231depends_lib     port:automake \
    3332    port:autoconf \
    3433    port:libtool \
     
    8281"
    8382
    8483livecheck.type  regex
    85 livecheck.url   http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/
    86 livecheck.version       ${svn.revision}
    87 livecheck.regex  (\[0-9\]+)
     84livecheck.url       "https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commit;h=refs/heads/master"
     85livecheck.version   ${git.branch}
     86livecheck.regex     <tr><td>commit</td><td class="sha1">(\[a-f0-9\]{40})</td></tr>
     87
     88
  • files/patch-automake-1.13.diff

     
    1 --- configure.ac.orig   2011-09-15 10:44:37.000000000 -0500
    2 +++ configure.ac        2013-01-14 01:35:34.000000000 -0600
    3 @@ -18,8 +18,7 @@
    4  AC_CONFIG_AUX_DIR([build-aux])
    5  AC_CONFIG_MACRO_DIR([m4])
     1--- bootstrap.orig      2013-01-15 08:43:05.000000000 -0600
     2+++ bootstrap   2013-01-15 08:42:39.000000000 -0600
     3@@ -84,9 +84,9 @@
     4 }
    65 
    7 -AM_CONFIG_HEADER([config.h])
    8 -AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h])
    9 +AC_CONFIG_HEADERS([config.h src/snappy/google-snappy/config.h])
     6 LIBTOOLIZE=`find_program glibtoolize libtoolize`
     7-ACLOCAL=`find_program aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
     8+ACLOCAL=`find_program aclocal-1.13 aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
     9 AUTOHEADER=`find_program autoheader`
     10-AUTOMAKE=`find_program automake-1.11 automake-1.10 automake-1.9 automake`
     11+AUTOMAKE=`find_program automake-1.13 automake-1.11 automake-1.10 automake-1.9 automake`
     12 AUTOCONF=`find_program autoconf`
    1013 
    11  AM_INIT_AUTOMAKE([1.6.3 foreign])
    12  
     14 get_aclocal_dir_list () {
  • files/patch-configure.ac.diff

     
    1 --- configure.ac.orig   2011-09-15 10:44:37.000000000 -0500
    2 +++ configure.ac        2013-01-14 02:18:15.000000000 -0600
    3 @@ -349,7 +348,7 @@
     1--- configure.ac.orig   2013-01-15 08:45:09.000000000 -0600
     2+++ configure.ac        2013-01-15 08:45:25.000000000 -0600
     3@@ -433,10 +433,7 @@
    44 AM_CONDITIONAL([USE_OTP_NIFS], [test x$otp_release \> xR13B03])
    55 AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], [test x$otp_release \> xR14B03])
    66 
    7 -has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
     7-has_crypto=`\
     8-    ${ERL} -eval "\
     9-        case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end. \
     10-    " -noshell -s init stop`
    811+has_crypto=""
    912 
    1013 if test -n "$has_crypto"; then
    11      AC_MSG_ERROR([Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?])
     14     AC_MSG_ERROR([Could not find the Erlang crypto library.
  • files/patch-src-couchdb-priv-Makefile.am.diff

     
    11--- src/couchdb/priv/Makefile.am.orig   2011-09-01 23:03:05.000000000 -0500
    22+++ src/couchdb/priv/Makefile.am        2013-01-14 05:13:47.000000000 -0600
    3 @@ -55,7 +55,7 @@
     3@@ -70,7 +70,7 @@
    44 
    55 locallibbin_PROGRAMS = couchjs
    66 couchjs_SOURCES = $(COUCHJS_SRCS)