Update to 2.4.0.7.

16 files changed, 820 insertions, 84 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index f57969f2014e..404d7fec0596 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.4.0.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index 295b0a52379e..8ec5d9ca2e94 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPythonSrc-2.4.0.1.tar.gz) = 1eb8149cb76fd2a4bf5f0c51dc08c2f4
+MD5 (wxPythonSrc-2.4.0.7.tar.gz) = c7864b56ff1422697a310f91f54c7ed6
diff --git a/x11-toolkits/py-wxPython/files/patch-ac b/x11-toolkits/py-wxPython/files/patch-ac
index 50b41c1437fb..49eeaaf5cd91 100644
--- a/x11-toolkits/py-wxPython/files/patch-ac
+++ b/x11-toolkits/py-wxPython/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.py.orig	Fri Jan 10 06:24:53 2003
-+++ setup.py	Tue Jan 14 21:02:25 2003
-@@ -159,6 +159,16 @@
+--- setup.py.orig	Fri Mar 21 01:49:39 2003
++++ setup.py	Fri Apr 18 18:02:09 2003
+@@ -152,6 +152,16 @@
  
  
  #----------------------------------------------------------------------
@@ -13,14 +13,14 @@ $FreeBSD$
 +try: gtk_config = os.environ['GTK_CONFIG']
 +except KeyError: gtk_config = 'gtk-config'
 +
-+try: sys_libs = string.split(os.environ['LIBS'])
++try: sys_libs = os.environ['LIBS'].split()
 +except KeyError: sys_libs = []
 +
 +#----------------------------------------------------------------------
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -382,7 +392,7 @@
+@@ -434,7 +444,7 @@
  
      if WXPORT == 'gtk':
          WXPLAT = '__WXGTK__'
@@ -29,16 +29,16 @@ $FreeBSD$
      elif WXPORT == 'gtk2':
          WXPLAT = '__WXGTK__'
          GENDIR = 'gtk' # no code differences so use the same generated sources
-@@ -402,6 +412,7 @@
-                ]
+@@ -457,6 +467,7 @@
+ 
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
      Verify_WX_CONFIG()
  
-@@ -633,8 +644,8 @@
- if not GL_ONLY and BUILD_OGL:
+@@ -691,8 +702,8 @@
+ if BUILD_OGL:
      msg('Preparing OGL...')
      location = 'contrib/ogl'
 -    OGLLOC = opj(location, 'contrib/src/ogl')
@@ -48,8 +48,8 @@ $FreeBSD$
  
      swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
                    'oglcanvas.i']
-@@ -682,9 +693,9 @@
- if not GL_ONLY and BUILD_STC:
+@@ -740,9 +751,9 @@
+ if BUILD_STC:
      msg('Preparing STC...')
      location = 'contrib/stc'
 -    STCLOC = opj(location, 'contrib/src/stc')
@@ -61,8 +61,8 @@ $FreeBSD$
  
      if IN_CVS_TREE:
          # Check if gen_iface needs to be run for the wxSTC sources
-@@ -826,8 +837,8 @@
- if not GL_ONLY and BUILD_XRC:
+@@ -885,8 +896,8 @@
+ if BUILD_XRC:
      msg('Preparing XRC...')
      location = 'contrib/xrc'
 -    XMLLOC = opj(location, 'contrib/src/xrc')
@@ -72,8 +72,8 @@ $FreeBSD$
  
      swig_files = ['xrc.i']
  
-@@ -915,8 +926,8 @@
- if not GL_ONLY and BUILD_GIZMOS:
+@@ -974,8 +985,8 @@
+ if BUILD_GIZMOS:
      msg('Preparing GIZMOS...')
      location = 'contrib/gizmos'
 -    GIZMOLOC = opj(location, 'contrib/src/gizmos')
@@ -83,8 +83,8 @@ $FreeBSD$
  
      swig_files = ['gizmos.i']
  
-@@ -993,8 +1004,8 @@
- if not GL_ONLY and BUILD_CANVAS:
+@@ -1052,8 +1063,8 @@
+ if BUILD_CANVAS:
      msg('Preparing CANVAS...')
      location = 'contrib/canvas'
 -    CANVASLOC = opj(location, 'contrib/src/canvas')
@@ -94,8 +94,8 @@ $FreeBSD$
  
      swig_files = ['canvas.i']
  
-@@ -1032,10 +1043,10 @@
- if not GL_ONLY and BUILD_ART2D:
+@@ -1091,10 +1102,10 @@
+ if BUILD_ART2D:
      msg('Preparing ART2D...')
      location = 'contrib/art2d'
 -    ART2DLOC = opj(location, 'modules/canvas/src')
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 463350ef4f68..a92c46790a1d 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -200,6 +200,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/showTips
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/stc.h.html
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
@@ -298,6 +299,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.py
@@ -348,6 +351,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.py
@@ -464,6 +469,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrust.ico
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
@@ -473,12 +480,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/README.txt
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
@@ -503,6 +514,141 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
@@ -521,6 +667,27 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyo
@@ -569,6 +736,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
@@ -685,6 +855,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/streams.py
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/README.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/TODO.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyo
@@ -697,12 +870,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/license.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyo
@@ -712,12 +889,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.xrc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyo
@@ -762,12 +943,15 @@ bin/img2png
 bin/img2py
 bin/img2xpm
 bin/pycrust
+bin/pycwrap
 bin/pyshell
 bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index f57969f2014e..404d7fec0596 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.4.0.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo
index 295b0a52379e..8ec5d9ca2e94 100644
--- a/x11-toolkits/py-wxPython24/distinfo
+++ b/x11-toolkits/py-wxPython24/distinfo
@@ -1 +1 @@
-MD5 (wxPythonSrc-2.4.0.1.tar.gz) = 1eb8149cb76fd2a4bf5f0c51dc08c2f4
+MD5 (wxPythonSrc-2.4.0.7.tar.gz) = c7864b56ff1422697a310f91f54c7ed6
diff --git a/x11-toolkits/py-wxPython24/files/patch-ac b/x11-toolkits/py-wxPython24/files/patch-ac
index 50b41c1437fb..49eeaaf5cd91 100644
--- a/x11-toolkits/py-wxPython24/files/patch-ac
+++ b/x11-toolkits/py-wxPython24/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.py.orig	Fri Jan 10 06:24:53 2003
-+++ setup.py	Tue Jan 14 21:02:25 2003
-@@ -159,6 +159,16 @@
+--- setup.py.orig	Fri Mar 21 01:49:39 2003
++++ setup.py	Fri Apr 18 18:02:09 2003
+@@ -152,6 +152,16 @@
  
  
  #----------------------------------------------------------------------
@@ -13,14 +13,14 @@ $FreeBSD$
 +try: gtk_config = os.environ['GTK_CONFIG']
 +except KeyError: gtk_config = 'gtk-config'
 +
-+try: sys_libs = string.split(os.environ['LIBS'])
++try: sys_libs = os.environ['LIBS'].split()
 +except KeyError: sys_libs = []
 +
 +#----------------------------------------------------------------------
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -382,7 +392,7 @@
+@@ -434,7 +444,7 @@
  
      if WXPORT == 'gtk':
          WXPLAT = '__WXGTK__'
@@ -29,16 +29,16 @@ $FreeBSD$
      elif WXPORT == 'gtk2':
          WXPLAT = '__WXGTK__'
          GENDIR = 'gtk' # no code differences so use the same generated sources
-@@ -402,6 +412,7 @@
-                ]
+@@ -457,6 +467,7 @@
+ 
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
      Verify_WX_CONFIG()
  
-@@ -633,8 +644,8 @@
- if not GL_ONLY and BUILD_OGL:
+@@ -691,8 +702,8 @@
+ if BUILD_OGL:
      msg('Preparing OGL...')
      location = 'contrib/ogl'
 -    OGLLOC = opj(location, 'contrib/src/ogl')
@@ -48,8 +48,8 @@ $FreeBSD$
  
      swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
                    'oglcanvas.i']
-@@ -682,9 +693,9 @@
- if not GL_ONLY and BUILD_STC:
+@@ -740,9 +751,9 @@
+ if BUILD_STC:
      msg('Preparing STC...')
      location = 'contrib/stc'
 -    STCLOC = opj(location, 'contrib/src/stc')
@@ -61,8 +61,8 @@ $FreeBSD$
  
      if IN_CVS_TREE:
          # Check if gen_iface needs to be run for the wxSTC sources
-@@ -826,8 +837,8 @@
- if not GL_ONLY and BUILD_XRC:
+@@ -885,8 +896,8 @@
+ if BUILD_XRC:
      msg('Preparing XRC...')
      location = 'contrib/xrc'
 -    XMLLOC = opj(location, 'contrib/src/xrc')
@@ -72,8 +72,8 @@ $FreeBSD$
  
      swig_files = ['xrc.i']
  
-@@ -915,8 +926,8 @@
- if not GL_ONLY and BUILD_GIZMOS:
+@@ -974,8 +985,8 @@
+ if BUILD_GIZMOS:
      msg('Preparing GIZMOS...')
      location = 'contrib/gizmos'
 -    GIZMOLOC = opj(location, 'contrib/src/gizmos')
@@ -83,8 +83,8 @@ $FreeBSD$
  
      swig_files = ['gizmos.i']
  
-@@ -993,8 +1004,8 @@
- if not GL_ONLY and BUILD_CANVAS:
+@@ -1052,8 +1063,8 @@
+ if BUILD_CANVAS:
      msg('Preparing CANVAS...')
      location = 'contrib/canvas'
 -    CANVASLOC = opj(location, 'contrib/src/canvas')
@@ -94,8 +94,8 @@ $FreeBSD$
  
      swig_files = ['canvas.i']
  
-@@ -1032,10 +1043,10 @@
- if not GL_ONLY and BUILD_ART2D:
+@@ -1091,10 +1102,10 @@
+ if BUILD_ART2D:
      msg('Preparing ART2D...')
      location = 'contrib/art2d'
 -    ART2DLOC = opj(location, 'modules/canvas/src')
diff --git a/x11-toolkits/py-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 463350ef4f68..a92c46790a1d 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -200,6 +200,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/showTips
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/stc.h.html
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
@@ -298,6 +299,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.py
@@ -348,6 +351,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.py
@@ -464,6 +469,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrust.ico
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
@@ -473,12 +480,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/README.txt
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
@@ -503,6 +514,141 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
@@ -521,6 +667,27 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyo
@@ -569,6 +736,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
@@ -685,6 +855,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/streams.py
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/README.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/TODO.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyo
@@ -697,12 +870,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/license.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyo
@@ -712,12 +889,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.xrc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyo
@@ -762,12 +943,15 @@ bin/img2png
 bin/img2py
 bin/img2xpm
 bin/pycrust
+bin/pycwrap
 bin/pyshell
 bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index f57969f2014e..404d7fec0596 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.4.0.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index 295b0a52379e..8ec5d9ca2e94 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/distinfo
@@ -1 +1 @@
-MD5 (wxPythonSrc-2.4.0.1.tar.gz) = 1eb8149cb76fd2a4bf5f0c51dc08c2f4
+MD5 (wxPythonSrc-2.4.0.7.tar.gz) = c7864b56ff1422697a310f91f54c7ed6
diff --git a/x11-toolkits/py-wxPython26/files/patch-ac b/x11-toolkits/py-wxPython26/files/patch-ac
index 50b41c1437fb..49eeaaf5cd91 100644
--- a/x11-toolkits/py-wxPython26/files/patch-ac
+++ b/x11-toolkits/py-wxPython26/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.py.orig	Fri Jan 10 06:24:53 2003
-+++ setup.py	Tue Jan 14 21:02:25 2003
-@@ -159,6 +159,16 @@
+--- setup.py.orig	Fri Mar 21 01:49:39 2003
++++ setup.py	Fri Apr 18 18:02:09 2003
+@@ -152,6 +152,16 @@
  
  
  #----------------------------------------------------------------------
@@ -13,14 +13,14 @@ $FreeBSD$
 +try: gtk_config = os.environ['GTK_CONFIG']
 +except KeyError: gtk_config = 'gtk-config'
 +
-+try: sys_libs = string.split(os.environ['LIBS'])
++try: sys_libs = os.environ['LIBS'].split()
 +except KeyError: sys_libs = []
 +
 +#----------------------------------------------------------------------
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -382,7 +392,7 @@
+@@ -434,7 +444,7 @@
  
      if WXPORT == 'gtk':
          WXPLAT = '__WXGTK__'
@@ -29,16 +29,16 @@ $FreeBSD$
      elif WXPORT == 'gtk2':
          WXPLAT = '__WXGTK__'
          GENDIR = 'gtk' # no code differences so use the same generated sources
-@@ -402,6 +412,7 @@
-                ]
+@@ -457,6 +467,7 @@
+ 
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
      Verify_WX_CONFIG()
  
-@@ -633,8 +644,8 @@
- if not GL_ONLY and BUILD_OGL:
+@@ -691,8 +702,8 @@
+ if BUILD_OGL:
      msg('Preparing OGL...')
      location = 'contrib/ogl'
 -    OGLLOC = opj(location, 'contrib/src/ogl')
@@ -48,8 +48,8 @@ $FreeBSD$
  
      swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
                    'oglcanvas.i']
-@@ -682,9 +693,9 @@
- if not GL_ONLY and BUILD_STC:
+@@ -740,9 +751,9 @@
+ if BUILD_STC:
      msg('Preparing STC...')
      location = 'contrib/stc'
 -    STCLOC = opj(location, 'contrib/src/stc')
@@ -61,8 +61,8 @@ $FreeBSD$
  
      if IN_CVS_TREE:
          # Check if gen_iface needs to be run for the wxSTC sources
-@@ -826,8 +837,8 @@
- if not GL_ONLY and BUILD_XRC:
+@@ -885,8 +896,8 @@
+ if BUILD_XRC:
      msg('Preparing XRC...')
      location = 'contrib/xrc'
 -    XMLLOC = opj(location, 'contrib/src/xrc')
@@ -72,8 +72,8 @@ $FreeBSD$
  
      swig_files = ['xrc.i']
  
-@@ -915,8 +926,8 @@
- if not GL_ONLY and BUILD_GIZMOS:
+@@ -974,8 +985,8 @@
+ if BUILD_GIZMOS:
      msg('Preparing GIZMOS...')
      location = 'contrib/gizmos'
 -    GIZMOLOC = opj(location, 'contrib/src/gizmos')
@@ -83,8 +83,8 @@ $FreeBSD$
  
      swig_files = ['gizmos.i']
  
-@@ -993,8 +1004,8 @@
- if not GL_ONLY and BUILD_CANVAS:
+@@ -1052,8 +1063,8 @@
+ if BUILD_CANVAS:
      msg('Preparing CANVAS...')
      location = 'contrib/canvas'
 -    CANVASLOC = opj(location, 'contrib/src/canvas')
@@ -94,8 +94,8 @@ $FreeBSD$
  
      swig_files = ['canvas.i']
  
-@@ -1032,10 +1043,10 @@
- if not GL_ONLY and BUILD_ART2D:
+@@ -1091,10 +1102,10 @@
+ if BUILD_ART2D:
      msg('Preparing ART2D...')
      location = 'contrib/art2d'
 -    ART2DLOC = opj(location, 'modules/canvas/src')
diff --git a/x11-toolkits/py-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 463350ef4f68..a92c46790a1d 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -200,6 +200,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/showTips
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/stc.h.html
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
@@ -298,6 +299,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.py
@@ -348,6 +351,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.py
@@ -464,6 +469,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrust.ico
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
@@ -473,12 +480,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/README.txt
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
@@ -503,6 +514,141 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
@@ -521,6 +667,27 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyo
@@ -569,6 +736,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
@@ -685,6 +855,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/streams.py
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/README.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/TODO.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyo
@@ -697,12 +870,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/license.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyo
@@ -712,12 +889,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.xrc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyo
@@ -762,12 +943,15 @@ bin/img2png
 bin/img2py
 bin/img2xpm
 bin/pycrust
+bin/pycwrap
 bin/pyshell
 bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index f57969f2014e..404d7fec0596 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.4.0.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index 295b0a52379e..8ec5d9ca2e94 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1 +1 @@
-MD5 (wxPythonSrc-2.4.0.1.tar.gz) = 1eb8149cb76fd2a4bf5f0c51dc08c2f4
+MD5 (wxPythonSrc-2.4.0.7.tar.gz) = c7864b56ff1422697a310f91f54c7ed6
diff --git a/x11-toolkits/py-wxPython28/files/patch-ac b/x11-toolkits/py-wxPython28/files/patch-ac
index 50b41c1437fb..49eeaaf5cd91 100644
--- a/x11-toolkits/py-wxPython28/files/patch-ac
+++ b/x11-toolkits/py-wxPython28/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.py.orig	Fri Jan 10 06:24:53 2003
-+++ setup.py	Tue Jan 14 21:02:25 2003
-@@ -159,6 +159,16 @@
+--- setup.py.orig	Fri Mar 21 01:49:39 2003
++++ setup.py	Fri Apr 18 18:02:09 2003
+@@ -152,6 +152,16 @@
  
  
  #----------------------------------------------------------------------
@@ -13,14 +13,14 @@ $FreeBSD$
 +try: gtk_config = os.environ['GTK_CONFIG']
 +except KeyError: gtk_config = 'gtk-config'
 +
-+try: sys_libs = string.split(os.environ['LIBS'])
++try: sys_libs = os.environ['LIBS'].split()
 +except KeyError: sys_libs = []
 +
 +#----------------------------------------------------------------------
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -382,7 +392,7 @@
+@@ -434,7 +444,7 @@
  
      if WXPORT == 'gtk':
          WXPLAT = '__WXGTK__'
@@ -29,16 +29,16 @@ $FreeBSD$
      elif WXPORT == 'gtk2':
          WXPLAT = '__WXGTK__'
          GENDIR = 'gtk' # no code differences so use the same generated sources
-@@ -402,6 +412,7 @@
-                ]
+@@ -457,6 +467,7 @@
+ 
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
      Verify_WX_CONFIG()
  
-@@ -633,8 +644,8 @@
- if not GL_ONLY and BUILD_OGL:
+@@ -691,8 +702,8 @@
+ if BUILD_OGL:
      msg('Preparing OGL...')
      location = 'contrib/ogl'
 -    OGLLOC = opj(location, 'contrib/src/ogl')
@@ -48,8 +48,8 @@ $FreeBSD$
  
      swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
                    'oglcanvas.i']
-@@ -682,9 +693,9 @@
- if not GL_ONLY and BUILD_STC:
+@@ -740,9 +751,9 @@
+ if BUILD_STC:
      msg('Preparing STC...')
      location = 'contrib/stc'
 -    STCLOC = opj(location, 'contrib/src/stc')
@@ -61,8 +61,8 @@ $FreeBSD$
  
      if IN_CVS_TREE:
          # Check if gen_iface needs to be run for the wxSTC sources
-@@ -826,8 +837,8 @@
- if not GL_ONLY and BUILD_XRC:
+@@ -885,8 +896,8 @@
+ if BUILD_XRC:
      msg('Preparing XRC...')
      location = 'contrib/xrc'
 -    XMLLOC = opj(location, 'contrib/src/xrc')
@@ -72,8 +72,8 @@ $FreeBSD$
  
      swig_files = ['xrc.i']
  
-@@ -915,8 +926,8 @@
- if not GL_ONLY and BUILD_GIZMOS:
+@@ -974,8 +985,8 @@
+ if BUILD_GIZMOS:
      msg('Preparing GIZMOS...')
      location = 'contrib/gizmos'
 -    GIZMOLOC = opj(location, 'contrib/src/gizmos')
@@ -83,8 +83,8 @@ $FreeBSD$
  
      swig_files = ['gizmos.i']
  
-@@ -993,8 +1004,8 @@
- if not GL_ONLY and BUILD_CANVAS:
+@@ -1052,8 +1063,8 @@
+ if BUILD_CANVAS:
      msg('Preparing CANVAS...')
      location = 'contrib/canvas'
 -    CANVASLOC = opj(location, 'contrib/src/canvas')
@@ -94,8 +94,8 @@ $FreeBSD$
  
      swig_files = ['canvas.i']
  
-@@ -1032,10 +1043,10 @@
- if not GL_ONLY and BUILD_ART2D:
+@@ -1091,10 +1102,10 @@
+ if BUILD_ART2D:
      msg('Preparing ART2D...')
      location = 'contrib/art2d'
 -    ART2DLOC = opj(location, 'modules/canvas/src')
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 463350ef4f68..a92c46790a1d 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -200,6 +200,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/showTips
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/stc.h.html
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
@@ -298,6 +299,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIntCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.py
@@ -348,6 +351,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPyColourChooser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.py
@@ -464,6 +469,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs_wdr.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrust.ico
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
@@ -473,12 +480,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyShellApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/README.txt
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/crust.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
@@ -503,6 +514,141 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wrap.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Accelerators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/App.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Base.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Config.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Controls.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DataStructures.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/DateTime.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Dialogs.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Drawing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Errors.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/EventFunctions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Events.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/FileSystem.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Frames.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Functions.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ImageHandlers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Joystick.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Logging.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Menus.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/MimeTypes.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Misc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Panel.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Parameters.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Printing.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Process.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/SashSplitter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Sizers.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Threading.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/ToolBar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Tree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Validators.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/Window.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_stc.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/d_wx.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/decorator.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/gen.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/stc_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd/wx_.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
@@ -521,6 +667,27 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/calendar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/canvas.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/intl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourbox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourchooser.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pycolourslider.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser/pypalette.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/colourdb.pyo
@@ -569,6 +736,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/intctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
@@ -685,6 +855,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/streams.py
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/README.txt
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/TODO.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyo
@@ -697,12 +870,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/license.txt
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tools.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyo
@@ -712,12 +889,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.xrc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/dbg.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyo
@@ -762,12 +943,15 @@ bin/img2png
 bin/img2py
 bin/img2xpm
 bin/pycrust
+bin/pycwrap
 bin/pyshell
 bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/wxd
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data