[110237] trunk/dports

[mojca at macports.org]

Revision: 110237
          https://trac.macports.org/changeset/110237
Author:   mojca at macports.org
Date:     2013-08-28 23:38:55 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
erlang, esdl: use new wxWidgets-3.0 and remove the hack from esdl

Modified Paths:
--------------
    trunk/dports/graphics/esdl/Portfile
    trunk/dports/lang/erlang/Portfile

Modified: trunk/dports/graphics/esdl/Portfile
===================================================================
--- trunk/dports/graphics/esdl/Portfile	2013-08-29 06:24:41 UTC (rev 110236)
+++ trunk/dports/graphics/esdl/Portfile	2013-08-29 06:38:55 UTC (rev 110237)
@@ -5,6 +5,7 @@
 
 name                esdl
 version             1.2
+revision            1
 categories          graphics devel erlang
 platforms           darwin
 maintainers         bfulgham
@@ -22,6 +23,7 @@
                     rmd160  fc1f37647ae8e9652413c0ba683743d43c149573
 
 depends_lib         port:libsdl \
+                    port:libsdl-framework \
                     port:erlang
 
 use_configure       no
@@ -34,16 +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
-    # Note: this horrible hack is needed to get ESDL to build on
-    # 64-bit OS's (like Snow Leopard and Lion).  Once wxWidgets 3.0
-    # is released, this can go away.
-    variant wxwidgets description {Build 32-bit for compatibility with erlang +wxwidgets} {
-        supported_archs i386 ppc
-    }
-}
-
 build.target
 destroot.destdir    DPORTSDIR=${destroot}
 

Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile	2013-08-29 06:24:41 UTC (rev 110236)
+++ trunk/dports/lang/erlang/Portfile	2013-08-29 06:38:55 UTC (rev 110237)
@@ -2,9 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           wxWidgets 1.0
 
 name                erlang
 version             R16B01
+revision            1
 categories          lang erlang
 maintainers         bfulgham
 platforms           darwin
@@ -101,35 +103,29 @@
     # rdar://7209349 - http://www.openradar.appspot.com/7209349
     # This is a workaround.
     patchfiles-append           patch-erts_emulator_sys_unix_ddll.c.diff
-    configure.ldflags-append    -framework CoreFoundation
 }
 
-platform darwin 11 {
-    # 10.6 (and 10.6.1) has a bad bug related to using dlopen in a thread.
-    # rdar://7209349 - http://www.openradar.appspot.com/7209349
-    # This is a workaround.
-    #patchfiles-append          patch-erts_emulator_sys_unix_ddll.c.diff
-    configure.ldflags-append    -framework CoreFoundation
-}
-
 platform darwin {
-    if {[variant_isset wxwidgets]} {
-        # wxMac is 32-bit only
-        supported_archs i386 ppc
-    }
     if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
         configure.args-append   --enable-darwin-64bit
     } else {
         configure.args-append   --disable-darwin-64-bit
     }
+    # TODO: not sure about the minimum version
+    if {${os.major} >= 10} {
+        # also "-framework Appkit"?
+        configure.ldflags-append -framework CoreFoundation
+    }
 }
 
 variant wxwidgets description {Build wxWidgets support} {
+    wxWidgets.use               wxWidgets-3.0
     patchfiles-delete           patch-disable_wx.diff
     patchfiles-append           patch-lib_wx_configure.in.diff \
                                 patch-lib_wx_configure.diff
-    depends_lib-append          port:wxWidgets
+    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/20130828/2863f342/attachment.html>