- Complete repocopy of x11-toolkits/py-wxPython28,

  x11-toolkits/py-wxPython28-common and x11-toolkits/py-wxPython28-unicode,
  applying the corresponding patches.
- Add PYDISTUTILS_NOEGGINFO to fix plist issues [1].
- Integrate with bsd.wx.mk: the noticeable difference is that ports using
  USE_WX=2.6+ and WX_COMPS=python will be built from now on with wxWidgets
  2.8, which was previously restricted for these ports because of the lack of
  the "python" component for version 2.6 [1].

PR:		ports/115349, ports/115350, ports/115351
Submitted by:	Neal Nelson <neal@nelson.name>
Reworked by:	alepulver (myself) [1]

3 files changed, 105 insertions, 21 deletions

diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 4f9cf5ff50fe..712f54e095c5 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.6.3.3
-PORTREVISION?=	1
+PORTVERSION=	2.8.4.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -29,23 +29,14 @@ PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}"
 PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
-USE_WX=		2.6
+PYDISTUTILS_NOEGGINFO=	yes
+USE_WX=		2.8
 WX_COMPS=	contrib
 WX_PREMK=	yes
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 WXPORT=		gtk2
 
-.if defined(WITH_COMMON_ONLY)
-PYDISTUTILS_NOEGGINFO=	yes
-.else
-.if defined(WITH_WXPYTHON_UNICODE)
-WX_PYTHON_DIR=	wx-${USE_WX}-${WXPORT}-unicode
-.else
-WX_PYTHON_DIR=	wx-${USE_WX}-${WXPORT}-ansi
-.endif
-PYDISTUTILS_EGGINFO=	${WX_PYTHON_DIR}/wxPython-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info \
-			wxaddons-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
-.endif
+CONFIGURE_ARGS +=	--enable-aui
 
 post-extract:
 # only keep the scripts we need
@@ -99,13 +90,12 @@ PYDISTUTILS_BUILDARGS+=	\
 			INSTALL_MULTIVERSION=1
 .else
 ## These are shared
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython26-common
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython28-common
 
 PYDISTUTILS_BUILDARGS+=	\
 			NO_HEADERS=1 \
 			NO_SCRIPTS=1 \
 			INSTALL_MULTIVERSION=0
-INSTALLS_SHLIB=	yes
 
 . if defined(WITH_WXPYTHON_UNICODE)
 WX_UNICODE=	yes
@@ -114,11 +104,16 @@ PKGNAMESUFFIX=	-unicode
 
 PYDISTUTILS_BUILDARGS+=	\
 			UNICODE=1
+WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
+. else
+PYDISTUTILS_BUILDARGS+=	\
+			UNICODE=0
+WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
 . endif # defined(WITH_WXPYTHON_UNICODE)
 
 # plist substitutions and library dirs
 PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
-LDCONFIG_DIRS+=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/
+USE_LDCONFIG=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/
 
 .endif # !defined(WITH_COMMON_ONLY)
 
@@ -137,10 +132,20 @@ do-install:
 .endfor
 .for dir in bitmaps bmp_source data
 	@${MKDIR} ${DEMO_DIR}/${dir}
-. for glob in *
+# Be careful of locale subdirectories here
+. for glob in *.*
 	@${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir}
 . endfor
 .endfor
+# Install this one explicitly as it's the only one without an extension that's not a directory
+	@${INSTALL_DATA} ${WRKSRC}/demo/data/showTips ${DEMO_DIR}/data
+# Install the locale directory structure
+	@${MKDIR} ${DEMO_DIR}/data/locale
+.for dir in af de es fr it
+	@${MKDIR} ${DEMO_DIR}/data/locale/${dir}
+	@${MKDIR} ${DEMO_DIR}/data/locale/${dir}/LC_MESSAGES
+	@${INSTALL_DATA} ${WRKSRC}/demo/data/locale/${dir}/LC_MESSAGES/wxpydemo.mo ${DEMO_DIR}/data/locale/${dir}/LC_MESSAGES
+.endfor
 # header files
 	@${MKDIR} ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files
 .for glob in *.i *.py
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index fb2f40c44a2a..8dedf5e7fe34 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxPython-src-2.6.3.3.tar.bz2) = 66b9c5f8e20a9505c39dab1a1234daa9
-SHA256 (wxPython-src-2.6.3.3.tar.bz2) = fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
-SIZE (wxPython-src-2.6.3.3.tar.bz2) = 18963104
+MD5 (wxPython-src-2.8.4.0.tar.bz2) = 424f5a569635646eb805adfe4e4dd9ec
+SHA256 (wxPython-src-2.8.4.0.tar.bz2) = d0e007634b762fd2e98f29636ceabc5738cc92adf5c11b8553780ece64127252
+SIZE (wxPython-src-2.8.4.0.tar.bz2) = 25133956
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index dd662aa676f9..e90d16d05650 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -5,7 +5,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/__version__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/__version__.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_animate.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_aui.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_calendar.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_combo.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_controls.pyo
@@ -27,6 +29,7 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_misc_.so
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_richtext.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_stc.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_webkit.so
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/_windows.py
@@ -38,6 +41,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/animate.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/aui.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/build/__init__.pyo
@@ -50,6 +56,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/calendar.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/combo.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/gizmos.pyo
@@ -104,6 +113,18 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/anchors.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/flagart.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art/img2pyartprov.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttonpanel.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/buttons.pyo
@@ -137,12 +158,24 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourselect.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/combotreebox.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/customtreectrl.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/delayedresult.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dialogs.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/docview.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/dragscroller.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/README.txt
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor/__init__.pyc
@@ -159,6 +192,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/evtmgr.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/expando.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/fancytext.pyo
@@ -168,18 +204,36 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flashwin.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/flatnotebook.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatbar.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/FloatCanvas.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/GUIMode.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/NavCanvas.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Resources.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBox.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/BBoxTest.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/GUI.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/__init__.pyo
@@ -213,9 +267,15 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/infoframe.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/inspection.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/intctrl.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/langlistctrl.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/layoutf.pyo
@@ -252,12 +312,18 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/imagelist.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/inspection.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/listctrl.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/rubberband.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins/treemixin.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/multisash.pyo
@@ -360,6 +426,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/vtk.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wordwrap.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/wxPlotCanvas.pyo
@@ -439,6 +508,9 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/py/version.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.py
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.pyc
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/richtext.pyo
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/stc.pyo
@@ -516,6 +588,7 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyo
+%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython-2.8.4.0-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyo
@@ -801,12 +874,16 @@
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.py
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyc
 %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyo
+%%PYTHON_SITELIBDIR%%/wxaddons-2.8.4.0-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.py
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyc
 %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.py
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.pyc
 %%PYTHON_SITELIBDIR%%/wxaddons/setup.pyo
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.py
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.pyc
+%%PYTHON_SITELIBDIR%%/wxaddons/sized_controls.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/wxaddons
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/lib/mixins
@@ -820,9 +897,11 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/ogl
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/mixins
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/masked
+@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas/Utilities
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/floatcanvas
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/editor
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/colourchooser
+@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/art
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/analogclock/lib_setup
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib/analogclock
 @dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/lib