[79566] trunk/dports/lang/erlang

[jmr at macports.org]

Revision: 79566
          http://trac.macports.org/changeset/79566
Author:   jmr at macports.org
Date:     2011-06-18 05:56:35 -0700 (Sat, 18 Jun 2011)
Log Message:
-----------
erlang: Fix the wxWidgets dependency situation. Using the system wx doesn't help because it's still only i386+ppc on 10.6. Not disabling wx when the variant isn't set caused bugs like #25225.

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

Added Paths:
-----------
    trunk/dports/lang/erlang/files/patch-disable_wx.diff

Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile	2011-06-18 11:16:07 UTC (rev 79565)
+++ trunk/dports/lang/erlang/Portfile	2011-06-18 12:56:35 UTC (rev 79566)
@@ -62,8 +62,7 @@
                 patch-erts_emulator_sys_unix_sys_float.c.diff \
                 patch-erts_configure.diff \
                 patch-lib_ssl_c_src_esock_openssl.c \
-                patch-lib_wx_configure.in \
-                patch-lib_wx_configure
+                patch-disable_wx.diff
 
 configure.args  --prefix=${prefix}      \
                 --enable-kernel-poll            \
@@ -97,10 +96,6 @@
 }
 
 platform darwin 10 {
-    # 10.6 comes with wxWidgets and since it requires libsdl, which
-    # current doesn't compile (bug #20235), we can avoid it here.
-    depends_build-delete    port:wxWidgets
-
     patchfiles-delete       patch-lib_ssl_c_src_esock_openssl.c
     
     # 10.6 (and 10.6.1) has a bad bug related to using dlopen in a thread.
@@ -110,14 +105,23 @@
     configure.ldflags-append -framework CoreFoundation
 }
 
+platform macosx {
+    if {[variant_isset wxwidgets]} {
+        # wxMac is 32-bit only
+        supported_archs i386 ppc
+    }
+}
 platform darwin {
-    if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+    if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
         configure.args-append --enable-darwin-64bit
     }
 }
 
 variant wxwidgets description {Build wxWidgets support} {
-        depends_build-append     port:wxWidgets
+        patchfiles-delete        patch-disable_wx.diff
+        patchfiles-append        patch-lib_wx_configure.in \
+                                 patch-lib_wx_configure
+        depends_lib-append       port:wxWidgets
         depends_run-append       port:tk
 }
 

Added: trunk/dports/lang/erlang/files/patch-disable_wx.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-disable_wx.diff	                        (rev 0)
+++ trunk/dports/lang/erlang/files/patch-disable_wx.diff	2011-06-18 12:56:35 UTC (rev 79566)
@@ -0,0 +1,40 @@
+--- lib/configure.orig	2010-12-08 02:07:22.000000000 +1100
++++ lib/configure	2011-06-18 22:20:13.000000000 +1000
+@@ -277,7 +277,6 @@
+ ac_subdirs_all="$ac_subdirs_all gs/."
+ ac_subdirs_all="$ac_subdirs_all megaco/."
+ ac_subdirs_all="$ac_subdirs_all odbc/."
+-ac_subdirs_all="$ac_subdirs_all wx/."
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+@@ -1285,9 +1284,6 @@
+     test ! -f odbc/configure ||
+ 
+ subdirs="$subdirs odbc/."
+-    test ! -f wx/configure ||
+-
+-subdirs="$subdirs wx/."
+ 
+ 
+ fi
+--- lib/Makefile.orig	2010-12-08 02:07:22.000000000 +1100
++++ lib/Makefile	2011-06-18 22:20:41.000000000 +1000
+@@ -55,7 +55,7 @@
+     ifdef BUILD_ALL
+       ifeq ($(findstring win32,$(TARGET)),win32) # BUILD_ALL on win32
+         OTHER_SUB_DIRECTORIES += 			\
+-          snmp otp_mibs appmon erl_interface asn1 jinterface gs wx inets ic \
++          snmp otp_mibs appmon erl_interface asn1 jinterface gs inets ic \
+           mnesia crypto orber os_mon parsetools syntax_tools pman \
+           public_key ssl toolbar tv observer debugger reltool odbc runtime_tools \
+           cosTransactions cosEvent cosTime cosNotification cosProperty \
+@@ -65,7 +65,7 @@
+         OTHER_SUB_DIRECTORIES += hipe
+       else # BUILD_ALL on unix
+         OTHER_SUB_DIRECTORIES += \
+-          snmp otp_mibs appmon erl_interface asn1 jinterface wx debugger reltool gs inets \
++          snmp otp_mibs appmon erl_interface asn1 jinterface debugger reltool gs inets \
+           ic mnesia crypto orber os_mon parsetools syntax_tools \
+           pman public_key ssl toolbar tv observer odbc \
+           runtime_tools cosTransactions cosEvent cosTime cosNotification \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110618/af72dd06/attachment.html>