fake:

package/tsa/wxpython/wxpython.conf

@@ -22,21 +22,20 @@
 
 build_wxpython() {
 
+  if pkginstalled gtk+ ; then
+	WXPORT=gtk2
+  elif pkginstalled gtk+12 ; then
+	WXPORT=gtk
+  elif pkginstalled openmotif ; then
+	WXPORT=motif
+  elif pkginstalled xorg || pkginstalled xfree86 ; then
+	WXPORT=x11
+  fi
+
   # we only want the wxpython stuff, so we'll just build in this subdir  
   echo "Building wxPython.."
   cd wxPython
-  python setup.py BUILD_GLCANVAS=0 build install
-
-  #echo "Building wxrc.."
-  #cd ../contrib/utils/wxrc
-  #WCXX=`../../../wx-config --cxx`
-  #WCXXFLAGS=`../../../wx-config --cxxflags`
-  #for f in wxrc.cpp ../../src/xrc/xml.cpp ../../src/xrc/xmlres.cpp; do
-  # $WCXX $WCXXFLAGS -I ../../include -I ../../src/xrc/expat/xmlparse \
-  #    -I ../../src/xrc/expat/xmltok -c $f 
-  #done
-  #$WCXX `../../../wx-config --libs` *.o -o wxrc
-  #strip wxrc
+  python setup.py WXPORT=$WXPORT BUILD_GLCANVAS=0 build install
 
 }
 

package/tsa/wxpython/wxpython.desc

@@ -37,8 +37,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 2.4.2.4
+[V] 2.5.3.1
 [P] X -?---5---9 147.000
 
-[D] 3696783104 wxPythonSrc-2.4.2.4.tar.gz http://dl.sourceforge.net/sourceforge/wxpython/
+[D] 485688108 wxPython-src-2.5.3.1.tar.gz http://dl.sourceforge.net/sourceforge/wxpython/
 

package/tsa/wxwidgets/libs-fix.patch

@@ -1,31 +1,11 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/tsa/wxwidgets/libs-fix.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./wx-config.in.orig	2003-06-25 15:12:38.000000000 -0400
-+++ ./wx-config.in	2004-03-13 23:33:16.000000000 -0500
-@@ -147,7 +147,7 @@
-       if test $static_flag = yes ; then
-           echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
-       else
--          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
-+          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@
-       fi
+--- ./wx-config.in.orig	2004-11-22 02:40:51.785674568 +0100
++++ ./wx-config.in	2004-11-22 02:41:16.329943272 +0100
+@@ -959,7 +959,7 @@
+     if [ "x$this_linkage" = "x-static" ]; then
+         wx_libs="$wx_libs ${libdir}/libwx_@TOOLCHAIN_NAME@.a $ldlibs_core @LIBS@"
+     else
+-        wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
++        wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@ $ldlibs_core @LIBS@"
+     fi
  
-       ;;
-
+     using_gui=yes

package/tsa/wxwidgets/wxwidgets.conf

@@ -20,6 +20,37 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+var_append confopt ' ' '--enable-monolithic'
 var_append confopt ' ' '--enable-optimise'
 var_append confopt ' ' '--enable-shared'
 
+if pkginstalled gtk+ ; then
+	var_append confopt ' ' '--with-gtk'
+elif pkginstalled gtk+12 ; then
+	var_append confopt ' ' '--with-gtk --disable-gtk2'
+else
+	var_append confopt ' ' '--disable-gui'
+fi
+
+pkginstalled libsdl && \
+	var_append confopt ' ' '--with-sdl'
+
+# FIXME: how to do this right?
+if [ -f $root/usr/lib/libGL.so ] ; then
+	var_append confopt ' ' '--with-opengl'
+	hook_add inmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"'
+	hook_add postmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" install'
+fi
+
+build_contrib() {
+	make -C contrib/src/gizmos
+	make -C contrib/src/stc
+}
+
+install_contrib() {
+	make -C contrib/src/gizmos install
+	make -C contrib/src/stc install
+}
+
+hook_add inmake 9 build_contrib
+hook_add postmake 9 install_contrib

package/tsa/wxwidgets/wxwidgets.desc

@@ -40,8 +40,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 2.4.2.4
+[V] 2.5.3.1
 [P] X -?---5---9 130.000
 
-[D] 3696783104 wxPythonSrc-2.4.2.4.tar.gz http://dl.sourceforge.net/sourceforge/wxpython/
+[D] 485688108 wxPython-src-2.5.3.1.tar.gz http://dl.sourceforge.net/sourceforge/wxpython/