Ticket #24350: wxWidgets_Portfile.diff

graphics/wxWidgets/Portfile

@@ +1 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
 # $Id: Portfile 64763 2010-03-15 16:31:33Z nox@macports.org $
 
 PortSystem 1.0
@@ -6 +7 @@
 name                    wxWidgets
 epoch                   2
 version                 2.8.9
-revision        2
+revision        3
 categories              graphics devel
 platforms               darwin
 maintainers             mww jwa
@@ -31 +32 @@
                     sha1    5ad687f8c8d5a9ef6acfa1b8ba0376f86fb07406 \
                     rmd160  d0f1a07cecae6645b0367decf9a6dbe463fa4505
 
+conflicts     wxgtk  wxWidgets-python
 
 depends_lib             port:jpeg \
                             port:tiff \
@@ -55 +57 @@
 extract.only    ${distname}-${version}${extract.suffix}
 
 #patchfiles     patch-chkconf.diff patch-TECConvertText.diff
-patchfiles      patch-chkconf.diff
+patchfiles      patch-chkconf.diff changeset_r61009.diff
 
 #configure.cmd  ../${distname}-${version}/configure
 configure.cmd           ../configure
@@ -68 +70 @@
                             --with-zlib \
                             --with-sdl \
                             --with-opengl \
-                            --with-mac \
                             --disable-sdltest \
                             --enable-unicode \
                             --enable-display \
@@ -82 +83 @@
 universal_variant       no
 use_parallel_build no
 
-if {$build_arch == "x86_64"} {
-    configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
-    configure.build_arch ppc
+variant carbon conflicts gtk description {use carbon} {
+    configure.args-append --with-mac
+    if {$build_arch == "x86_64"} {
+        configure.build_arch i386
+    } elseif {$build_arch == "ppc64"} {
+        configure.build_arch ppc
+    }
+    if {![info exists configure.ld_archflags]} {
+        eval configure.ldflags-append ${configure.cc_archflags}
+    }
 }
-if {![info exists configure.ld_archflags]} {
-    eval configure.ldflags-append ${configure.cc_archflags}
+variant gtk conflicts carbon description {use gtk} {
+    depends_lib-append    port:gtk2
+    depends_lib-delete    path:lib/pkgconfig/sdl.pc:libsdl
+    depends_lib-delete    port:libsdl_mixer
+    configure.args-delete --with-sdl
+    configure.args-append --with-gtk
+}
+if {![variant_isset gtk]} {
+    default_variants-append +carbon
+}
+post-configure {
+    if {[variant_isset gtk]} {
+        # for some reason, 'configure --with-gtk' does not specify to link the X11 opengl libs
+        # not sure what happens if quartz variant of gtk2 is used
+        reinplace "s|EXTRALIBS_OPENGL = |EXTRALIBS_OPENGL = -lGL -lGLU -lglut|g" ${worksrcpath}/Makefile
+    }
 }
 
 post-build {
@@ -109 +130 @@
         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 {[variant_isset carbon]} {
+        set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
+    }
+    if {[variant_isset gtk]} {
+        set confscript ${prefix}/lib/wx/config/gtk2-unicode-${installtype}-2.8
+    }        
     reinplace "s|-L${build.dir}/lib||" ${destroot}${confscript}
     ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
 }