Index: files/patch-soundsdl-28.diff
===================================================================
--- files/patch-soundsdl-28.diff	(revision 0)
+++ files/patch-soundsdl-28.diff	(revision 0)
@@ -0,0 +1,46 @@
+--- ../Makefile.in.orig	2007-03-19 14:27:34.000000000 +0100
++++ ../Makefile.in	2006-11-14 21:45:39.000000000 +0100
+@@ -4929,8 +4929,8 @@
+ @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monodll_sound_sdl.o
++@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
++@COND_USE_PLUGINS_0@	= monodll_sound_sdl.o
+ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
+ 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
+@@ -6712,8 +6712,8 @@
+ @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monolib_sound_sdl.o
++@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
++@COND_USE_PLUGINS_0@	= monolib_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
+ 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
+@@ -10209,8 +10209,8 @@
+ @COND_TOOLKIT_MSW@	= advdll_datectrl.o
+ @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
+ @COND_TOOLKIT_WINCE@	= advdll_datectrl.o
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advdll_sound_sdl.o
++@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
++@COND_USE_PLUGINS_0@	= advdll_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
+ 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
+@@ -10274,8 +10274,8 @@
+ @COND_TOOLKIT_MSW@	= advlib_datectrl.o
+ @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
+ @COND_TOOLKIT_WINCE@	= advlib_datectrl.o
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
+-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advlib_sound_sdl.o
++@USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
++@USE_PLUGINS_0@	= advlib_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
+ 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
Index: Portfile
===================================================================
--- Portfile	(revision 61404)
+++ Portfile	(working copy)
@@ -45,7 +45,7 @@
 extract.only	${distname}-${version}${extract.suffix}
 
 #patchfiles	patch-chkconf.diff patch-TECConvertText.diff
-patchfiles	patch-chkconf.diff
+patchfiles	patch-chkconf.diff patch-soundsdl-28.diff
 
 #configure.cmd	../${distname}-${version}/configure
 configure.cmd		../configure
@@ -58,7 +58,7 @@
     			    --with-zlib \
     			    --with-sdl \
     			    --with-opengl \
-    			    --with-mac \
+    			    --with-x11 \
     			    --disable-sdltest \
     			    --enable-unicode \
     			    --enable-display \
@@ -89,7 +89,11 @@
 	readme-gtk.txt readme-mac.txt \
 	readme-mgl.txt readme-motif.txt readme-x11.txt \
 	${destroot}${prefix}/share/doc/${name}
-    set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
+	if {[info exists wxMac_enabled] && $wxMac_enabled} {
+        set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
+    } else {
+        set confscript ${prefix}/lib/wx/config/x11univ-unicode-${installtype}-2.8
+    }
     reinplace "s|-L${build.dir}/lib||" ${destroot}${confscript}
     ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
 }
@@ -103,6 +107,20 @@
     set installtype debug
 }
 
+platform macosx {
+    global wxMac_enabled
+    # wxMac doesn't build 64-bit
+    if {(![variant_isset universal] && ($build_arch == "i386" || $build_arch == "ppc")) ||
+        ([variant_isset universal] && ![string match *64* $universal_archs])} {
+        configure.args-delete --with-x11
+        configure.args-append --with-mac
+        set wxMac_enabled yes
+    } else {
+        # configure script doesn't find mesa properly
+        configure.args-delete --with-opengl
+    }
+}
+
 livecheck.type		regex
 livecheck.url		${homepage}/downloads/
 livecheck.regex		Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)