[78823] trunk/dports/devel/libsdl/Portfile

jmr at macports.org jmr at macports.org
Mon May 23 14:43:17 PDT 2011


Revision: 78823
          http://trac.macports.org/changeset/78823
Author:   jmr at macports.org
Date:     2011-05-23 14:43:17 -0700 (Mon, 23 May 2011)
Log Message:
-----------
libsdl: replace no_x11 variant with default +x11

Modified Paths:
--------------
    trunk/dports/devel/libsdl/Portfile

Modified: trunk/dports/devel/libsdl/Portfile
===================================================================
--- trunk/dports/devel/libsdl/Portfile	2011-05-23 21:40:42 UTC (rev 78822)
+++ trunk/dports/devel/libsdl/Portfile	2011-05-23 21:43:17 UTC (rev 78823)
@@ -32,43 +32,41 @@
                     sha1    ba625b4b404589b97e92d7acd165992debe576dd \
                     rmd160  a3a9a691f5510eb5327ca159a034f55a70cb5801
 
-depends_lib \
-    port:xorg-libXext \
-    port:xorg-libXrandr \
-    port:xrender
-
 minimum_xcodeversions {8 2.4.1}
 
 patchfiles      cpuinfo.diff patch-SDL_x11gl_c.h.diff
 
 configure.args  --enable-shared \
                 --mandir=${prefix}/share/man \
-                --x-include=${prefix}/include \
-                --x-lib=${prefix}/lib \
-                --disable-nasm
+                --disable-nasm \
+                --without-x
 
-variant no_x11 {
-        configure.args-delete --x-include=${prefix}/include \
-                              --x-lib=${prefix}/lib
-        configure.args-append --without-x
-        depends_lib-delete \
-            port:xorg-libXext \
-            port:xorg-libXrandr \
-            port:xrender
+variant x11 conflicts no_x11 description {Enable support for X11} {
+    configure.args-delete --without-x
+    configure.args-append --x-include=${prefix}/include \
+                          --x-lib=${prefix}/lib
+    depends_lib-append \
+        port:xorg-libXext \
+        port:xorg-libXrandr \
+        port:xrender
+
+    post-configure {
+        foreach lib {libX11.6 libXext.6 libXrandr.2 libXrender.1} {
+            reinplace "/${lib}.dylib/s|\".*\"|\"${prefix}/lib/${lib}.dylib\"|" \
+                ${worksrcpath}/include/SDL_config.h
+        }
+    }
 }
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+if {![variant_isset no_x11]} {
+    default_variants +x11
+}
 
 use_parallel_build  yes
 
 post-configure {
     # not just for universal, ppc endianness detection is also broken
     system "cd ${worksrcpath} && ed - ./include/SDL_config.h < ${filespath}/include_SDL_config.h.ed"
-    
-    if {![variant_isset no_x11]} {
-        set sdl_config_h "${worksrcpath}/include/SDL_config.h"
-        foreach lib {libX11.6 libXext.6 libXrandr.2 libXrender.1} {
-            reinplace "/${lib}.dylib/s|\".*\"|\"${prefix}/lib/${lib}.dylib\"|" ${sdl_config_h}
-        }
-    }
 }
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110523/6ce958d2/attachment.html>


More information about the macports-changes mailing list