Revision
95988
Author
blair@macports.org
Date
2012-07-27 09:53:01 -0700 (Fri, 27 Jul 2012)

Log Message

thrift-devel: update to r1366428 which adds --with-qt4 configure support.

Modified Paths

Diff

Modified: trunk/dports/devel/thrift-devel/Portfile (95987 => 95988)


--- trunk/dports/devel/thrift-devel/Portfile	2012-07-27 15:51:09 UTC (rev 95987)
+++ trunk/dports/devel/thrift-devel/Portfile	2012-07-27 16:53:01 UTC (rev 95988)
@@ -5,8 +5,7 @@
 
 name            thrift-devel
 conflicts       thrift
-version         1365183
-revision        1
+version         1366428
 categories      devel
 license         Apache-2
 maintainers     gmail.com:naoya.n blair openmaintainer
@@ -35,13 +34,6 @@
 depends_lib-append  port:openssl
 
 pre-configure {
-    # Currently the only way to disable detecting qt4-mac is by
-    # requiring a non-existent version of QtCore. See
-    # https://issues.apache.org/jira/browse/THRIFT-1661 .
-    if {![variant_isset qt4]} {
-        reinplace "s|QtCore >= 4|QtCore >= 99|g" ${worksrcpath}/configure.ac
-    }
-
     system "cd ${worksrcpath} && ./bootstrap.sh"
 
     # Remove when https://issues.apache.org/jira/browse/THRIFT-1614 is
@@ -61,6 +53,7 @@
                 --with-php=no \
                 --with-php_extension=no \
                 --with-python=no \
+                --with-qt4=no \
                 --with-ruby=no
 
 variant java description "enable the Java library" {
@@ -112,6 +105,8 @@
 
 # See https://issues.apache.org/jira/browse/THRIFT-1348.
 variant qt4 description "enable non-blocking thrift server for use within Qt" {
+    configure.args-delete   --with-qt4=no
+    configure.args-append   --with-qt4=yes
     depends_lib-append      port:qt4-mac
 }