[109329] users/mojca/wxports/graphics/wxWidgets-2.8

mojca at macports.org mojca at macports.org
Tue Aug 13 04:49:49 PDT 2013


Revision: 109329
          https://trac.macports.org/changeset/109329
Author:   mojca at macports.org
Date:     2013-08-13 04:49:49 -0700 (Tue, 13 Aug 2013)
Log Message:
-----------
mojca/wxWidgets-2.8: add wxgtk-2.8 subport including a patch for sdl

Modified Paths:
--------------
    users/mojca/wxports/graphics/wxWidgets-2.8/Portfile

Added Paths:
-----------
    users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-sdl.diff
    users/mojca/wxports/graphics/wxWidgets-2.8/files/wxgtk-2.8

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-13 10:08:26 UTC (rev 109328)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-13 11:49:49 UTC (rev 109329)
@@ -38,10 +38,16 @@
 checksums           rmd160  928e221abe1a00cd2d72d2a4fd3640ba639b9915 \
                     sha256  3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707
 
+set installname     ${distname}
+set wxtype          mac
+
+subport wxgtk-2.8 {
+    set installname wxGTK
+    set wxtype      gtk2
+}
+
 # TODO: put this into PortGroup
-# TODO: create a subport wxGTK-2.8 in addition to wxWidgets-2.8 and put it under
-#                   ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/${branch}
-set installdir      ${frameworks_dir}/wxWidgets.framework/Versions/${distname}/${branch}
+set installdir      ${frameworks_dir}/wxWidgets.framework/Versions/${installname}/${branch}
 
 depends_lib         port:jpeg \
                     port:tiff \
@@ -53,7 +59,7 @@
 depends_run         port:wxWidgets_select
 
 select.group        wxWidgets
-select.file         ${filespath}/${name}
+select.file         ${filespath}/${subport}
 
 archcheck.files     lib/libjpeg.dylib \
                     lib/libtiff.dylib \
@@ -65,7 +71,8 @@
 set worksrcdir      ${distname}-${version}/build
 
 patchfiles          patch-chkconf.diff \
-                    patch-configure.diff
+                    patch-configure.diff \
+                    patch-sdl.diff
 patch.dir           ${workpath}/${distname}-${version}
 
 post-patch {
@@ -78,31 +85,12 @@
 set contrib         "gizmos stc ogl"
 set installtype     release
 
-# SDK
-set conf_sdk "no"
+set conf_sdk        "no"
 set conf_macosx_version_min "no"
-pre-fetch {
-    if {[variant_isset carbon]} {
-        # 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
-        if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
-            return -code return "${name} cannot be built on Moc OS X >= 10.7 with Xcode >= 4.4, please use port ${distname}-3.0 instead"
-        } else {
-            # 10.7
-            if {${os.major} == 11} {
-                if {[vercmp $xcodeversion 4.3] < 0} {
-                    set sdks_dir "${developer_dir}/SDKs"
-                } else {
-                    set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
-                }
-                set conf_sdk "${sdks_dir}/MacOSX10.6.sdk"
-                set conf_macosx_version_min "10.6"
-            }
-        }
-    }
-}
 
 configure.cmd       ../configure
 configure.args      --prefix=${installdir} \
+                    --with-mac \
                     --with-libiconv-prefix=${prefix} \
                     --with-libjpeg \
                     --with-libtiff \
@@ -129,46 +117,16 @@
         system "cd ${build.dir} && make -C contrib/src/${c} install ${destroot.destdir}"
     }
 
-    set destdocdir ${destroot}${prefix}/share/doc/${distname}/${branch}
+    set destdocdir ${destroot}${installdir}/share/doc/${distname}
     xinstall -d -m 755 ${destdocdir}
     xinstall -m 644 -W ${workpath}/${distname}-${version} \
-    install-mac.txt install-mgl.txt install-motif.txt \
-    INSTALL-OS2.txt install-x11.txt readme-cocoa.txt \
-    readme-gtk.txt readme-mac.txt \
-    readme-mgl.txt readme-motif.txt readme-x11.txt \
-    ${destdocdir}
-    set confscript ${installdir}/lib/wx/config/mac-unicode-${installtype}-2.8
+    install-mac.txt readme-mac.txt \
+    install-gtk.txt readme-gtk.txt ${destdocdir}
+
+    set confscript ${installdir}/lib/wx/config/${wxtype}-unicode-${installtype}-2.8
     ln -sf ${confscript} ${destroot}${installdir}/bin/wx-config
 }
 
-variant carbon conflicts gtk x11 quartz description {} {
-    supported_archs         i386 ppc
-    use_parallel_build      no
-    configure.args-append   --with-mac
-}
-variant gtk conflicts carbon description {} {
-    depends_lib-append      port:cairo \
-                            port:gtk2
-    # TODO: try to make sdl work
-    #                       path:lib/pkgconfig/sdl.pc:libsdl \
-    #                       port:libsdl_mixer
-    #configure.args-delete  --without-sdl
-    configure.args-append   --with-gtk
-}
-variant x11 requires gtk conflicts carbon quartz description {} {
-    # TODO: not sure about freeglut
-    depends_lib-append      port:mesa \
-                            port:freeglut
-
-    require_active_variants cairo x11
-    require_active_variants gtk2  x11
-}
-variant quartz requires gtk conflicts carbon x11 description {} {
-    # TODO: doesn't work
-    require_active_variants cairo quartz
-    require_active_variants gtk2  quartz
-}
-
 variant aui description {add support for AUI docking library} {
     configure.args-append    --enable-aui
 }
@@ -182,10 +140,44 @@
     set installtype debug
 }
 
-if {![variant_isset carbon] && ![variant_isset gtk] && ![variant_isset x11] && ![variant_isset quartz]} {
-    default_variants +carbon
+if {$subport == $name || $subport == ""} {
+    supported_archs         i386 ppc
+    use_parallel_build      no
+    # SDK
+    pre-fetch {
+        # 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
+        if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
+            return -code return "${name} cannot be built on Moc OS X >= 10.7 with Xcode >= 4.4, please use port wxWidgets-3.0 or wxgtk-2.8 instead"
+        } else {
+            # 10.7
+            if {${os.major} == 11} {
+                if {[vercmp $xcodeversion 4.3] < 0} {
+                    set sdks_dir "${developer_dir}/SDKs"
+                } else {
+                    set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
+                }
+                set conf_sdk "${sdks_dir}/MacOSX10.6.sdk"
+                set conf_macosx_version_min "10.6"
+            }
+        }
+    }
+} else {
+    depends_lib-append      port:cairo \
+                            port:gtk2 \
+                            port:mesa \
+                            port:freeglut \
+                            path:lib/pkgconfig/sdl.pc:libsdl \
+                            port:libsdl_mixer
+
+    require_active_variants cairo x11
+    require_active_variants gtk2  x11
+
+    configure.args-delete   --with-mac \
+                            --without-sdl
+    configure.args-append   --with-gtk \
+                            --with-sdl
 }
 
-livecheck.type  regex
-livecheck.url   ${homepage}/downloads/
-livecheck.regex Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)
+livecheck.type      regex
+livecheck.url       ${homepage}/downloads/
+livecheck.regex     Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)

Added: users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-sdl.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-sdl.diff	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-sdl.diff	2013-08-13 11:49:49 UTC (rev 109329)
@@ -0,0 +1,46 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -5033,8 +5033,8 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS =  \
+ @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monodll_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
++ at 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 at __monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
+@@ -6830,8 +6830,8 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
+ @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monolib_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
++ at 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 at __basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
+@@ -10405,8 +10405,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
+ @COND_TOOLKIT_MSW@	= advdll_datectrl.o
+ @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
+ @COND_TOOLKIT_WINCE@	= advdll_datectrl.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advdll_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
++ at 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 at __advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
+@@ -10470,8 +10470,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
+ @COND_TOOLKIT_MSW@	= advlib_datectrl.o
+ @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
+ @COND_TOOLKIT_WINCE@	= advlib_datectrl.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= advlib_sound_sdl.o
++ at USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
++ at 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 at __mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)

Added: users/mojca/wxports/graphics/wxWidgets-2.8/files/wxgtk-2.8
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/files/wxgtk-2.8	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/wxgtk-2.8	2013-08-13 11:49:49 UTC (rev 109329)
@@ -0,0 +1,8 @@
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/bin/wx-config
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/bin/wxrc-2.8
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/aclocal/wxwin.m4
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx.bkl
+-
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx_unix.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx_win32.bkl
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130813/afa0ee0d/attachment.html>


More information about the macports-changes mailing list