[109903] users/mojca/wxports

[mojca at macports.org]

Revision: 109903
          https://trac.macports.org/changeset/109903
Author:   mojca at macports.org
Date:     2013-08-21 10:16:12 -0700 (Wed, 21 Aug 2013)
Log Message:
-----------
mojca/erlang: erlang seems to work with wxWidgets 2.9, esdl no longer needs the hack

Modified Paths:
--------------
    users/mojca/wxports/graphics/esdl/Portfile
    users/mojca/wxports/lang/erlang/Portfile

Modified: users/mojca/wxports/graphics/esdl/Portfile
===================================================================
--- users/mojca/wxports/graphics/esdl/Portfile	2013-08-21 16:12:17 UTC (rev 109902)
+++ users/mojca/wxports/graphics/esdl/Portfile	2013-08-21 17:16:12 UTC (rev 109903)
@@ -2,8 +2,6 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           wxWidgets 1.0
-PortGroup           active_variants 1.1
 
 name                esdl
 version             1.2
@@ -25,6 +23,7 @@
                     rmd160  fc1f37647ae8e9652413c0ba683743d43c149573
 
 depends_lib         port:libsdl \
+                    port:libsdl-framework \
                     port:erlang
 
 use_configure       no
@@ -37,22 +36,6 @@
     reinplace "s|LDFLAGS = -F/Library/Frameworks|LDFLAGS = -F${frameworks_dir} -F/Library/Frameworks|g" ${build.dir}/c_src/Makefile.macosx
 }
 
-platform darwin {
-    depends_lib-append port:libsdl-framework
-
-    # Once erlang gets ported to wxWidgets 3.0, this can go away.
-    variant wxwidgets description {Build 32-bit for compatibility with erlang +wxwidgets} {
-        wxWidgets.use           "wxWidgets-2.8"
-        depends_lib-append      port:${wxWidgets.port}
-        require_active_variants erlang wxwidgets
-    }
-    variant wxgtk28 description {Build with GTK for compatibility with erlang +wxgtk28} {
-        wxWidgets.use           "wxGTK-2.8"
-        depends_lib-append      port:${wxWidgets.port}
-        require_active_variants erlang wxgtk28
-    }
-}
-
 build.target
 destroot.destdir    DPORTSDIR=${destroot}
 

Modified: users/mojca/wxports/lang/erlang/Portfile
===================================================================
--- users/mojca/wxports/lang/erlang/Portfile	2013-08-21 16:12:17 UTC (rev 109902)
+++ users/mojca/wxports/lang/erlang/Portfile	2013-08-21 17:16:12 UTC (rev 109903)
@@ -118,31 +118,14 @@
     }
 }
 
-# TODO: if this works fine, delete all other wxwidgets options
-variant wxwidgets30 conflicts wxwidgets wxgtk28 description {Build wxWidgets 2.9 support} {
+variant wxwidgets description {Build wxWidgets support} {
     wxWidgets.use               wxWidgets-3.0
-    depends_lib-append          port:${wxWidgets.port}
-    configure.args-append       --with-wxdir=${wxWidgets.wxdir}
-}
-
-# the option could/should be renamed to wxwidgets28 (keep in sync with esdl)
-variant wxwidgets conflicts wxwidgets30 wxgtk28 description {Build 32-bit wxWidgets 2.8 support} {
-    wxWidgets.use               wxWidgets-2.8
-    depends_lib-append          port:${wxWidgets.port}
-    configure.args-append       --with-wxdir=${wxWidgets.wxdir}
-}
-
-variant wxgtk28 conflicts wxwidgets30 wxwidgets description {Build wxWidgets support with wxGTK 2.8} {
-    wxWidgets.use               wxGTK-2.8
-    depends_lib-append          port:${wxWidgets.port}
-    configure.args-append       --with-wxdir=${wxWidgets.wxdir}
-}
-
-if {[variant_isset wxwidgets30] || [variant_isset wxwidgets] || [variant_isset wxgtk28]} {
     patchfiles-delete           patch-disable_wx.diff
     patchfiles-append           patch-lib_wx_configure.in.diff \
                                 patch-lib_wx_configure.diff
+    depends_lib-append          port:${wxWidgets.port}
     depends_run-append          port:tk
+    configure.args-append       --with-wxdir=${wxWidgets.wxdir}
 }
 
 variant ssl description {Build SSL support} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130821/fe74c0c6/attachment.html>