diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index ceb3c10e95dc..c88e3cda359c 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -34,9 +34,9 @@
 #				  The available components are:
 #				  wx			- The wxWidgets library.
 #				  contrib		- The wxWidgets contributed libraries.
-#				  python		- The wxWidgets API for Python (for 2.4-2.6).
-#				  mozilla		- WxMozilla (for 2.4).
-#				  svg			- WxSVG (for 2.6).
+#				  python		- The wxWidgets API for Python.
+#				  mozilla		- WxMozilla (only for 2.4).
+#				  svg			- WxSVG (only for 2.6).
 #				  The available dependency types are:
 #				  build			- Requires component for building.
 #				  lib			- Requires component for building and running.
@@ -178,6 +178,9 @@ _WX_LIB_wx_2.8=			wx_base${_WX_UC}-2.8
 _WX_PORT_contrib_2.8=	x11-toolkits/wxgtk28${_WX_UCL}-contrib
 _WX_LIB_contrib_2.8=	wx_gtk2${_WX_UC}_fl-2.8
 
+_WX_PORT_python_2.8=	x11-toolkits/py-wxPython28${_WX_UCL}
+_WX_FILE_python_2.8=	${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py
+
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
 
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ae76bd5b471a..5e283954b0dc 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -209,6 +209,9 @@
     SUBDIR += py-wxPython26
     SUBDIR += py-wxPython26-common
     SUBDIR += py-wxPython26-unicode
+    SUBDIR += py-wxPython28
+    SUBDIR += py-wxPython28-common
+    SUBDIR += py-wxPython28-unicode
     SUBDIR += py-xlib
     SUBDIR += qscintilla
     SUBDIR += qt33
diff --git a/x11-toolkits/py-wxPython28-common/Makefile b/x11-toolkits/py-wxPython28-common/Makefile
index df79898604ce..67943e58a280 100644
--- a/x11-toolkits/py-wxPython28-common/Makefile
+++ b/x11-toolkits/py-wxPython28-common/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 WITH_COMMON_ONLY=	yes
 
-MASTERDIR=	${.CURDIR}/../py-wxPython26
-PYDISTUTILS_NOEGGINFO=	yes
+MASTERDIR=	${.CURDIR}/../py-wxPython28
 
 PLIST=	${.CURDIR}/pkg-plist
 
diff --git a/x11-toolkits/py-wxPython28-common/pkg-plist b/x11-toolkits/py-wxPython28-common/pkg-plist
index fedf3dfee778..f2d52304e2bf 100644
--- a/x11-toolkits/py-wxPython28-common/pkg-plist
+++ b/x11-toolkits/py-wxPython28-common/pkg-plist
@@ -10,24 +10,21 @@ bin/pyshell
 bin/pywrap
 bin/pywxrc
 bin/xrced
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__controls_rename.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__core_rename.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__gdi_rename.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__init__.py
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__misc_rename.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/__windows_rename.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_about.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_accel.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_app.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_app_ex.py
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_artprov.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_aui_docstrings.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_bitmap.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_brush.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_button.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_calendar_rename.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_checkbox.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_choice.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_clipbrd.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_cmndlgs.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_collpane.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_colour.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_combobox.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_config.i
@@ -58,8 +55,8 @@ include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_gauge.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_gbsizer.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_gdicmn.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_gdiobj.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_grid_rename.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_html_rename.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_graphics.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_hyperlink.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_icon.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_image.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_imaglist.i
@@ -70,18 +67,21 @@ include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_listbox.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_listctrl.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_log.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_mdi.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_media_rename.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_menu.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_mimetype.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_misc.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_notebook.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_obj.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_overlay.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_palette.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_panel.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_pen.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_picker.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_popupwin.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_power.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_printfw.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_process.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_pseudodc.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_pycontrol.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_pywindows.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_radio.i
@@ -95,11 +95,13 @@ include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_slider.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_sound.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_spin.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_splitter.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_srchctrl.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_statctrls.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_statusbar.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_stdpaths.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_stockobjs.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_streams.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_swigtype.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_taskbar.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_template.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_textctrl.i
@@ -112,16 +114,16 @@ include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_toplvl.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_treectrl.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_validator.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_vscroll.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_webkit_rename.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_window.i
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_wizard_rename.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xml.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xmlhandler.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xmlres.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xmlsub.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xrc_ex.py
-include/wx-%%WX_VERSION%%/wx/wxPython/i_files/_xrc_rename.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/animate.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/aui.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/calendar.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/combo.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/controls.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/core.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/gdi.i
@@ -130,24 +132,36 @@ include/wx-%%WX_VERSION%%/wx/wxPython/i_files/html.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/media.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/misc.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/my_typemaps.i
+include/wx-%%WX_VERSION%%/wx/wxPython/i_files/richtext.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/webkit.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/windows.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/wizard.i
 include/wx-%%WX_VERSION%%/wx/wxPython/i_files/xrc.i
 include/wx-%%WX_VERSION%%/wx/wxPython/printfw.h
+include/wx-%%WX_VERSION%%/wx/wxPython/pseudodc.h
 include/wx-%%WX_VERSION%%/wx/wxPython/pyclasses.h
 include/wx-%%WX_VERSION%%/wx/wxPython/pydrawxxx.h
 include/wx-%%WX_VERSION%%/wx/wxPython/pyistream.h
 include/wx-%%WX_VERSION%%/wx/wxPython/pytree.h
 include/wx-%%WX_VERSION%%/wx/wxPython/swigver.h
+include/wx-%%WX_VERSION%%/wx/wxPython/twoitem.h
 include/wx-%%WX_VERSION%%/wx/wxPython/wxPython.h
 include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
-%%PYTHON_SITELIBDIR%%/wxversion.py
-%%PYTHON_SITELIBDIR%%/wxversion.pyc
-%%PYTHON_SITELIBDIR%%/wxversion.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_DockingWindowMgr.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_DockingWindowMgr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_DockingWindowMgr.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_MDI.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_MDI.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_MDI.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_Notebook.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_Notebook.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AUI_Notebook.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/About.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/About.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/About.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AboutBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AboutBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AboutBox.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_FlashWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_FlashWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_FlashWindow.pyo
@@ -157,18 +171,33 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_PDFWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_PDFWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ActiveX_PDFWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AlphaDrawing.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AlphaDrawing.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AlphaDrawing.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/AnalogClock.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/AnalogClock.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/AnalogClock.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AnimateCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AnimateCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/AnimateCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ArtProvider.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ArtProvider.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ArtProvider.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapButton.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapButton.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapButton.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapComboBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapComboBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapComboBox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapFromBuffer.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapFromBuffer.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/BitmapFromBuffer.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Button.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Button.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Button.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ButtonPanel.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ButtonPanel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ButtonPanel.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Calendar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Calendar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Calendar.pyo
@@ -190,6 +219,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Choicebook.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Choicebook.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Choicebook.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CollapsiblePane.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CollapsiblePane.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CollapsiblePane.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColorPanel.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColorPanel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ColorPanel.pyo
@@ -205,6 +237,12 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ComboBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ComboBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ComboBox.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboCtrl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboTreeBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboTreeBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ComboTreeBox.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ContextHelp.pyo
@@ -214,9 +252,15 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/CustomDragAndDrop.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CustomTreeCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CustomTreeCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/CustomTreeCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DatePickerCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DatePickerCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DatePickerCtrl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DelayedResult.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DelayedResult.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DelayedResult.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Dialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Dialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Dialog.pyo
@@ -232,6 +276,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragImage.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DragImage.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DragScroller.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DragScroller.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/DragScroller.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyo
@@ -247,6 +294,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/EventManager.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/EventManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/EventManager.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ExpandoTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ExpandoTextCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ExpandoTextCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyo
@@ -262,6 +312,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FindReplaceDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FindReplaceDialog.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/FlatNotebook.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/FlatNotebook.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/FlatNotebook.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FloatBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FloatBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FloatBar.pyo
@@ -298,6 +351,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GetMouseState.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GetMouseState.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GetMouseState.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/GraphicsContext.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/GraphicsContext.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/GraphicsContext.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Grid.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Grid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Grid.pyo
@@ -337,6 +393,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/I18N.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/I18N.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/I18N.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.pyo
@@ -349,6 +408,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ImageFromStream.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ImageFromStream.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ImageFromStream.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Img2PyArtProvider.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Img2PyArtProvider.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Img2PyArtProvider.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/IntCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/IntCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/IntCtrl.pyo
@@ -445,9 +507,15 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OGL.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OGL.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/OGL.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/OwnerDrawnComboBox.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/OwnerDrawnComboBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/OwnerDrawnComboBox.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PageSetupDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PageSetupDialog.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Pickers.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Pickers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Pickers.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PopupControl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PopupControl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PopupControl.pyo
@@ -469,6 +537,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ProgressDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ProgressDialog.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PseudoDC.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PseudoDC.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/PseudoDC.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PyColourChooser.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PyColourChooser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PyColourChooser.pyo
@@ -490,6 +561,12 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RadioButton.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RadioButton.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RadioButton.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RawBitmapAccess.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RawBitmapAccess.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RawBitmapAccess.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RichTextCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RichTextCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RichTextCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RightTextCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/RightTextCtrl.pyo
@@ -508,12 +585,18 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ScrolledWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ScrolledWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ScrolledWindow.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SearchCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SearchCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SearchCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ShapedWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ShapedWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ShapedWindow.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SingleChoiceDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SingleChoiceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SingleChoiceDialog.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SizedControls.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SizedControls.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/SizedControls.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyo
@@ -589,12 +672,21 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ToolBar.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ToolBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ToolBar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Toolbook.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Toolbook.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Toolbook.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeCtrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeListCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeListCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TreeListCtrl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TreeMixin.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TreeMixin.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/TreeMixin.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Treebook.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Treebook.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Treebook.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyo
@@ -628,10 +720,28 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00183_.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00185_.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/BD13656_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/aquachecked.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/aquaflagged.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/aquanotchecked.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/aquanotflagged.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/checked.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/flagged.ico
 %%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/minus1.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/minus2.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/minus3.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/minus4.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/minus5.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/notchecked.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/notflagged.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/plus1.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/plus2.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/plus3.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/plus4.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/plus5.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/toucan.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/001.png
@@ -684,17 +794,71 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Vippi.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/book.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/book_blue.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/book_green.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/book_red.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bp_btn1.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bp_btn2.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bp_btn3.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bp_btn4.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/carrot.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/clipboard.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/code.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/core.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/custom.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/customcontrol.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/deleteperspective.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/demo.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/dialog.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/exit.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/expansion.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/find.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/findnext.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/floatcanvas.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/frame.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/images.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/inspect.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/layout.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/logo.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/miscellaneous.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/modifiedexists.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/morecontrols.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/moredialog.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/noicon.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/overview.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pencil.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pointy.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/process.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pyshell.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/recent.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rest.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/robin.jpg
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_alignleft.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_alignright.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_bold.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_centre.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_colour.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_copy.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_cut.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_font.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_idea.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_indentless.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_indentmore.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_italic.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_open.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_paste.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_redo.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_sample.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_save.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_smiley.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_underline.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_undo.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rt_zebra.xpm
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/saveperspective.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
@@ -714,6 +878,11 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.htm
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/af/LC_MESSAGES/wxpydemo.mo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/de/LC_MESSAGES/wxpydemo.mo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/es/LC_MESSAGES/wxpydemo.mo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/fr/LC_MESSAGES/wxpydemo.mo
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/it/LC_MESSAGES/wxpydemo.mo
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
@@ -762,6 +931,20 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 %%PYTHON_SITELIBDIR%%/wxPython/demo/widgetTest.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/widgetTest.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/widgetTest.pyo
+%%PYTHON_SITELIBDIR%%/wxversion.py
+%%PYTHON_SITELIBDIR%%/wxversion.pyc
+%%PYTHON_SITELIBDIR%%/wxversion.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/it/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/it
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/fr/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/fr
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/es/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/es
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/de/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/de
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/af/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale/af
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data/locale
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
diff --git a/x11-toolkits/py-wxPython28-unicode/Makefile b/x11-toolkits/py-wxPython28-unicode/Makefile
index ecd3032bb692..515c804dc847 100644
--- a/x11-toolkits/py-wxPython28-unicode/Makefile
+++ b/x11-toolkits/py-wxPython28-unicode/Makefile
@@ -7,6 +7,6 @@
 
 WITH_WXPYTHON_UNICODE=	yes
 
-MASTERDIR=	${.CURDIR}/../py-wxPython26
+MASTERDIR=	${.CURDIR}/../py-wxPython28
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 4f9cf5ff50fe..712f54e095c5 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.6.3.3
-PORTREVISION?=	1
+PORTVERSION=	2.8.4.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -29,23 +29,14 @@ PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}"
 PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
-USE_WX=		2.6
+PYDISTUTILS_NOEGGINFO=	yes
+USE_WX=		2.8
 WX_COMPS=	contrib
 WX_PREMK=	yes
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 WXPORT=		gtk2
 
-.if defined(WITH_COMMON_ONLY)
-PYDISTUTILS_NOEGGINFO=	yes
-.else
-.if defined(WITH_WXPYTHON_UNICODE)
-WX_PYTHON_DIR=	wx-${USE_WX}-${WXPORT}-unicode
-.else
-WX_PYTHON_DIR=	wx-${USE_WX}-${WXPORT}-ansi
-.endif
-PYDISTUTILS_EGGINFO=	${WX_PYTHON_DIR}/wxPython-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info \
-			wxaddons-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
-.endif
+CONFIGURE_ARGS +=	--enable-aui
 
 post-extract:
 # only keep the scripts we need
@@ -99,13 +90,12 @@ PYDISTUTILS_BUILDARGS+=	\
 			INSTALL_MULTIVERSION=1
 .else
 ## These are shared
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython26-common
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython28-common
 
 PYDISTUTILS_BUILDARGS+=	\
 			NO_HEADERS=1 \
 			NO_SCRIPTS=1 \
 			INSTALL_MULTIVERSION=0
-INSTALLS_SHLIB=	yes
 
 . if defined(WITH_WXPYTHON_UNICODE)
 WX_UNICODE=	yes
@@ -114,11 +104,16 @@ PKGNAMESUFFIX=	-unicode
 
 PYDISTUTILS_BUILDARGS+=	\
 			UNICODE=1
+WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
+. else
+PYDISTUTILS_BUILDARGS+=	\
+			UNICODE=0
+WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
 . endif # defined(WITH_WXPYTHON_UNICODE)
 
 # plist substitutions and library dirs
 PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
-LDCONFIG_DIRS+=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/
+USE_LDCONFIG=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/
 
 .endif # !defined(WITH_COMMON_ONLY)
 
@@ -137,10 +132,20 @@ do-install:
 .endfor
 .for dir in bitmaps bmp_source data
 	@${MKDIR} ${DEMO_DIR}/${dir}
-. for glob in *
+# Be careful of locale subdirectories here
+. for glob in *.*
 	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
 . endfor
 .endfor
+# Install this one explicitly as it's the only one without an extension that's not a directory
+	@${INSTALL_DATA} ${WRKSRC}/demo/data/showTips ${DEMO_DIR}/data
+# Install the locale directory structure
+	@${MKDIR} ${DEMO_DIR}/data/locale
+.for dir in af de es fr it
+	@${MKDIR} ${DEMO_DIR}/data/locale/${dir}
+	@${MKDIR} ${DEMO_DIR}/data/locale/${dir}/LC_MESSAGES
+	@${INSTALL_DATA} ${WRKSRC}/demo/data/locale/${dir}/LC_MESSAGES/wxpydemo.mo ${DEMO_DIR}/data/locale/${dir}/LC_MESSAGES
+.endfor
 # header files
 	@${MKDIR} ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files
 .for glob in *.i *.py
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index fb2f40c44a2a..8dedf5e7fe34 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxPython-src-2.6.3.3.tar.bz2) = 66b9c5f8e20a9505c39dab1a1234daa9
-SHA256 (wxPython-src-2.6.3.3.tar.bz2) = fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
-SIZE (wxPython-src-2.6.3.3.tar.bz2) = 18963104
+MD5 (wxPython-src-2.8.4.0.tar.bz2) = 424f5a569635646eb805adfe4e4dd9ec
+SHA256 (wxPython-src-2.8.4.0.tar.bz2) = d0e007634b762fd2e98f29636ceabc5738cc92adf5c11b8553780ece64127252
+SIZE (wxPython-src-2.8.4.0.tar.bz2) = 25133956
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index dd662aa676f9..e90d16d05650 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -5,7 +5,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/__version__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/__version__.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_animate.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_aui.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_calendar.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_combo.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.pyo
@@ -27,6 +29,7 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc_.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_richtext.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_stc.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_webkit.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_windows.py
@@ -38,6 +41,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.pyo
@@ -50,6 +56,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.pyo
@@ -104,6 +113,18 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.pyo
@@ -137,12 +158,24 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/README.txt
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/__init__.pyc
@@ -159,6 +192,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.pyo
@@ -168,18 +204,36 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.pyo
@@ -213,9 +267,15 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.pyo
@@ -252,12 +312,18 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.pyo
@@ -360,6 +426,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.pyo
@@ -439,6 +508,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.pyo
@@ -516,6 +588,7 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython-2.8.4.0-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyo
@@ -801,12 +874,16 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyo
+%%PYTHON_SITELIBDIR%%/wxaddons-2.8.4.0-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.py
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.py
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.pyc
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.pyo
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.py
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.pyc
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/wxaddons
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/lib/mixins
@@ -820,9 +897,11 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/ogl
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/masked
+@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/analogclock/lib_setup
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/analogclock
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib