20 files changed, 792 insertions, 144 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index dfd88c154ed4..f994e354d7c4 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-wxPython
-PORTVERSION=	2.3.1
+PORTNAME=	wxPython
+PORTVERSION=	2.3.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
-DISTNAME=	wxPython-${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
@@ -44,5 +44,11 @@ do-install:
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
 .endfor
+.for dir in bitmaps bmp_source data
+	@${MKDIR} ${DEMO_DIR}/${dir}
+.for glob in *
+	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index be837e76348a..1d63de40558e 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.3.1.tar.gz) = 079f80de73cd482474bbe0f50e0f7cf3
+MD5 (wxPython-2.3.2.1.tar.gz) = e57b4d030c4ba43a9030fdaee083011c
diff --git a/x11-toolkits/py-wxPython/files/patch-ac b/x11-toolkits/py-wxPython/files/patch-ac
index 79ffff04c345..9a5a4b1b76e0 100644
--- a/x11-toolkits/py-wxPython/files/patch-ac
+++ b/x11-toolkits/py-wxPython/files/patch-ac
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- setup.py.orig	Tue May 22 19:02:54 2001
-+++ setup.py	Mon May 28 19:58:15 2001
-@@ -86,6 +86,16 @@
+--- setup.py.orig	Thu Dec 20 18:33:42 2001
++++ setup.py	Sun Jan 20 11:00:24 2002
+@@ -111,6 +111,16 @@
  
  
  #----------------------------------------------------------------------
@@ -20,13 +17,13 @@ $FreeBSD$
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -229,9 +239,10 @@
+@@ -277,9 +287,10 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
-     cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
 -             os.popen('gtk-config --cflags', 'r').read()[:-1]
 +             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
      cflags = string.split(cflags)
diff --git a/x11-toolkits/py-wxPython/files/patch-ad b/x11-toolkits/py-wxPython/files/patch-ad
deleted file mode 100644
index d96d78f3d2bd..000000000000
--- a/x11-toolkits/py-wxPython/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/py-wxPython/files/Attic/patch-ad,v 1.1 2002-01-21 02:19:46 sobomax Exp $
-
---- contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:10:53	1.1
-+++ contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:12:05
-@@ -1,7 +1,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "PosRegExp.h"
- 
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 7aeb4dbf8205..6d324dfb07fe 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -32,12 +32,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourDB.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FileBrowseButton.py
@@ -74,22 +80,88 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OOR.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/noicon.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/robin.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/grid.i
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
+%%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/stc.h.html
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/testtable.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tips.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/widgetTest.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.py
@@ -103,12 +175,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.py
@@ -137,10 +213,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDirDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFontDialog.py
@@ -159,6 +241,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListBox.py
@@ -171,6 +255,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.py
@@ -183,6 +269,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.py
@@ -191,6 +279,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxScrolledMessageDialog.py
@@ -235,6 +325,13 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_c.so
 %%PYTHON_SITELIBDIR%%/wxPython/events.py
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyo
@@ -247,6 +344,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.py
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.py
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmosc.so
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyo
@@ -255,6 +356,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/gridc.so
+%%PYTHON_SITELIBDIR%%/wxPython/help.py
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/helpc.so
 %%PYTHON_SITELIBDIR%%/wxPython/html.py
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyo
@@ -268,6 +373,51 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyo
+%%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/PyCrustApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyo
+%%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/__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/filling.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyo
+%%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/PythonBitmaps.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyo
@@ -298,12 +448,12 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyo
@@ -325,12 +475,30 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyo
@@ -415,6 +583,11 @@
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/xrcc.so
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index dfd88c154ed4..f994e354d7c4 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-wxPython
-PORTVERSION=	2.3.1
+PORTNAME=	wxPython
+PORTVERSION=	2.3.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
-DISTNAME=	wxPython-${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
@@ -44,5 +44,11 @@ do-install:
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
 .endfor
+.for dir in bitmaps bmp_source data
+	@${MKDIR} ${DEMO_DIR}/${dir}
+.for glob in *
+	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo
index be837e76348a..1d63de40558e 100644
--- a/x11-toolkits/py-wxPython24/distinfo
+++ b/x11-toolkits/py-wxPython24/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.3.1.tar.gz) = 079f80de73cd482474bbe0f50e0f7cf3
+MD5 (wxPython-2.3.2.1.tar.gz) = e57b4d030c4ba43a9030fdaee083011c
diff --git a/x11-toolkits/py-wxPython24/files/patch-ac b/x11-toolkits/py-wxPython24/files/patch-ac
index 79ffff04c345..9a5a4b1b76e0 100644
--- a/x11-toolkits/py-wxPython24/files/patch-ac
+++ b/x11-toolkits/py-wxPython24/files/patch-ac
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- setup.py.orig	Tue May 22 19:02:54 2001
-+++ setup.py	Mon May 28 19:58:15 2001
-@@ -86,6 +86,16 @@
+--- setup.py.orig	Thu Dec 20 18:33:42 2001
++++ setup.py	Sun Jan 20 11:00:24 2002
+@@ -111,6 +111,16 @@
  
  
  #----------------------------------------------------------------------
@@ -20,13 +17,13 @@ $FreeBSD$
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -229,9 +239,10 @@
+@@ -277,9 +287,10 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
-     cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
 -             os.popen('gtk-config --cflags', 'r').read()[:-1]
 +             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
      cflags = string.split(cflags)
diff --git a/x11-toolkits/py-wxPython24/files/patch-ad b/x11-toolkits/py-wxPython24/files/patch-ad
deleted file mode 100644
index d5e735f9141f..000000000000
--- a/x11-toolkits/py-wxPython24/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/py-wxPython24/files/Attic/patch-ad,v 1.1 2002-01-21 02:19:46 sobomax Exp $
-
---- contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:10:53	1.1
-+++ contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:12:05
-@@ -1,7 +1,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "PosRegExp.h"
- 
diff --git a/x11-toolkits/py-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 7aeb4dbf8205..6d324dfb07fe 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -32,12 +32,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourDB.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FileBrowseButton.py
@@ -74,22 +80,88 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OOR.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/noicon.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/robin.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/grid.i
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
+%%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/stc.h.html
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/testtable.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tips.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/widgetTest.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.py
@@ -103,12 +175,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.py
@@ -137,10 +213,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDirDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFontDialog.py
@@ -159,6 +241,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListBox.py
@@ -171,6 +255,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.py
@@ -183,6 +269,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.py
@@ -191,6 +279,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxScrolledMessageDialog.py
@@ -235,6 +325,13 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_c.so
 %%PYTHON_SITELIBDIR%%/wxPython/events.py
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyo
@@ -247,6 +344,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.py
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.py
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmosc.so
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyo
@@ -255,6 +356,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/gridc.so
+%%PYTHON_SITELIBDIR%%/wxPython/help.py
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/helpc.so
 %%PYTHON_SITELIBDIR%%/wxPython/html.py
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyo
@@ -268,6 +373,51 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyo
+%%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/PyCrustApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyo
+%%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/__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/filling.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyo
+%%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/PythonBitmaps.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyo
@@ -298,12 +448,12 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyo
@@ -325,12 +475,30 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyo
@@ -415,6 +583,11 @@
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/xrcc.so
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index dfd88c154ed4..f994e354d7c4 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-wxPython
-PORTVERSION=	2.3.1
+PORTNAME=	wxPython
+PORTVERSION=	2.3.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
-DISTNAME=	wxPython-${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
@@ -44,5 +44,11 @@ do-install:
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
 .endfor
+.for dir in bitmaps bmp_source data
+	@${MKDIR} ${DEMO_DIR}/${dir}
+.for glob in *
+	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index be837e76348a..1d63de40558e 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.3.1.tar.gz) = 079f80de73cd482474bbe0f50e0f7cf3
+MD5 (wxPython-2.3.2.1.tar.gz) = e57b4d030c4ba43a9030fdaee083011c
diff --git a/x11-toolkits/py-wxPython26/files/patch-ac b/x11-toolkits/py-wxPython26/files/patch-ac
index 79ffff04c345..9a5a4b1b76e0 100644
--- a/x11-toolkits/py-wxPython26/files/patch-ac
+++ b/x11-toolkits/py-wxPython26/files/patch-ac
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- setup.py.orig	Tue May 22 19:02:54 2001
-+++ setup.py	Mon May 28 19:58:15 2001
-@@ -86,6 +86,16 @@
+--- setup.py.orig	Thu Dec 20 18:33:42 2001
++++ setup.py	Sun Jan 20 11:00:24 2002
+@@ -111,6 +111,16 @@
  
  
  #----------------------------------------------------------------------
@@ -20,13 +17,13 @@ $FreeBSD$
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -229,9 +239,10 @@
+@@ -277,9 +287,10 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
-     cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
 -             os.popen('gtk-config --cflags', 'r').read()[:-1]
 +             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
      cflags = string.split(cflags)
diff --git a/x11-toolkits/py-wxPython26/files/patch-ad b/x11-toolkits/py-wxPython26/files/patch-ad
deleted file mode 100644
index 9ce980adc7e4..000000000000
--- a/x11-toolkits/py-wxPython26/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/py-wxPython26/files/Attic/patch-ad,v 1.1 2002-01-21 02:19:46 sobomax Exp $
-
---- contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:10:53	1.1
-+++ contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:12:05
-@@ -1,7 +1,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "PosRegExp.h"
- 
diff --git a/x11-toolkits/py-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 7aeb4dbf8205..6d324dfb07fe 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -32,12 +32,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourDB.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FileBrowseButton.py
@@ -74,22 +80,88 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OOR.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/noicon.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/robin.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/grid.i
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
+%%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/stc.h.html
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/testtable.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tips.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/widgetTest.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.py
@@ -103,12 +175,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.py
@@ -137,10 +213,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDirDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFontDialog.py
@@ -159,6 +241,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListBox.py
@@ -171,6 +255,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.py
@@ -183,6 +269,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.py
@@ -191,6 +279,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxScrolledMessageDialog.py
@@ -235,6 +325,13 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_c.so
 %%PYTHON_SITELIBDIR%%/wxPython/events.py
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyo
@@ -247,6 +344,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.py
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.py
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmosc.so
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyo
@@ -255,6 +356,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/gridc.so
+%%PYTHON_SITELIBDIR%%/wxPython/help.py
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/helpc.so
 %%PYTHON_SITELIBDIR%%/wxPython/html.py
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyo
@@ -268,6 +373,51 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyo
+%%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/PyCrustApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyo
+%%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/__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/filling.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyo
+%%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/PythonBitmaps.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyo
@@ -298,12 +448,12 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyo
@@ -325,12 +475,30 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyo
@@ -415,6 +583,11 @@
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/xrcc.so
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index dfd88c154ed4..f994e354d7c4 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-wxPython
-PORTVERSION=	2.3.1
+PORTNAME=	wxPython
+PORTVERSION=	2.3.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
-DISTNAME=	wxPython-${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
@@ -44,5 +44,11 @@ do-install:
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
 .endfor
+.for dir in bitmaps bmp_source data
+	@${MKDIR} ${DEMO_DIR}/${dir}
+.for glob in *
+	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index be837e76348a..1d63de40558e 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.3.1.tar.gz) = 079f80de73cd482474bbe0f50e0f7cf3
+MD5 (wxPython-2.3.2.1.tar.gz) = e57b4d030c4ba43a9030fdaee083011c
diff --git a/x11-toolkits/py-wxPython28/files/patch-ac b/x11-toolkits/py-wxPython28/files/patch-ac
index 79ffff04c345..9a5a4b1b76e0 100644
--- a/x11-toolkits/py-wxPython28/files/patch-ac
+++ b/x11-toolkits/py-wxPython28/files/patch-ac
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- setup.py.orig	Tue May 22 19:02:54 2001
-+++ setup.py	Mon May 28 19:58:15 2001
-@@ -86,6 +86,16 @@
+--- setup.py.orig	Thu Dec 20 18:33:42 2001
++++ setup.py	Sun Jan 20 11:00:24 2002
+@@ -111,6 +111,16 @@
  
  
  #----------------------------------------------------------------------
@@ -20,13 +17,13 @@ $FreeBSD$
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -229,9 +239,10 @@
+@@ -277,9 +287,10 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
-     cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
 -             os.popen('gtk-config --cflags', 'r').read()[:-1]
 +             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
      cflags = string.split(cflags)
diff --git a/x11-toolkits/py-wxPython28/files/patch-ad b/x11-toolkits/py-wxPython28/files/patch-ad
deleted file mode 100644
index 9944d1c177af..000000000000
--- a/x11-toolkits/py-wxPython28/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/py-wxPython28/files/Attic/patch-ad,v 1.1 2002-01-21 02:19:46 sobomax Exp $
-
---- contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:10:53	1.1
-+++ contrib/stc/contrib/src/stc/scintilla/src/PosRegExp.cxx	2001/11/27 12:12:05
-@@ -1,7 +1,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "PosRegExp.h"
- 
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 7aeb4dbf8205..6d324dfb07fe 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -32,12 +32,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourDB.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColourSelect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DialogUnits.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FileBrowseButton.py
@@ -74,22 +80,88 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OOR.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PrintFramework.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShell.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/PyShellWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrust.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SplitTree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/noicon.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/robin.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/grid.i
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
+%%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/stc.h.html
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tables.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/test.htm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/testtable.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/tips.txt
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/widgetTest.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.py
@@ -103,12 +175,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/joystick_wdr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/mimetypes_wdr.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/pyTree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/redemo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/simple.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.py
@@ -137,10 +213,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDirDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxDragImage.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxDynamicSashWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditableListBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFontDialog.py
@@ -159,6 +241,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListBox.py
@@ -171,6 +255,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.py
@@ -183,6 +269,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProcess.py
@@ -191,6 +279,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxScrolledMessageDialog.py
@@ -235,6 +325,13 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.py
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/dllwidget_c.so
 %%PYTHON_SITELIBDIR%%/wxPython/events.py
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/events.pyo
@@ -247,6 +344,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.py
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/gdi.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.py
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/gizmos.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/gizmosc.so
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/glcanvas.pyo
@@ -255,6 +356,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/grid.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/gridc.so
+%%PYTHON_SITELIBDIR%%/wxPython/help.py
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/help.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/helpc.so
 %%PYTHON_SITELIBDIR%%/wxPython/html.py
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/html.pyo
@@ -268,6 +373,51 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/CDate.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ClickableHtmlWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/ErrorDialogs.pyo
+%%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/PyCrustApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyCrustApp.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/PyFillingApp.pyo
+%%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/__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/filling.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/introspect.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/pseudo.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyo
+%%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/PythonBitmaps.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PythonBitmaps.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/__init__.pyo
@@ -298,12 +448,12 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/py_editor.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.py
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/tokenizer.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyo
@@ -325,12 +475,30 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/layoutf.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/grid.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyo
@@ -415,6 +583,11 @@
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/xrcc.so
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython