Update to 2.2.5.

Approved by:	maintainer

32 files changed, 352 insertions, 1176 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 20d692f8d50..56d0c048f77 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -15,29 +14,31 @@ DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-INSTALLS_SHLIB=	yes
-MAKE_ENV=	LN_S="${LN} -s" \
-		CXX="${CXX}" \
-		SYSCFLAGS="`${GTK_CONFIG} --cflags`" \
-		SYSLFLAGS="`${GTK_CONFIG} --libs` -L${WRKSRC}/src" \
-		_TARGETDIR="${PYTHON_SITELIBDIR}/wxPython" \
-		_HELPERLIBDIR="${PREFIX}/lib" \
-		WRKSRC="${WRKSRC}"
-ALL_TARGET=	default
-INSTALL_TARGET=	install-freebsd
+MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
+SETUP_ARGS=	BUILD_GLCANVAS=0
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+			${SETUP_ARGS}
+DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
-do-configure:
-	${CP} ${FILESDIR}/build.local ${WRKSRC}/src/build.local
-	${CP} ${FILESDIR}/build.local.stc ${WRKSRC}/contrib/stc/build.local
-	${CP} ${FILESDIR}/build.local.ogl ${WRKSRC}/contrib/ogl/build.local
-	cd ${WRKSRC}/src && ../distrib/build.py
-	cd ${WRKSRC}/contrib/stc && ../../distrib/build.py
-	cd ${WRKSRC}/contrib/ogl && ../../distrib/build.py
+do-build:
+	@${SETUP_CMD} build
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
+.if !defined(DEBUG_FLAGS)
+	@find ${WRKSRC} -name "*.so" | xargs strip
+.endif
+
+do-install:
+	@${SETUP_CMD} install
+	@${MKDIR} ${DEMO_DIR}
+.for glob in *.py *.pyc
+	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index b2488a34e21..2626a40c33d 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
+MD5 (wxPython-2.2.5.tar.gz) = 04f6b94549c1fa0949d35d0c9d9bcb3c
diff --git a/x11-toolkits/py-wxPython/files/build.local b/x11-toolkits/py-wxPython/files/build.local
deleted file mode 100644
index 3ac0d3b2b62..00000000000
--- a/x11-toolkits/py-wxPython/files/build.local
+++ /dev/null
@@ -1,17 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = "$(SYSCFLAGS)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-HELPERLIBDIR= "$(_HELPERLIBDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles \
-	installLib installDemo lib$(HELPERLIB)$(SO)
-	$(BSD_INSTALL_DATA) lib$(HELPERLIB)$(SO) \
-		$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO).1
-	cd $(HELPERLIBDIR) && rm -f lib$(HELPERLIB)$(SO)
-	cd $(HELPERLIBDIR) && ${LN_S} lib$(HELPERLIB)$(SO).1 \
-		lib$(HELPERLIB)$(SO)
-
-"""
diff --git a/x11-toolkits/py-wxPython/files/build.local.ogl b/x11-toolkits/py-wxPython/files/build.local.ogl
deleted file mode 100644
index d70f790435f..00000000000
--- a/x11-toolkits/py-wxPython/files/build.local.ogl
+++ /dev/null
@@ -1,10 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython/files/build.local.stc b/x11-toolkits/py-wxPython/files/build.local.stc
deleted file mode 100644
index bf6a4c55a1f..00000000000
--- a/x11-toolkits/py-wxPython/files/build.local.stc
+++ /dev/null
@@ -1,16 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
-              '-I$(STCLOC)/contrib/include ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/src ' + \
-              '-I$(WXPSRCDIR) ' + \
-              '$(SYSCFLAGS)'
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython/files/patch-ab b/x11-toolkits/py-wxPython/files/patch-ab
deleted file mode 100644
index 91d04cbfe00..00000000000
--- a/x11-toolkits/py-wxPython/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Dec  8 16:07:15 2000
-+++ Makefile	Fri Dec  8 16:48:34 2000
-@@ -0,0 +1,12 @@
-+SUBDIRS=	src contrib/stc contrib/ogl
-+
-+default:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} default || exit 1; \
-+	done
-+
-+install-freebsd:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} install-freebsd || exit 1; \
-+	done
-+	
diff --git a/x11-toolkits/py-wxPython/files/patch-ac b/x11-toolkits/py-wxPython/files/patch-ac
new file mode 100644
index 00000000000..3dec6284f12
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/patch-ac
@@ -0,0 +1,39 @@
+--- setup.py	2000/12/12 14:56:17	1.1
++++ setup.py	2000/12/12 15:22:46
+@@ -68,6 +68,19 @@
+ 
+ 
+ #----------------------------------------------------------------------
++# Check for some environment variables
++#----------------------------------------------------------------------
++
++try: gtk_config = os.environ['GTK_CONFIG']
++except KeyError: gtk_config = 'gtk-config'
++
++try: wx_config = os.environ['WX_CONFIG']
++except KeyError: wx_config = 'wx-config'
++
++try: sys_libs = string.split(os.environ['LIBS'])
++except KeyError: sys_libs = []
++
++#----------------------------------------------------------------------
+ # Check for build flags on the command line
+ #----------------------------------------------------------------------
+ 
+@@ -172,12 +185,13 @@
+                ]
+     libdirs = []
+     libs = []
++    libs.extend(sys_libs)
+ 
+-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
+-             os.popen('gtk-config --cflags', 'r').read()[:-1]
++    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
++             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
+     cflags = string.split(cflags)
+ 
+-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
++    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
+     lflags = string.split(lflags)
+ 
+ 
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 1f970dee108..3ffaaabc927 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -1,507 +1,319 @@
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendarc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/01c.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/10s.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/12h.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/13d.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Calend.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbDec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbInc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Dec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Inc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Pt.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/backgrnd.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/copy.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.jpg
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/mondrian.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/new.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/open.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/paste.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/splash.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_mask.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/grid.i
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/showTips
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/stc.h
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tables.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/test.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tips.txt
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/widgetTest.htm
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/paper.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/quotes.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_cmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_c.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/utilsc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxcmodule.so
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.so.1
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxc.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 20d692f8d50..56d0c048f77 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -15,29 +14,31 @@ DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-INSTALLS_SHLIB=	yes
-MAKE_ENV=	LN_S="${LN} -s" \
-		CXX="${CXX}" \
-		SYSCFLAGS="`${GTK_CONFIG} --cflags`" \
-		SYSLFLAGS="`${GTK_CONFIG} --libs` -L${WRKSRC}/src" \
-		_TARGETDIR="${PYTHON_SITELIBDIR}/wxPython" \
-		_HELPERLIBDIR="${PREFIX}/lib" \
-		WRKSRC="${WRKSRC}"
-ALL_TARGET=	default
-INSTALL_TARGET=	install-freebsd
+MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
+SETUP_ARGS=	BUILD_GLCANVAS=0
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+			${SETUP_ARGS}
+DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
-do-configure:
-	${CP} ${FILESDIR}/build.local ${WRKSRC}/src/build.local
-	${CP} ${FILESDIR}/build.local.stc ${WRKSRC}/contrib/stc/build.local
-	${CP} ${FILESDIR}/build.local.ogl ${WRKSRC}/contrib/ogl/build.local
-	cd ${WRKSRC}/src && ../distrib/build.py
-	cd ${WRKSRC}/contrib/stc && ../../distrib/build.py
-	cd ${WRKSRC}/contrib/ogl && ../../distrib/build.py
+do-build:
+	@${SETUP_CMD} build
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
+.if !defined(DEBUG_FLAGS)
+	@find ${WRKSRC} -name "*.so" | xargs strip
+.endif
+
+do-install:
+	@${SETUP_CMD} install
+	@${MKDIR} ${DEMO_DIR}
+.for glob in *.py *.pyc
+	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo
index b2488a34e21..2626a40c33d 100644
--- a/x11-toolkits/py-wxPython24/distinfo
+++ b/x11-toolkits/py-wxPython24/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
+MD5 (wxPython-2.2.5.tar.gz) = 04f6b94549c1fa0949d35d0c9d9bcb3c
diff --git a/x11-toolkits/py-wxPython24/files/build.local b/x11-toolkits/py-wxPython24/files/build.local
deleted file mode 100644
index 3ac0d3b2b62..00000000000
--- a/x11-toolkits/py-wxPython24/files/build.local
+++ /dev/null
@@ -1,17 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = "$(SYSCFLAGS)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-HELPERLIBDIR= "$(_HELPERLIBDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles \
-	installLib installDemo lib$(HELPERLIB)$(SO)
-	$(BSD_INSTALL_DATA) lib$(HELPERLIB)$(SO) \
-		$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO).1
-	cd $(HELPERLIBDIR) && rm -f lib$(HELPERLIB)$(SO)
-	cd $(HELPERLIBDIR) && ${LN_S} lib$(HELPERLIB)$(SO).1 \
-		lib$(HELPERLIB)$(SO)
-
-"""
diff --git a/x11-toolkits/py-wxPython24/files/build.local.ogl b/x11-toolkits/py-wxPython24/files/build.local.ogl
deleted file mode 100644
index d70f790435f..00000000000
--- a/x11-toolkits/py-wxPython24/files/build.local.ogl
+++ /dev/null
@@ -1,10 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython24/files/build.local.stc b/x11-toolkits/py-wxPython24/files/build.local.stc
deleted file mode 100644
index bf6a4c55a1f..00000000000
--- a/x11-toolkits/py-wxPython24/files/build.local.stc
+++ /dev/null
@@ -1,16 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
-              '-I$(STCLOC)/contrib/include ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/src ' + \
-              '-I$(WXPSRCDIR) ' + \
-              '$(SYSCFLAGS)'
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython24/files/patch-ab b/x11-toolkits/py-wxPython24/files/patch-ab
deleted file mode 100644
index 91d04cbfe00..00000000000
--- a/x11-toolkits/py-wxPython24/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Dec  8 16:07:15 2000
-+++ Makefile	Fri Dec  8 16:48:34 2000
-@@ -0,0 +1,12 @@
-+SUBDIRS=	src contrib/stc contrib/ogl
-+
-+default:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} default || exit 1; \
-+	done
-+
-+install-freebsd:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} install-freebsd || exit 1; \
-+	done
-+	
diff --git a/x11-toolkits/py-wxPython24/files/patch-ac b/x11-toolkits/py-wxPython24/files/patch-ac
new file mode 100644
index 00000000000..3dec6284f12
--- /dev/null
+++ b/x11-toolkits/py-wxPython24/files/patch-ac
@@ -0,0 +1,39 @@
+--- setup.py	2000/12/12 14:56:17	1.1
++++ setup.py	2000/12/12 15:22:46
+@@ -68,6 +68,19 @@
+ 
+ 
+ #----------------------------------------------------------------------
++# Check for some environment variables
++#----------------------------------------------------------------------
++
++try: gtk_config = os.environ['GTK_CONFIG']
++except KeyError: gtk_config = 'gtk-config'
++
++try: wx_config = os.environ['WX_CONFIG']
++except KeyError: wx_config = 'wx-config'
++
++try: sys_libs = string.split(os.environ['LIBS'])
++except KeyError: sys_libs = []
++
++#----------------------------------------------------------------------
+ # Check for build flags on the command line
+ #----------------------------------------------------------------------
+ 
+@@ -172,12 +185,13 @@
+                ]
+     libdirs = []
+     libs = []
++    libs.extend(sys_libs)
+ 
+-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
+-             os.popen('gtk-config --cflags', 'r').read()[:-1]
++    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
++             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
+     cflags = string.split(cflags)
+ 
+-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
++    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
+     lflags = string.split(lflags)
+ 
+ 
diff --git a/x11-toolkits/py-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 1f970dee108..3ffaaabc927 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -1,507 +1,319 @@
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendarc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/01c.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/10s.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/12h.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/13d.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Calend.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbDec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbInc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Dec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Inc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Pt.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/backgrnd.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/copy.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.jpg
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/mondrian.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/new.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/open.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/paste.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/splash.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_mask.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/grid.i
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/showTips
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/stc.h
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tables.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/test.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tips.txt
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/widgetTest.htm
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/paper.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/quotes.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_cmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_c.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/utilsc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxcmodule.so
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.so.1
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxc.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 20d692f8d50..56d0c048f77 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -15,29 +14,31 @@ DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-INSTALLS_SHLIB=	yes
-MAKE_ENV=	LN_S="${LN} -s" \
-		CXX="${CXX}" \
-		SYSCFLAGS="`${GTK_CONFIG} --cflags`" \
-		SYSLFLAGS="`${GTK_CONFIG} --libs` -L${WRKSRC}/src" \
-		_TARGETDIR="${PYTHON_SITELIBDIR}/wxPython" \
-		_HELPERLIBDIR="${PREFIX}/lib" \
-		WRKSRC="${WRKSRC}"
-ALL_TARGET=	default
-INSTALL_TARGET=	install-freebsd
+MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
+SETUP_ARGS=	BUILD_GLCANVAS=0
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+			${SETUP_ARGS}
+DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
-do-configure:
-	${CP} ${FILESDIR}/build.local ${WRKSRC}/src/build.local
-	${CP} ${FILESDIR}/build.local.stc ${WRKSRC}/contrib/stc/build.local
-	${CP} ${FILESDIR}/build.local.ogl ${WRKSRC}/contrib/ogl/build.local
-	cd ${WRKSRC}/src && ../distrib/build.py
-	cd ${WRKSRC}/contrib/stc && ../../distrib/build.py
-	cd ${WRKSRC}/contrib/ogl && ../../distrib/build.py
+do-build:
+	@${SETUP_CMD} build
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
+.if !defined(DEBUG_FLAGS)
+	@find ${WRKSRC} -name "*.so" | xargs strip
+.endif
+
+do-install:
+	@${SETUP_CMD} install
+	@${MKDIR} ${DEMO_DIR}
+.for glob in *.py *.pyc
+	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index b2488a34e21..2626a40c33d 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
+MD5 (wxPython-2.2.5.tar.gz) = 04f6b94549c1fa0949d35d0c9d9bcb3c
diff --git a/x11-toolkits/py-wxPython26/files/build.local b/x11-toolkits/py-wxPython26/files/build.local
deleted file mode 100644
index 3ac0d3b2b62..00000000000
--- a/x11-toolkits/py-wxPython26/files/build.local
+++ /dev/null
@@ -1,17 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = "$(SYSCFLAGS)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-HELPERLIBDIR= "$(_HELPERLIBDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles \
-	installLib installDemo lib$(HELPERLIB)$(SO)
-	$(BSD_INSTALL_DATA) lib$(HELPERLIB)$(SO) \
-		$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO).1
-	cd $(HELPERLIBDIR) && rm -f lib$(HELPERLIB)$(SO)
-	cd $(HELPERLIBDIR) && ${LN_S} lib$(HELPERLIB)$(SO).1 \
-		lib$(HELPERLIB)$(SO)
-
-"""
diff --git a/x11-toolkits/py-wxPython26/files/build.local.ogl b/x11-toolkits/py-wxPython26/files/build.local.ogl
deleted file mode 100644
index d70f790435f..00000000000
--- a/x11-toolkits/py-wxPython26/files/build.local.ogl
+++ /dev/null
@@ -1,10 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython26/files/build.local.stc b/x11-toolkits/py-wxPython26/files/build.local.stc
deleted file mode 100644
index bf6a4c55a1f..00000000000
--- a/x11-toolkits/py-wxPython26/files/build.local.stc
+++ /dev/null
@@ -1,16 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
-              '-I$(STCLOC)/contrib/include ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/src ' + \
-              '-I$(WXPSRCDIR) ' + \
-              '$(SYSCFLAGS)'
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython26/files/patch-ab b/x11-toolkits/py-wxPython26/files/patch-ab
deleted file mode 100644
index 91d04cbfe00..00000000000
--- a/x11-toolkits/py-wxPython26/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Dec  8 16:07:15 2000
-+++ Makefile	Fri Dec  8 16:48:34 2000
-@@ -0,0 +1,12 @@
-+SUBDIRS=	src contrib/stc contrib/ogl
-+
-+default:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} default || exit 1; \
-+	done
-+
-+install-freebsd:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} install-freebsd || exit 1; \
-+	done
-+	
diff --git a/x11-toolkits/py-wxPython26/files/patch-ac b/x11-toolkits/py-wxPython26/files/patch-ac
new file mode 100644
index 00000000000..3dec6284f12
--- /dev/null
+++ b/x11-toolkits/py-wxPython26/files/patch-ac
@@ -0,0 +1,39 @@
+--- setup.py	2000/12/12 14:56:17	1.1
++++ setup.py	2000/12/12 15:22:46
+@@ -68,6 +68,19 @@
+ 
+ 
+ #----------------------------------------------------------------------
++# Check for some environment variables
++#----------------------------------------------------------------------
++
++try: gtk_config = os.environ['GTK_CONFIG']
++except KeyError: gtk_config = 'gtk-config'
++
++try: wx_config = os.environ['WX_CONFIG']
++except KeyError: wx_config = 'wx-config'
++
++try: sys_libs = string.split(os.environ['LIBS'])
++except KeyError: sys_libs = []
++
++#----------------------------------------------------------------------
+ # Check for build flags on the command line
+ #----------------------------------------------------------------------
+ 
+@@ -172,12 +185,13 @@
+                ]
+     libdirs = []
+     libs = []
++    libs.extend(sys_libs)
+ 
+-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
+-             os.popen('gtk-config --cflags', 'r').read()[:-1]
++    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
++             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
+     cflags = string.split(cflags)
+ 
+-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
++    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
+     lflags = string.split(lflags)
+ 
+ 
diff --git a/x11-toolkits/py-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 1f970dee108..3ffaaabc927 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -1,507 +1,319 @@
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendarc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/01c.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/10s.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/12h.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/13d.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Calend.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbDec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbInc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Dec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Inc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Pt.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/backgrnd.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/copy.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.jpg
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/mondrian.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/new.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/open.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/paste.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/splash.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_mask.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/grid.i
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/showTips
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/stc.h
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tables.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/test.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tips.txt
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/widgetTest.htm
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/paper.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/quotes.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_cmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_c.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/utilsc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxcmodule.so
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.so.1
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxc.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 20d692f8d50..56d0c048f77 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -15,29 +14,31 @@ DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-INSTALLS_SHLIB=	yes
-MAKE_ENV=	LN_S="${LN} -s" \
-		CXX="${CXX}" \
-		SYSCFLAGS="`${GTK_CONFIG} --cflags`" \
-		SYSLFLAGS="`${GTK_CONFIG} --libs` -L${WRKSRC}/src" \
-		_TARGETDIR="${PYTHON_SITELIBDIR}/wxPython" \
-		_HELPERLIBDIR="${PREFIX}/lib" \
-		WRKSRC="${WRKSRC}"
-ALL_TARGET=	default
-INSTALL_TARGET=	install-freebsd
+MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
+SETUP_ARGS=	BUILD_GLCANVAS=0
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+			${SETUP_ARGS}
+DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
-do-configure:
-	${CP} ${FILESDIR}/build.local ${WRKSRC}/src/build.local
-	${CP} ${FILESDIR}/build.local.stc ${WRKSRC}/contrib/stc/build.local
-	${CP} ${FILESDIR}/build.local.ogl ${WRKSRC}/contrib/ogl/build.local
-	cd ${WRKSRC}/src && ../distrib/build.py
-	cd ${WRKSRC}/contrib/stc && ../../distrib/build.py
-	cd ${WRKSRC}/contrib/ogl && ../../distrib/build.py
+do-build:
+	@${SETUP_CMD} build
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
+.if !defined(DEBUG_FLAGS)
+	@find ${WRKSRC} -name "*.so" | xargs strip
+.endif
+
+do-install:
+	@${SETUP_CMD} install
+	@${MKDIR} ${DEMO_DIR}
+.for glob in *.py *.pyc
+	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index b2488a34e21..2626a40c33d 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
+MD5 (wxPython-2.2.5.tar.gz) = 04f6b94549c1fa0949d35d0c9d9bcb3c
diff --git a/x11-toolkits/py-wxPython28/files/build.local b/x11-toolkits/py-wxPython28/files/build.local
deleted file mode 100644
index 3ac0d3b2b62..00000000000
--- a/x11-toolkits/py-wxPython28/files/build.local
+++ /dev/null
@@ -1,17 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = "$(SYSCFLAGS)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-HELPERLIBDIR= "$(_HELPERLIBDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles \
-	installLib installDemo lib$(HELPERLIB)$(SO)
-	$(BSD_INSTALL_DATA) lib$(HELPERLIB)$(SO) \
-		$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO).1
-	cd $(HELPERLIBDIR) && rm -f lib$(HELPERLIB)$(SO)
-	cd $(HELPERLIBDIR) && ${LN_S} lib$(HELPERLIB)$(SO).1 \
-		lib$(HELPERLIB)$(SO)
-
-"""
diff --git a/x11-toolkits/py-wxPython28/files/build.local.ogl b/x11-toolkits/py-wxPython28/files/build.local.ogl
deleted file mode 100644
index d70f790435f..00000000000
--- a/x11-toolkits/py-wxPython28/files/build.local.ogl
+++ /dev/null
@@ -1,10 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython28/files/build.local.stc b/x11-toolkits/py-wxPython28/files/build.local.stc
deleted file mode 100644
index bf6a4c55a1f..00000000000
--- a/x11-toolkits/py-wxPython28/files/build.local.stc
+++ /dev/null
@@ -1,16 +0,0 @@
-WXPSRCDIR   = "$(WRKSRC)/src"
-CCC         = "$(CXX)"
-OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
-              '-I$(STCLOC)/contrib/include ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/src ' + \
-              '-I$(WXPSRCDIR) ' + \
-              '$(SYSCFLAGS)'
-OTHERLFLAGS = "$(SYSLFLAGS)"
-TARGETDIR   = "$(_TARGETDIR)"
-OTHERRULES  = OTHERRULES + r"""
-
-install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
-	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
-
-"""
diff --git a/x11-toolkits/py-wxPython28/files/patch-ab b/x11-toolkits/py-wxPython28/files/patch-ab
deleted file mode 100644
index 91d04cbfe00..00000000000
--- a/x11-toolkits/py-wxPython28/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Dec  8 16:07:15 2000
-+++ Makefile	Fri Dec  8 16:48:34 2000
-@@ -0,0 +1,12 @@
-+SUBDIRS=	src contrib/stc contrib/ogl
-+
-+default:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} default || exit 1; \
-+	done
-+
-+install-freebsd:
-+	@for dir in $(SUBDIRS); do \
-+		$(MAKE) -C $${dir} install-freebsd || exit 1; \
-+	done
-+	
diff --git a/x11-toolkits/py-wxPython28/files/patch-ac b/x11-toolkits/py-wxPython28/files/patch-ac
new file mode 100644
index 00000000000..3dec6284f12
--- /dev/null
+++ b/x11-toolkits/py-wxPython28/files/patch-ac
@@ -0,0 +1,39 @@
+--- setup.py	2000/12/12 14:56:17	1.1
++++ setup.py	2000/12/12 15:22:46
+@@ -68,6 +68,19 @@
+ 
+ 
+ #----------------------------------------------------------------------
++# Check for some environment variables
++#----------------------------------------------------------------------
++
++try: gtk_config = os.environ['GTK_CONFIG']
++except KeyError: gtk_config = 'gtk-config'
++
++try: wx_config = os.environ['WX_CONFIG']
++except KeyError: wx_config = 'wx-config'
++
++try: sys_libs = string.split(os.environ['LIBS'])
++except KeyError: sys_libs = []
++
++#----------------------------------------------------------------------
+ # Check for build flags on the command line
+ #----------------------------------------------------------------------
+ 
+@@ -172,12 +185,13 @@
+                ]
+     libdirs = []
+     libs = []
++    libs.extend(sys_libs)
+ 
+-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
+-             os.popen('gtk-config --cflags', 'r').read()[:-1]
++    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
++             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
+     cflags = string.split(cflags)
+ 
+-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
++    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
+     lflags = string.split(lflags)
+ 
+ 
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 1f970dee108..3ffaaabc927 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -1,507 +1,319 @@
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/__version__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/calendarc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/clip_dnd.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/cmndlgs.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/controls2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/About.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DragAndDrop.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FancyText.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FileBrowseButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/FontEnumerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GenericButtons.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustEditor.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridCustTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridEnterHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridHugeTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDIDemo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OldSizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PythonEvents.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/SlashDot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Threads.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/XMLtreeview.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/01c.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/10s.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/12h.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/13d.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Calend.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbDec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/DbInc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Dec.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Inc.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/Pt.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/backgrnd.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/copy.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.jpg
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/lb2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/mondrian.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/new.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/open.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/paste.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/smiles.ico
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/splash.gif
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_image.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/test_mask.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog1.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps/tog2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/grid.i
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/imagemap.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic.png
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/pic2.bmp
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/showTips
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/stc.h
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tables.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/test.htm
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/tips.txt
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data/widgetTest.htm
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/paper.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/quotes.xml
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/run.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/viewer_basics.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/widgetTest.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCalendarCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxCheckListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxChoice.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxColourDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxComboBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDirDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxDragImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxEditor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFileDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFloatBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFontDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGLCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGauge.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxGrid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMVCTree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMask.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMiniFrame.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxNotebook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxOGL.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPageSetupDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxPrintDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProcess.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxProgressDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxRadioBox.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSashWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledMessageDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxScrolledWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSingleChoiceDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSlider.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinButton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSpinCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxSplitterWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticBitmap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStaticText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStatusBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/html.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/htmlhelp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/image.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/CDate.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/activexwrapper.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/anchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/README.txt
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/py_editor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/tokenizer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/fancytext.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/filebrowsebutton.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/pyshell.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/rpcMixin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/shell.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/border.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/box.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/shape.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.py
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers/sizer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/splashscreen.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/vtk.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxPlotCanvas.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/wxpTag.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/mdi.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_cmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_c.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/streams.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/utilsc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/windows3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxcmodule.so
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.so.1
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxc.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/sizers
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython