[32265] trunk/dports/gnustep/gnustep-base/Portfile

[ryandesign at macports.org]

Revision: 32265
          http://trac.macosforge.org/projects/macports/changeset/32265
Author:   ryandesign at macports.org
Date:     2007-12-23 04:30:16 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
gnustep-base: use ffi by default now instead of ffcall because ffcall doesn't seem to work properly as of Mac OS X 10.4; see #13693

Modified Paths:
--------------
    trunk/dports/gnustep/gnustep-base/Portfile

Modified: trunk/dports/gnustep/gnustep-base/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-base/Portfile	2007-12-23 12:23:52 UTC (rev 32264)
+++ trunk/dports/gnustep/gnustep-base/Portfile	2007-12-23 12:30:16 UTC (rev 32265)
@@ -21,8 +21,7 @@
 
 checksums           md5 10a24a5568c5505c4b7480f170733d4d
 
-depends_lib         port:ffcall \
-                    port:gnustep-make \
+depends_lib         port:gnustep-make \
                     port:libxslt \
                     port:openssl
 
@@ -61,13 +60,25 @@
     "kill -9 `cat ${my_pid}` && \\" \
     "rm -f ${my_pid}"
 
-variant with_ffi {
+
+if { ![variant_isset ffcall] } {
+    default_variants +ffi
+}
+
+variant ffi description conflicts ffcall {Build with ffi (default)} {
+    depends_lib-append port:libffi
     configure.args-append \
-   	    --enable-libffi \
-   	    --with-ffi-include=${prefix}/include/gcc42 \
+        --enable-libffi \
+        --with-ffi-include=${prefix}/include/gcc42 \
         --with-ffi-library=${prefix}/lib/gcc42
 }
 
+variant ffcall conflicts ffi description {Build with ffcall} {
+    depends_lib-append port:ffcall
+    configure.args-append \
+        --enable-ffcall
+}
+
 platform darwin {
     post-destroot {
         set system_dir ${destroot}${prefix}/GNUstep/System

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071223/3414688a/attachment.html