6 files changed, 146 insertions, 176 deletions

diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 7adc55b00299..77280d349b9f 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.6.0.0
+PORTVERSION=	2.6.1.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -16,8 +16,8 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	neal@nelson.name
 COMMENT=	Python bindings for the wxWidgets/GTK GUI toolkit
 
-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
-		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
+LIB_DEPENDS=	wx_gtk2_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26 \
+		wx_gtk2_gizmos-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
@@ -30,7 +30,7 @@ PYDISTUTILS_CONFIGUREARGS+=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
 INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PYTHON_SITELIBDIR%%/wx-2.6.0-gtk2-ansi/wx/
+LDCONFIG_DIRS=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/
 
 post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
diff --git a/x11-toolkits/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index 89cf59dbf0e7..ab56d3751e3c 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxPython-src-2.6.0.0.tar.gz) = 6cb6517546e983e3d730708e0de0ed10
-SIZE (wxPython-src-2.6.0.0.tar.gz) = 18372673 
+MD5 (wxPython-src-2.6.1.0.tar.gz) = 3408f80ef091cfb8a46be4ed70fb0475
+SIZE (wxPython-src-2.6.1.0.tar.gz) = 18452406
diff --git a/x11-toolkits/py-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 195ea370b8d2..14157ac6acec 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -188,6 +188,9 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.pyo
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.pyo
@@ -338,6 +341,9 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.pyo
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.pyo
@@ -905,6 +911,8 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Grid_MegaExample.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HtmlWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ImageAlpha.py
@@ -1093,20 +1101,17 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceHandler.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceSubclass.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceSubclass.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-avtr.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-bookworm.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-bttrfly.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-hooked.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-man.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-phone.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-walker.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00028_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00039_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00178_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00183_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00185_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/BD13656_.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/tbttrfly.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/toucan.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/001.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/002.png
@@ -1127,7 +1132,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/017.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/018.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/019.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/020.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/021.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/022.png
@@ -1139,64 +1143,48 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/028.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/029.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/030.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB01.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB02.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB03.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB04.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB05.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB06.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB07.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB08.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB09.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB10.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB11.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB12.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Tux.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Vippi.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/eclouds.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/carrot.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/floatcanvas.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/logo.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/noicon.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pencil.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pointy.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rest.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/robin.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom01.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom02.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom03.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom04.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom05.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom06.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom07.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom08.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom09.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom10.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom11.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom12.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom13.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom14.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom15.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/thekid.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wxp.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wxpdemo.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/Asteroid_blaster.swf
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
@@ -1206,7 +1194,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
@@ -1233,8 +1220,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/template.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/template.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/templateold.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/templateold.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
@@ -1271,20 +1256,19 @@ bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx
 @dirrm %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi
 @cwd %%X11BASE%%
-include/wx-2.6/wx/wxPython/printfw.h
-include/wx-2.6/wx/wxPython/pyclasses.h
-include/wx-2.6/wx/wxPython/pydrawxxx.h
-include/wx-2.6/wx/wxPython/pyistream.h
-include/wx-2.6/wx/wxPython/pytree.h
-include/wx-2.6/wx/wxPython/wxPython.h
-include/wx-2.6/wx/wxPython/wxPython_int.h
+include/wx-2.6/wx/wxPython/i_files/__controls_rename.i
+include/wx-2.6/wx/wxPython/i_files/__core_rename.i
+include/wx-2.6/wx/wxPython/i_files/__gdi_rename.i
+include/wx-2.6/wx/wxPython/i_files/__init__.py
+include/wx-2.6/wx/wxPython/i_files/__misc_rename.i
+include/wx-2.6/wx/wxPython/i_files/__windows_rename.i
 include/wx-2.6/wx/wxPython/i_files/_accel.i
 include/wx-2.6/wx/wxPython/i_files/_app.i
+include/wx-2.6/wx/wxPython/i_files/_app_ex.py
 include/wx-2.6/wx/wxPython/i_files/_artprov.i
 include/wx-2.6/wx/wxPython/i_files/_bitmap.i
 include/wx-2.6/wx/wxPython/i_files/_brush.i
 include/wx-2.6/wx/wxPython/i_files/_button.i
-include/wx-2.6/wx/wxPython/i_files/calendar.i
 include/wx-2.6/wx/wxPython/i_files/_calendar_rename.i
 include/wx-2.6/wx/wxPython/i_files/_checkbox.i
 include/wx-2.6/wx/wxPython/i_files/_choice.i
@@ -1295,11 +1279,8 @@ include/wx-2.6/wx/wxPython/i_files/_combobox.i
 include/wx-2.6/wx/wxPython/i_files/_config.i
 include/wx-2.6/wx/wxPython/i_files/_constraints.i
 include/wx-2.6/wx/wxPython/i_files/_control.i
-include/wx-2.6/wx/wxPython/i_files/controls.i
-include/wx-2.6/wx/wxPython/i_files/__controls_rename.i
 include/wx-2.6/wx/wxPython/i_files/_core_api.i
-include/wx-2.6/wx/wxPython/i_files/core.i
-include/wx-2.6/wx/wxPython/i_files/__core_rename.i
+include/wx-2.6/wx/wxPython/i_files/_core_ex.py
 include/wx-2.6/wx/wxPython/i_files/_cshelp.i
 include/wx-2.6/wx/wxPython/i_files/_cursor.i
 include/wx-2.6/wx/wxPython/i_files/_dataobj.i
@@ -1313,38 +1294,32 @@ include/wx-2.6/wx/wxPython/i_files/_dnd.i
 include/wx-2.6/wx/wxPython/i_files/_dragimg.i
 include/wx-2.6/wx/wxPython/i_files/_effects.i
 include/wx-2.6/wx/wxPython/i_files/_event.i
+include/wx-2.6/wx/wxPython/i_files/_event_ex.py
 include/wx-2.6/wx/wxPython/i_files/_evthandler.i
 include/wx-2.6/wx/wxPython/i_files/_evtloop.i
 include/wx-2.6/wx/wxPython/i_files/_filesys.i
 include/wx-2.6/wx/wxPython/i_files/_font.i
-include/wx-2.6/wx/wxPython/i_files/gdi.i
 include/wx-2.6/wx/wxPython/i_files/_functions.i
 include/wx-2.6/wx/wxPython/i_files/_gauge.i
 include/wx-2.6/wx/wxPython/i_files/_gbsizer.i
 include/wx-2.6/wx/wxPython/i_files/_gdicmn.i
 include/wx-2.6/wx/wxPython/i_files/_gdiobj.i
-include/wx-2.6/wx/wxPython/i_files/__gdi_rename.i
-include/wx-2.6/wx/wxPython/i_files/grid.i
 include/wx-2.6/wx/wxPython/i_files/_grid_rename.i
-include/wx-2.6/wx/wxPython/i_files/html.i
 include/wx-2.6/wx/wxPython/i_files/_html_rename.i
 include/wx-2.6/wx/wxPython/i_files/_icon.i
 include/wx-2.6/wx/wxPython/i_files/_image.i
 include/wx-2.6/wx/wxPython/i_files/_imaglist.i
 include/wx-2.6/wx/wxPython/i_files/_intl.i
+include/wx-2.6/wx/wxPython/i_files/_intl_ex.py
 include/wx-2.6/wx/wxPython/i_files/_joystick.i
 include/wx-2.6/wx/wxPython/i_files/_listbox.i
 include/wx-2.6/wx/wxPython/i_files/_listctrl.i
 include/wx-2.6/wx/wxPython/i_files/_log.i
 include/wx-2.6/wx/wxPython/i_files/_mdi.i
-include/wx-2.6/wx/wxPython/i_files/media.i
 include/wx-2.6/wx/wxPython/i_files/_media_rename.i
 include/wx-2.6/wx/wxPython/i_files/_menu.i
 include/wx-2.6/wx/wxPython/i_files/_mimetype.i
 include/wx-2.6/wx/wxPython/i_files/_misc.i
-include/wx-2.6/wx/wxPython/i_files/misc.i
-include/wx-2.6/wx/wxPython/i_files/__misc_rename.i
-include/wx-2.6/wx/wxPython/i_files/my_typemaps.i
 include/wx-2.6/wx/wxPython/i_files/_notebook.i
 include/wx-2.6/wx/wxPython/i_files/_obj.i
 include/wx-2.6/wx/wxPython/i_files/_palette.i
@@ -1353,7 +1328,6 @@ include/wx-2.6/wx/wxPython/i_files/_pen.i
 include/wx-2.6/wx/wxPython/i_files/_popupwin.i
 include/wx-2.6/wx/wxPython/i_files/_printfw.i
 include/wx-2.6/wx/wxPython/i_files/_process.i
-include/wx-2.6/wx/wxPython/i_files/_spin.i
 include/wx-2.6/wx/wxPython/i_files/_pycontrol.i
 include/wx-2.6/wx/wxPython/i_files/_pywindows.i
 include/wx-2.6/wx/wxPython/i_files/_radio.i
@@ -1364,6 +1338,7 @@ include/wx-2.6/wx/wxPython/i_files/_settings.i
 include/wx-2.6/wx/wxPython/i_files/_sizers.i
 include/wx-2.6/wx/wxPython/i_files/_slider.i
 include/wx-2.6/wx/wxPython/i_files/_sound.i
+include/wx-2.6/wx/wxPython/i_files/_spin.i
 include/wx-2.6/wx/wxPython/i_files/_splitter.i
 include/wx-2.6/wx/wxPython/i_files/_statctrls.i
 include/wx-2.6/wx/wxPython/i_files/_statusbar.i
@@ -1382,25 +1357,35 @@ include/wx-2.6/wx/wxPython/i_files/_toplvl.i
 include/wx-2.6/wx/wxPython/i_files/_treectrl.i
 include/wx-2.6/wx/wxPython/i_files/_validator.i
 include/wx-2.6/wx/wxPython/i_files/_vscroll.i
-include/wx-2.6/wx/wxPython/i_files/webkit.i
 include/wx-2.6/wx/wxPython/i_files/_webkit_rename.i
 include/wx-2.6/wx/wxPython/i_files/_window.i
-include/wx-2.6/wx/wxPython/i_files/windows.i
-include/wx-2.6/wx/wxPython/i_files/__windows_rename.i
-include/wx-2.6/wx/wxPython/i_files/wizard.i
 include/wx-2.6/wx/wxPython/i_files/_wizard_rename.i
-include/wx-2.6/wx/wxPython/i_files/_xmlhandler.i
 include/wx-2.6/wx/wxPython/i_files/_xml.i
+include/wx-2.6/wx/wxPython/i_files/_xmlhandler.i
 include/wx-2.6/wx/wxPython/i_files/_xmlres.i
 include/wx-2.6/wx/wxPython/i_files/_xmlsub.i
-include/wx-2.6/wx/wxPython/i_files/xrc.i
-include/wx-2.6/wx/wxPython/i_files/_xrc_rename.i
-include/wx-2.6/wx/wxPython/i_files/_app_ex.py
-include/wx-2.6/wx/wxPython/i_files/_core_ex.py
-include/wx-2.6/wx/wxPython/i_files/_event_ex.py
-include/wx-2.6/wx/wxPython/i_files/__init__.py
-include/wx-2.6/wx/wxPython/i_files/_intl_ex.py
 include/wx-2.6/wx/wxPython/i_files/_xrc_ex.py
+include/wx-2.6/wx/wxPython/i_files/_xrc_rename.i
+include/wx-2.6/wx/wxPython/i_files/calendar.i
+include/wx-2.6/wx/wxPython/i_files/controls.i
+include/wx-2.6/wx/wxPython/i_files/core.i
+include/wx-2.6/wx/wxPython/i_files/gdi.i
+include/wx-2.6/wx/wxPython/i_files/grid.i
+include/wx-2.6/wx/wxPython/i_files/html.i
+include/wx-2.6/wx/wxPython/i_files/media.i
+include/wx-2.6/wx/wxPython/i_files/misc.i
+include/wx-2.6/wx/wxPython/i_files/my_typemaps.i
 include/wx-2.6/wx/wxPython/i_files/pyfragments.swg
+include/wx-2.6/wx/wxPython/i_files/webkit.i
+include/wx-2.6/wx/wxPython/i_files/windows.i
+include/wx-2.6/wx/wxPython/i_files/wizard.i
+include/wx-2.6/wx/wxPython/i_files/xrc.i
+include/wx-2.6/wx/wxPython/printfw.h
+include/wx-2.6/wx/wxPython/pyclasses.h
+include/wx-2.6/wx/wxPython/pydrawxxx.h
+include/wx-2.6/wx/wxPython/pyistream.h
+include/wx-2.6/wx/wxPython/pytree.h
+include/wx-2.6/wx/wxPython/wxPython.h
+include/wx-2.6/wx/wxPython/wxPython_int.h
 @dirrm include/wx-2.6/wx/wxPython/i_files
 @dirrm include/wx-2.6/wx/wxPython
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 7adc55b00299..77280d349b9f 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.6.0.0
+PORTVERSION=	2.6.1.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -16,8 +16,8 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	neal@nelson.name
 COMMENT=	Python bindings for the wxWidgets/GTK GUI toolkit
 
-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
-		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
+LIB_DEPENDS=	wx_gtk2_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26 \
+		wx_gtk2_gizmos-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
@@ -30,7 +30,7 @@ PYDISTUTILS_CONFIGUREARGS+=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
 INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PYTHON_SITELIBDIR%%/wx-2.6.0-gtk2-ansi/wx/
+LDCONFIG_DIRS=	%%PREFIX%%/%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/
 
 post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index 89cf59dbf0e7..ab56d3751e3c 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxPython-src-2.6.0.0.tar.gz) = 6cb6517546e983e3d730708e0de0ed10
-SIZE (wxPython-src-2.6.0.0.tar.gz) = 18372673 
+MD5 (wxPython-src-2.6.1.0.tar.gz) = 3408f80ef091cfb8a46be4ed70fb0475
+SIZE (wxPython-src-2.6.1.0.tar.gz) = 18452406
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 195ea370b8d2..14157ac6acec 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -188,6 +188,9 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/grids.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/hyperlink.pyo
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/iewin.pyo
@@ -338,6 +341,9 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/ticker_xrc.pyo
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.py
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.pyc
 %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/lib/vtk.pyo
@@ -905,6 +911,8 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Grid_MegaExample.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HtmlWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/HtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/HyperLinkCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Image.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ImageAlpha.py
@@ -1093,20 +1101,17 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceHandler.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceSubclass.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XmlResourceSubclass.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-avtr.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-bookworm.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-bttrfly.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-hooked.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-man.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-phone.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/ani-walker.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00028_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00039_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00178_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00183_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/AG00185_.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/BD13656_.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/tbttrfly.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/toucan.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/001.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/002.png
@@ -1127,7 +1132,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/017.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/018.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/019.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/020.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/021.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/022.png
@@ -1139,64 +1143,48 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/028.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/029.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/030.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Calend.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbDec.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/DbInc.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Dec.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/GridBG.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Inc.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB01.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB02.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB03.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB04.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB05.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB06.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB07.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB08.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB09.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB10.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB11.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/LB12.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Tux.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Vippi.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/eclouds.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/bulb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/carrot.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/floatcanvas.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/logo.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/noicon.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pencil.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/pointy.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rest.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/robin.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/test2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/testmask.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom01.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom02.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom03.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom04.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom05.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom06.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom07.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom08.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom09.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom10.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom11.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom12.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom13.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom14.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/toblom15.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/thekid.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wxp.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wxpdemo.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/Asteroid_blaster.swf
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
@@ -1206,7 +1194,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
-%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
@@ -1233,8 +1220,6 @@ bin/xrced
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/template.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/template.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/templateold.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/templateold.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
@@ -1271,20 +1256,19 @@ bin/xrced
 @dirrm %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx
 @dirrm %%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi
 @cwd %%X11BASE%%
-include/wx-2.6/wx/wxPython/printfw.h
-include/wx-2.6/wx/wxPython/pyclasses.h
-include/wx-2.6/wx/wxPython/pydrawxxx.h
-include/wx-2.6/wx/wxPython/pyistream.h
-include/wx-2.6/wx/wxPython/pytree.h
-include/wx-2.6/wx/wxPython/wxPython.h
-include/wx-2.6/wx/wxPython/wxPython_int.h
+include/wx-2.6/wx/wxPython/i_files/__controls_rename.i
+include/wx-2.6/wx/wxPython/i_files/__core_rename.i
+include/wx-2.6/wx/wxPython/i_files/__gdi_rename.i
+include/wx-2.6/wx/wxPython/i_files/__init__.py
+include/wx-2.6/wx/wxPython/i_files/__misc_rename.i
+include/wx-2.6/wx/wxPython/i_files/__windows_rename.i
 include/wx-2.6/wx/wxPython/i_files/_accel.i
 include/wx-2.6/wx/wxPython/i_files/_app.i
+include/wx-2.6/wx/wxPython/i_files/_app_ex.py
 include/wx-2.6/wx/wxPython/i_files/_artprov.i
 include/wx-2.6/wx/wxPython/i_files/_bitmap.i
 include/wx-2.6/wx/wxPython/i_files/_brush.i
 include/wx-2.6/wx/wxPython/i_files/_button.i
-include/wx-2.6/wx/wxPython/i_files/calendar.i
 include/wx-2.6/wx/wxPython/i_files/_calendar_rename.i
 include/wx-2.6/wx/wxPython/i_files/_checkbox.i
 include/wx-2.6/wx/wxPython/i_files/_choice.i
@@ -1295,11 +1279,8 @@ include/wx-2.6/wx/wxPython/i_files/_combobox.i
 include/wx-2.6/wx/wxPython/i_files/_config.i
 include/wx-2.6/wx/wxPython/i_files/_constraints.i
 include/wx-2.6/wx/wxPython/i_files/_control.i
-include/wx-2.6/wx/wxPython/i_files/controls.i
-include/wx-2.6/wx/wxPython/i_files/__controls_rename.i
 include/wx-2.6/wx/wxPython/i_files/_core_api.i
-include/wx-2.6/wx/wxPython/i_files/core.i
-include/wx-2.6/wx/wxPython/i_files/__core_rename.i
+include/wx-2.6/wx/wxPython/i_files/_core_ex.py
 include/wx-2.6/wx/wxPython/i_files/_cshelp.i
 include/wx-2.6/wx/wxPython/i_files/_cursor.i
 include/wx-2.6/wx/wxPython/i_files/_dataobj.i
@@ -1313,38 +1294,32 @@ include/wx-2.6/wx/wxPython/i_files/_dnd.i
 include/wx-2.6/wx/wxPython/i_files/_dragimg.i
 include/wx-2.6/wx/wxPython/i_files/_effects.i
 include/wx-2.6/wx/wxPython/i_files/_event.i
+include/wx-2.6/wx/wxPython/i_files/_event_ex.py
 include/wx-2.6/wx/wxPython/i_files/_evthandler.i
 include/wx-2.6/wx/wxPython/i_files/_evtloop.i
 include/wx-2.6/wx/wxPython/i_files/_filesys.i
 include/wx-2.6/wx/wxPython/i_files/_font.i
-include/wx-2.6/wx/wxPython/i_files/gdi.i
 include/wx-2.6/wx/wxPython/i_files/_functions.i
 include/wx-2.6/wx/wxPython/i_files/_gauge.i
 include/wx-2.6/wx/wxPython/i_files/_gbsizer.i
 include/wx-2.6/wx/wxPython/i_files/_gdicmn.i
 include/wx-2.6/wx/wxPython/i_files/_gdiobj.i
-include/wx-2.6/wx/wxPython/i_files/__gdi_rename.i
-include/wx-2.6/wx/wxPython/i_files/grid.i
 include/wx-2.6/wx/wxPython/i_files/_grid_rename.i
-include/wx-2.6/wx/wxPython/i_files/html.i
 include/wx-2.6/wx/wxPython/i_files/_html_rename.i
 include/wx-2.6/wx/wxPython/i_files/_icon.i
 include/wx-2.6/wx/wxPython/i_files/_image.i
 include/wx-2.6/wx/wxPython/i_files/_imaglist.i
 include/wx-2.6/wx/wxPython/i_files/_intl.i
+include/wx-2.6/wx/wxPython/i_files/_intl_ex.py
 include/wx-2.6/wx/wxPython/i_files/_joystick.i
 include/wx-2.6/wx/wxPython/i_files/_listbox.i
 include/wx-2.6/wx/wxPython/i_files/_listctrl.i
 include/wx-2.6/wx/wxPython/i_files/_log.i
 include/wx-2.6/wx/wxPython/i_files/_mdi.i
-include/wx-2.6/wx/wxPython/i_files/media.i
 include/wx-2.6/wx/wxPython/i_files/_media_rename.i
 include/wx-2.6/wx/wxPython/i_files/_menu.i
 include/wx-2.6/wx/wxPython/i_files/_mimetype.i
 include/wx-2.6/wx/wxPython/i_files/_misc.i
-include/wx-2.6/wx/wxPython/i_files/misc.i
-include/wx-2.6/wx/wxPython/i_files/__misc_rename.i
-include/wx-2.6/wx/wxPython/i_files/my_typemaps.i
 include/wx-2.6/wx/wxPython/i_files/_notebook.i
 include/wx-2.6/wx/wxPython/i_files/_obj.i
 include/wx-2.6/wx/wxPython/i_files/_palette.i
@@ -1353,7 +1328,6 @@ include/wx-2.6/wx/wxPython/i_files/_pen.i
 include/wx-2.6/wx/wxPython/i_files/_popupwin.i
 include/wx-2.6/wx/wxPython/i_files/_printfw.i
 include/wx-2.6/wx/wxPython/i_files/_process.i
-include/wx-2.6/wx/wxPython/i_files/_spin.i
 include/wx-2.6/wx/wxPython/i_files/_pycontrol.i
 include/wx-2.6/wx/wxPython/i_files/_pywindows.i
 include/wx-2.6/wx/wxPython/i_files/_radio.i
@@ -1364,6 +1338,7 @@ include/wx-2.6/wx/wxPython/i_files/_settings.i
 include/wx-2.6/wx/wxPython/i_files/_sizers.i
 include/wx-2.6/wx/wxPython/i_files/_slider.i
 include/wx-2.6/wx/wxPython/i_files/_sound.i
+include/wx-2.6/wx/wxPython/i_files/_spin.i
 include/wx-2.6/wx/wxPython/i_files/_splitter.i
 include/wx-2.6/wx/wxPython/i_files/_statctrls.i
 include/wx-2.6/wx/wxPython/i_files/_statusbar.i
@@ -1382,25 +1357,35 @@ include/wx-2.6/wx/wxPython/i_files/_toplvl.i
 include/wx-2.6/wx/wxPython/i_files/_treectrl.i
 include/wx-2.6/wx/wxPython/i_files/_validator.i
 include/wx-2.6/wx/wxPython/i_files/_vscroll.i
-include/wx-2.6/wx/wxPython/i_files/webkit.i
 include/wx-2.6/wx/wxPython/i_files/_webkit_rename.i
 include/wx-2.6/wx/wxPython/i_files/_window.i
-include/wx-2.6/wx/wxPython/i_files/windows.i
-include/wx-2.6/wx/wxPython/i_files/__windows_rename.i
-include/wx-2.6/wx/wxPython/i_files/wizard.i
 include/wx-2.6/wx/wxPython/i_files/_wizard_rename.i
-include/wx-2.6/wx/wxPython/i_files/_xmlhandler.i
 include/wx-2.6/wx/wxPython/i_files/_xml.i
+include/wx-2.6/wx/wxPython/i_files/_xmlhandler.i
 include/wx-2.6/wx/wxPython/i_files/_xmlres.i
 include/wx-2.6/wx/wxPython/i_files/_xmlsub.i
-include/wx-2.6/wx/wxPython/i_files/xrc.i
-include/wx-2.6/wx/wxPython/i_files/_xrc_rename.i
-include/wx-2.6/wx/wxPython/i_files/_app_ex.py
-include/wx-2.6/wx/wxPython/i_files/_core_ex.py
-include/wx-2.6/wx/wxPython/i_files/_event_ex.py
-include/wx-2.6/wx/wxPython/i_files/__init__.py
-include/wx-2.6/wx/wxPython/i_files/_intl_ex.py
 include/wx-2.6/wx/wxPython/i_files/_xrc_ex.py
+include/wx-2.6/wx/wxPython/i_files/_xrc_rename.i
+include/wx-2.6/wx/wxPython/i_files/calendar.i
+include/wx-2.6/wx/wxPython/i_files/controls.i
+include/wx-2.6/wx/wxPython/i_files/core.i
+include/wx-2.6/wx/wxPython/i_files/gdi.i
+include/wx-2.6/wx/wxPython/i_files/grid.i
+include/wx-2.6/wx/wxPython/i_files/html.i
+include/wx-2.6/wx/wxPython/i_files/media.i
+include/wx-2.6/wx/wxPython/i_files/misc.i
+include/wx-2.6/wx/wxPython/i_files/my_typemaps.i
 include/wx-2.6/wx/wxPython/i_files/pyfragments.swg
+include/wx-2.6/wx/wxPython/i_files/webkit.i
+include/wx-2.6/wx/wxPython/i_files/windows.i
+include/wx-2.6/wx/wxPython/i_files/wizard.i
+include/wx-2.6/wx/wxPython/i_files/xrc.i
+include/wx-2.6/wx/wxPython/printfw.h
+include/wx-2.6/wx/wxPython/pyclasses.h
+include/wx-2.6/wx/wxPython/pydrawxxx.h
+include/wx-2.6/wx/wxPython/pyistream.h
+include/wx-2.6/wx/wxPython/pytree.h
+include/wx-2.6/wx/wxPython/wxPython.h
+include/wx-2.6/wx/wxPython/wxPython_int.h
 @dirrm include/wx-2.6/wx/wxPython/i_files
 @dirrm include/wx-2.6/wx/wxPython