Update to 2.4.0.7.

Since glib pulls in threads, we gave to use a threaded Python.
While this is not exactly what the author of PR pkg/21428 intended,
it is correct now.
There is still a problem with dynamically loading of C++ libraries
(the known libgcc issue). For reasons I don't understand atm this
only shows up on 1.5.

4 files changed, 387 insertions, 21 deletions

diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 628cd4436d5..3cf5871d885 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/05/02 11:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/09 11:46:43 drochner Exp $
 #
 
-DISTNAME=	wxPython-2.2.2
-PKGNAME=	${PYPKGPREFIX}-wxWindows-2.2.2
-PKGREVISION=	2
+DISTNAME=	wxPythonSrc-2.4.0.7
+PKGNAME=	${PYPKGPREFIX}-wxWindows-2.4.0.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
@@ -11,26 +10,24 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://wxpython.org/
 COMMENT=	wxPython: Python bindings for wxWindows
 
-PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
+WRKSRC=	${WRKDIR}/wxPythonSrc-2.4.0.7/wxPython
 
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	20 # distutils problem with 21 and 22
+# we depend on glib which pulls in threads
+PYTHON_VERSIONS_ACCEPTED=	22pth 21pth
+BUILDLINK_DEPENDS.python21-pth=	python21-pth>=2.1.3nb3
+BUILDLINK_DEPENDS.python22-pth=	python22-pth>=2.2.2nb2
+
 PYDISTUTILSPKG=	yes
-PYSETUPBUILDARGS=	BUILD_GLCANVAS=0
+# no GL to limit dependencies
+# OGL doesn't build with egcs-1.1.2
+# no scripts to avoid conflicts
+PYSETUPBUILDARGS=	BUILD_GLCANVAS=0 BUILD_OGL=0 NO_SCRIPTS=1
+PYSETUPINSTALLARGS=	BUILD_GLCANVAS=0 BUILD_OGL=0 NO_SCRIPTS=1
 PYBINMODULE=	yes
 
-post-install:
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${PREFIX}/${PYSITELIB}/wxPython; \
-	${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py . ; \
-	${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py . )
-	(cd ${PREFIX}; ${FIND} ${PYSITELIB}/wxPython \
-		-type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/wxPython \
-		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-
 .include "../../x11/wxGTK/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-wxWindows/PLIST b/x11/py-wxWindows/PLIST
new file mode 100644
index 00000000000..397432bcfac
--- /dev/null
+++ b/x11/py-wxWindows/PLIST
@@ -0,0 +1,370 @@
+@comment $NetBSD: PLIST,v 1.1 2003/05/09 11:46:43 drochner Exp $
+${PYSITELIB}/wxPython/__init__.py
+${PYSITELIB}/wxPython/__init__.pyc
+${PYSITELIB}/wxPython/__version__.py
+${PYSITELIB}/wxPython/__version__.pyc
+${PYSITELIB}/wxPython/calendar.py
+${PYSITELIB}/wxPython/calendar.pyc
+${PYSITELIB}/wxPython/calendarc.so
+${PYSITELIB}/wxPython/clip_dnd.py
+${PYSITELIB}/wxPython/clip_dnd.pyc
+${PYSITELIB}/wxPython/cmndlgs.py
+${PYSITELIB}/wxPython/cmndlgs.pyc
+${PYSITELIB}/wxPython/controls.py
+${PYSITELIB}/wxPython/controls.pyc
+${PYSITELIB}/wxPython/controls2.py
+${PYSITELIB}/wxPython/controls2.pyc
+${PYSITELIB}/wxPython/dllwidget.py
+${PYSITELIB}/wxPython/dllwidget.pyc
+${PYSITELIB}/wxPython/dllwidget_.py
+${PYSITELIB}/wxPython/dllwidget_.pyc
+${PYSITELIB}/wxPython/dllwidget_c.so
+${PYSITELIB}/wxPython/events.py
+${PYSITELIB}/wxPython/events.pyc
+${PYSITELIB}/wxPython/filesys.py
+${PYSITELIB}/wxPython/filesys.pyc
+${PYSITELIB}/wxPython/fonts.py
+${PYSITELIB}/wxPython/fonts.pyc
+${PYSITELIB}/wxPython/frames.py
+${PYSITELIB}/wxPython/frames.pyc
+${PYSITELIB}/wxPython/gdi.py
+${PYSITELIB}/wxPython/gdi.pyc
+${PYSITELIB}/wxPython/gizmos.py
+${PYSITELIB}/wxPython/gizmos.pyc
+${PYSITELIB}/wxPython/gizmosc.so
+${PYSITELIB}/wxPython/grid.py
+${PYSITELIB}/wxPython/grid.pyc
+${PYSITELIB}/wxPython/gridc.so
+${PYSITELIB}/wxPython/help.py
+${PYSITELIB}/wxPython/help.pyc
+${PYSITELIB}/wxPython/helpc.so
+${PYSITELIB}/wxPython/html.py
+${PYSITELIB}/wxPython/html.pyc
+${PYSITELIB}/wxPython/htmlc.so
+${PYSITELIB}/wxPython/htmlhelp.py
+${PYSITELIB}/wxPython/htmlhelp.pyc
+${PYSITELIB}/wxPython/image.py
+${PYSITELIB}/wxPython/image.pyc
+${PYSITELIB}/wxPython/lib/CDate.py
+${PYSITELIB}/wxPython/lib/CDate.pyc
+${PYSITELIB}/wxPython/lib/ClickableHtmlWindow.py
+${PYSITELIB}/wxPython/lib/ClickableHtmlWindow.pyc
+${PYSITELIB}/wxPython/lib/ErrorDialogs.py
+${PYSITELIB}/wxPython/lib/ErrorDialogs.pyc
+${PYSITELIB}/wxPython/lib/ErrorDialogs_wdr.py
+${PYSITELIB}/wxPython/lib/ErrorDialogs_wdr.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/CHANGES.txt
+${PYSITELIB}/wxPython/lib/PyCrust/PyCrust.ico
+${PYSITELIB}/wxPython/lib/PyCrust/PyCrustApp.py
+${PYSITELIB}/wxPython/lib/PyCrust/PyCrustApp.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/PyFillingApp.py
+${PYSITELIB}/wxPython/lib/PyCrust/PyFillingApp.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/PyShellApp.py
+${PYSITELIB}/wxPython/lib/PyCrust/PyShellApp.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/README.txt
+${PYSITELIB}/wxPython/lib/PyCrust/__init__.py
+${PYSITELIB}/wxPython/lib/PyCrust/__init__.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/crust.py
+${PYSITELIB}/wxPython/lib/PyCrust/crust.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/dispatcher.py
+${PYSITELIB}/wxPython/lib/PyCrust/dispatcher.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/filling.py
+${PYSITELIB}/wxPython/lib/PyCrust/filling.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/images.py
+${PYSITELIB}/wxPython/lib/PyCrust/images.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/interpreter.py
+${PYSITELIB}/wxPython/lib/PyCrust/interpreter.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/introspect.py
+${PYSITELIB}/wxPython/lib/PyCrust/introspect.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/pseudo.py
+${PYSITELIB}/wxPython/lib/PyCrust/pseudo.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/shell.py
+${PYSITELIB}/wxPython/lib/PyCrust/shell.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/shellmenu.py
+${PYSITELIB}/wxPython/lib/PyCrust/shellmenu.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/version.py
+${PYSITELIB}/wxPython/lib/PyCrust/version.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wrap.py
+${PYSITELIB}/wxPython/lib/PyCrust/wrap.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Accelerators.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Accelerators.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/App.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/App.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Base.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Base.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ClipDragDrop.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ClipDragDrop.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Config.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Config.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Controls.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Controls.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/DataStructures.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/DataStructures.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/DateTime.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/DateTime.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Dialogs.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Dialogs.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Drawing.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Drawing.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Errors.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Errors.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/EventFunctions.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/EventFunctions.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Events.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Events.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/FileSystem.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/FileSystem.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Frames.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Frames.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Functions.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Functions.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Help.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Help.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ImageHandlers.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ImageHandlers.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Joystick.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Joystick.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/LayoutConstraints.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/LayoutConstraints.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Logging.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Logging.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Menus.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Menus.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/MimeTypes.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/MimeTypes.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Misc.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Misc.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Panel.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Panel.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Parameters.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Parameters.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Printing.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Printing.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Process.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Process.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/SashSplitter.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/SashSplitter.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Sizers.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Sizers.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Streams.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Streams.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/StyledTextConstants.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/StyledTextConstants.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Threading.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Threading.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ToolBar.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/ToolBar.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Tree.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Tree.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Validators.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Validators.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Window.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/Window.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/__init__.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/__init__.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/d_stc.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/d_stc.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/d_wx.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/d_wx.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/decorator.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/decorator.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/gen.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/gen.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/stc_.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/stc_.pyc
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/wx_.py
+${PYSITELIB}/wxPython/lib/PyCrust/wxd/wx_.pyc
+${PYSITELIB}/wxPython/lib/PythonBitmaps.py
+${PYSITELIB}/wxPython/lib/PythonBitmaps.pyc
+${PYSITELIB}/wxPython/lib/__init__.py
+${PYSITELIB}/wxPython/lib/__init__.pyc
+${PYSITELIB}/wxPython/lib/activexwrapper.py
+${PYSITELIB}/wxPython/lib/activexwrapper.pyc
+${PYSITELIB}/wxPython/lib/anchors.py
+${PYSITELIB}/wxPython/lib/anchors.pyc
+${PYSITELIB}/wxPython/lib/buttons.py
+${PYSITELIB}/wxPython/lib/buttons.pyc
+${PYSITELIB}/wxPython/lib/calendar.py
+${PYSITELIB}/wxPython/lib/calendar.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/__init__.py
+${PYSITELIB}/wxPython/lib/colourchooser/__init__.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/canvas.py
+${PYSITELIB}/wxPython/lib/colourchooser/canvas.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/intl.py
+${PYSITELIB}/wxPython/lib/colourchooser/intl.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourbox.py
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourbox.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourchooser.py
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourchooser.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourslider.py
+${PYSITELIB}/wxPython/lib/colourchooser/pycolourslider.pyc
+${PYSITELIB}/wxPython/lib/colourchooser/pypalette.py
+${PYSITELIB}/wxPython/lib/colourchooser/pypalette.pyc
+${PYSITELIB}/wxPython/lib/colourdb.py
+${PYSITELIB}/wxPython/lib/colourdb.pyc
+${PYSITELIB}/wxPython/lib/colourselect.py
+${PYSITELIB}/wxPython/lib/colourselect.pyc
+${PYSITELIB}/wxPython/lib/dialogs.py
+${PYSITELIB}/wxPython/lib/dialogs.pyc
+${PYSITELIB}/wxPython/lib/editor/__init__.py
+${PYSITELIB}/wxPython/lib/editor/__init__.pyc
+${PYSITELIB}/wxPython/lib/editor/editor.py
+${PYSITELIB}/wxPython/lib/editor/editor.pyc
+${PYSITELIB}/wxPython/lib/editor/images.py
+${PYSITELIB}/wxPython/lib/editor/images.pyc
+${PYSITELIB}/wxPython/lib/editor/selection.py
+${PYSITELIB}/wxPython/lib/editor/selection.pyc
+${PYSITELIB}/wxPython/lib/evtmgr.py
+${PYSITELIB}/wxPython/lib/evtmgr.pyc
+${PYSITELIB}/wxPython/lib/fancytext.py
+${PYSITELIB}/wxPython/lib/fancytext.pyc
+${PYSITELIB}/wxPython/lib/filebrowsebutton.py
+${PYSITELIB}/wxPython/lib/filebrowsebutton.pyc
+${PYSITELIB}/wxPython/lib/floatbar.py
+${PYSITELIB}/wxPython/lib/floatbar.pyc
+${PYSITELIB}/wxPython/lib/gridmovers.py
+${PYSITELIB}/wxPython/lib/gridmovers.pyc
+${PYSITELIB}/wxPython/lib/grids.py
+${PYSITELIB}/wxPython/lib/grids.pyc
+${PYSITELIB}/wxPython/lib/imagebrowser.py
+${PYSITELIB}/wxPython/lib/imagebrowser.pyc
+${PYSITELIB}/wxPython/lib/imageutils.py
+${PYSITELIB}/wxPython/lib/imageutils.pyc
+${PYSITELIB}/wxPython/lib/infoframe.py
+${PYSITELIB}/wxPython/lib/infoframe.pyc
+${PYSITELIB}/wxPython/lib/intctrl.py
+${PYSITELIB}/wxPython/lib/intctrl.pyc
+${PYSITELIB}/wxPython/lib/layoutf.py
+${PYSITELIB}/wxPython/lib/layoutf.pyc
+${PYSITELIB}/wxPython/lib/mixins/__init__.py
+${PYSITELIB}/wxPython/lib/mixins/__init__.pyc
+${PYSITELIB}/wxPython/lib/mixins/grid.py
+${PYSITELIB}/wxPython/lib/mixins/grid.pyc
+${PYSITELIB}/wxPython/lib/mixins/imagelist.py
+${PYSITELIB}/wxPython/lib/mixins/imagelist.pyc
+${PYSITELIB}/wxPython/lib/mixins/listctrl.py
+${PYSITELIB}/wxPython/lib/mixins/listctrl.pyc
+${PYSITELIB}/wxPython/lib/mixins/rubberband.py
+${PYSITELIB}/wxPython/lib/mixins/rubberband.pyc
+${PYSITELIB}/wxPython/lib/multisash.py
+${PYSITELIB}/wxPython/lib/multisash.pyc
+${PYSITELIB}/wxPython/lib/mvctree.py
+${PYSITELIB}/wxPython/lib/mvctree.pyc
+${PYSITELIB}/wxPython/lib/popupctl.py
+${PYSITELIB}/wxPython/lib/popupctl.pyc
+${PYSITELIB}/wxPython/lib/printout.py
+${PYSITELIB}/wxPython/lib/printout.pyc
+${PYSITELIB}/wxPython/lib/pubsub.py
+${PYSITELIB}/wxPython/lib/pubsub.pyc
+${PYSITELIB}/wxPython/lib/pyshell.py
+${PYSITELIB}/wxPython/lib/pyshell.pyc
+${PYSITELIB}/wxPython/lib/rcsizer.py
+${PYSITELIB}/wxPython/lib/rcsizer.pyc
+${PYSITELIB}/wxPython/lib/rightalign.py
+${PYSITELIB}/wxPython/lib/rightalign.pyc
+${PYSITELIB}/wxPython/lib/rpcMixin.py
+${PYSITELIB}/wxPython/lib/rpcMixin.pyc
+${PYSITELIB}/wxPython/lib/sheet.py
+${PYSITELIB}/wxPython/lib/sheet.pyc
+${PYSITELIB}/wxPython/lib/shell.py
+${PYSITELIB}/wxPython/lib/shell.pyc
+${PYSITELIB}/wxPython/lib/splashscreen.py
+${PYSITELIB}/wxPython/lib/splashscreen.pyc
+${PYSITELIB}/wxPython/lib/stattext.py
+${PYSITELIB}/wxPython/lib/stattext.pyc
+${PYSITELIB}/wxPython/lib/throbber.py
+${PYSITELIB}/wxPython/lib/throbber.pyc
+${PYSITELIB}/wxPython/lib/timectrl.py
+${PYSITELIB}/wxPython/lib/timectrl.pyc
+${PYSITELIB}/wxPython/lib/vtk.py
+${PYSITELIB}/wxPython/lib/vtk.pyc
+${PYSITELIB}/wxPython/lib/wxPlotCanvas.py
+${PYSITELIB}/wxPython/lib/wxPlotCanvas.pyc
+${PYSITELIB}/wxPython/lib/wxpTag.py
+${PYSITELIB}/wxPython/lib/wxpTag.pyc
+${PYSITELIB}/wxPython/mdi.py
+${PYSITELIB}/wxPython/mdi.pyc
+${PYSITELIB}/wxPython/misc.py
+${PYSITELIB}/wxPython/misc.pyc
+${PYSITELIB}/wxPython/misc2.py
+${PYSITELIB}/wxPython/misc2.pyc
+${PYSITELIB}/wxPython/printfw.py
+${PYSITELIB}/wxPython/printfw.pyc
+${PYSITELIB}/wxPython/sizers.py
+${PYSITELIB}/wxPython/sizers.pyc
+${PYSITELIB}/wxPython/stattool.py
+${PYSITELIB}/wxPython/stattool.pyc
+${PYSITELIB}/wxPython/stc.py
+${PYSITELIB}/wxPython/stc.pyc
+${PYSITELIB}/wxPython/stc_.py
+${PYSITELIB}/wxPython/stc_.pyc
+${PYSITELIB}/wxPython/stc_c.so
+${PYSITELIB}/wxPython/streams.py
+${PYSITELIB}/wxPython/streams.pyc
+${PYSITELIB}/wxPython/tools/XRCed/CHANGES.txt
+${PYSITELIB}/wxPython/tools/XRCed/README.txt
+${PYSITELIB}/wxPython/tools/XRCed/TODO.txt
+${PYSITELIB}/wxPython/tools/XRCed/__init__.py
+${PYSITELIB}/wxPython/tools/XRCed/__init__.pyc
+${PYSITELIB}/wxPython/tools/XRCed/encode_bitmaps.py
+${PYSITELIB}/wxPython/tools/XRCed/encode_bitmaps.pyc
+${PYSITELIB}/wxPython/tools/XRCed/globals.py
+${PYSITELIB}/wxPython/tools/XRCed/globals.pyc
+${PYSITELIB}/wxPython/tools/XRCed/images.py
+${PYSITELIB}/wxPython/tools/XRCed/images.pyc
+${PYSITELIB}/wxPython/tools/XRCed/license.txt
+${PYSITELIB}/wxPython/tools/XRCed/panel.py
+${PYSITELIB}/wxPython/tools/XRCed/panel.pyc
+${PYSITELIB}/wxPython/tools/XRCed/params.py
+${PYSITELIB}/wxPython/tools/XRCed/params.pyc
+${PYSITELIB}/wxPython/tools/XRCed/tools.py
+${PYSITELIB}/wxPython/tools/XRCed/tools.pyc
+${PYSITELIB}/wxPython/tools/XRCed/tree.py
+${PYSITELIB}/wxPython/tools/XRCed/tree.pyc
+${PYSITELIB}/wxPython/tools/XRCed/undo.py
+${PYSITELIB}/wxPython/tools/XRCed/undo.pyc
+${PYSITELIB}/wxPython/tools/XRCed/xrced.py
+${PYSITELIB}/wxPython/tools/XRCed/xrced.pyc
+${PYSITELIB}/wxPython/tools/XRCed/xrced.xrc
+${PYSITELIB}/wxPython/tools/XRCed/xxx.py
+${PYSITELIB}/wxPython/tools/XRCed/xxx.pyc
+${PYSITELIB}/wxPython/tools/__init__.py
+${PYSITELIB}/wxPython/tools/__init__.pyc
+${PYSITELIB}/wxPython/tools/dbg.py
+${PYSITELIB}/wxPython/tools/dbg.pyc
+${PYSITELIB}/wxPython/tools/helpviewer.py
+${PYSITELIB}/wxPython/tools/helpviewer.pyc
+${PYSITELIB}/wxPython/tools/img2img.py
+${PYSITELIB}/wxPython/tools/img2img.pyc
+${PYSITELIB}/wxPython/tools/img2png.py
+${PYSITELIB}/wxPython/tools/img2png.pyc
+${PYSITELIB}/wxPython/tools/img2py.py
+${PYSITELIB}/wxPython/tools/img2py.pyc
+${PYSITELIB}/wxPython/tools/img2xpm.py
+${PYSITELIB}/wxPython/tools/img2xpm.pyc
+${PYSITELIB}/wxPython/utils.py
+${PYSITELIB}/wxPython/utils.pyc
+${PYSITELIB}/wxPython/windows.py
+${PYSITELIB}/wxPython/windows.pyc
+${PYSITELIB}/wxPython/windows2.py
+${PYSITELIB}/wxPython/windows2.pyc
+${PYSITELIB}/wxPython/windows3.py
+${PYSITELIB}/wxPython/windows3.pyc
+${PYSITELIB}/wxPython/wizard.py
+${PYSITELIB}/wxPython/wizard.pyc
+${PYSITELIB}/wxPython/wizardc.so
+${PYSITELIB}/wxPython/wx.py
+${PYSITELIB}/wxPython/wx.pyc
+${PYSITELIB}/wxPython/wxc.so
+${PYSITELIB}/wxPython/xrc.py
+${PYSITELIB}/wxPython/xrc.pyc
+${PYSITELIB}/wxPython/xrcc.so
+@dirrm ${PYSITELIB}/wxPython/tools/XRCed
+@dirrm ${PYSITELIB}/wxPython/tools
+@dirrm ${PYSITELIB}/wxPython/lib/mixins
+@dirrm ${PYSITELIB}/wxPython/lib/editor
+@dirrm ${PYSITELIB}/wxPython/lib/colourchooser
+@dirrm ${PYSITELIB}/wxPython/lib/PyCrust/wxd
+@dirrm ${PYSITELIB}/wxPython/lib/PyCrust
+@dirrm ${PYSITELIB}/wxPython/lib
+@dirrm ${PYSITELIB}/wxPython
diff --git a/x11/py-wxWindows/PLIST.pre b/x11/py-wxWindows/PLIST.pre
deleted file mode 100644
index 58f54155e71..00000000000
--- a/x11/py-wxWindows/PLIST.pre
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/10/31 22:29:24 zuntum Exp $
diff --git a/x11/py-wxWindows/distinfo b/x11/py-wxWindows/distinfo
index 8def27e6d66..e94f1d815e6 100644
--- a/x11/py-wxWindows/distinfo
+++ b/x11/py-wxWindows/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:42 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/05/09 11:46:44 drochner Exp $
 
-SHA1 (wxPython-2.2.2.tar.gz) = d1849d22b9c2fe6bc6ac36ca3d6824029e9d239b
-Size (wxPython-2.2.2.tar.gz) = 1735942 bytes
+SHA1 (wxPythonSrc-2.4.0.7.tar.gz) = 6ae07395fb75e3f57f26accf19291073c097bf11
+Size (wxPythonSrc-2.4.0.7.tar.gz) = 11819092 bytes