[101589] trunk/dports/databases

[ryandesign at macports.org]

Revision: 101589
          https://trac.macports.org/changeset/101589
Author:   ryandesign at macports.org
Date:     2013-01-14 02:33:50 -0800 (Mon, 14 Jan 2013)
Log Message:
-----------
couchdb, couchdb-devel: use require_active_variants to check for erlang +ssl

Modified Paths:
--------------
    trunk/dports/databases/couchdb/Portfile
    trunk/dports/databases/couchdb-devel/Portfile

Added Paths:
-----------
    trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2013-01-14 09:50:22 UTC (rev 101588)
+++ trunk/dports/databases/couchdb/Portfile	2013-01-14 10:33:50 UTC (rev 101589)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup active_variants 1.1
 
 name		couchdb
 version		1.2.0
@@ -40,14 +41,7 @@
 
 patchfiles          patch-configure.diff
 
-pre-configure {
-    file mkdir ${workpath}/home
-    # this check was copied from configure.ac
-    if {[catch {system -W ${workpath} "HOME=${workpath}/home ${prefix}/bin/erl -eval 'case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end.' -noshell -s init stop"}]} {
-        ui_error "${name} requires erlang to be installed with the +ssl variant"
-        return -code error "incompatible erlang installation"
-    }
-}
+require_active_variants erlang ssl
 
 configure.args   --with-js-include=${prefix}/include/js \
                  --with-erlang=${prefix}/lib/erlang/usr/include \

Modified: trunk/dports/databases/couchdb-devel/Portfile
===================================================================
--- trunk/dports/databases/couchdb-devel/Portfile	2013-01-14 09:50:22 UTC (rev 101588)
+++ trunk/dports/databases/couchdb-devel/Portfile	2013-01-14 10:33:50 UTC (rev 101589)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup active_variants 1.1
 
 name                couchdb-devel
 svn.revision        1177555
@@ -38,8 +39,11 @@
 # erlang is not universal
 universal_variant   no
 
-patchfiles          patch-automake-1.13.diff
+patchfiles          patch-automake-1.13.diff \
+                    patch-configure.ac.diff
 
+require_active_variants erlang ssl
+
 pre-configure {
     system "cd ${worksrcpath}; ./bootstrap"
 }

Added: trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/databases/couchdb-devel/files/patch-configure.ac.diff	2013-01-14 10:33:50 UTC (rev 101589)
@@ -0,0 +1,11 @@
+--- 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?])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130114/aa549b11/attachment.html>