Update 2.1.11 -> 2.1.15

3 files changed, 90 insertions, 4 deletions

diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 232621f1df08..3eb70adba8fc 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.1.11
+PORTVERSION=	2.1.15
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	http://alldunn.com/wxPython/dist/ \
-		http://www.nectar.com/distfiles/
+MASTER_SITES=	http://alldunn.com/wxPython/dist/
 DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
@@ -39,6 +38,9 @@ do-configure:
 		${FILESDIR}/build.local > ${WRKSRC}/../build.local
 	cd ${WRKSRC} && ../distrib/build.py
 	cd ${HTMLSRC} && ../../distrib/build.py
+# XXX  The modification time on a file is wrong.  If we don't do
+# something, then we'll have to depend upon SWIG.
+	${TOUCH} ${WRKSRC}/gtk/grid.cpp ${WRKSRC}/gtk/grid.py
 
 post-build:
 	@(cd ${HTMLSRC}; \
diff --git a/x11-toolkits/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo
index 80fbb89c9de2..63d28d2c68b9 100644
--- a/x11-toolkits/py-wxPython24/distinfo
+++ b/x11-toolkits/py-wxPython24/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1.11.tar.gz) = a60b03da0304cbc49cd68cbaa6d7b04c
+MD5 (wxPython-2.1.15.tar.gz) = a5eb22f936c53e7a1b3165a00209a8c9
diff --git a/x11-toolkits/py-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 52c25df62d89..59328bcd0f9b 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -21,6 +21,12 @@ lib/python1.5/site-packages/wxPython/controls2.pyo
 lib/python1.5/site-packages/wxPython/demo/About.py
 lib/python1.5/site-packages/wxPython/demo/About.pyc
 lib/python1.5/site-packages/wxPython/demo/About.pyo
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.py
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyc
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_Acrobat.pyo
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_IE.py
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
+lib/python1.5/site-packages/wxPython/demo/ActiveXWrapper_IE.pyo
 lib/python1.5/site-packages/wxPython/demo/ColorPanel.py
 lib/python1.5/site-packages/wxPython/demo/ColorPanel.pyc
 lib/python1.5/site-packages/wxPython/demo/ColorPanel.pyo
@@ -33,9 +39,27 @@ lib/python1.5/site-packages/wxPython/demo/DialogUnits.pyo
 lib/python1.5/site-packages/wxPython/demo/DragAndDrop.py
 lib/python1.5/site-packages/wxPython/demo/DragAndDrop.pyc
 lib/python1.5/site-packages/wxPython/demo/DragAndDrop.pyo
+lib/python1.5/site-packages/wxPython/demo/FileBrowseButton.py
+lib/python1.5/site-packages/wxPython/demo/FileBrowseButton.pyc
+lib/python1.5/site-packages/wxPython/demo/FileBrowseButton.pyo
 lib/python1.5/site-packages/wxPython/demo/FontEnumerator.py
 lib/python1.5/site-packages/wxPython/demo/FontEnumerator.pyc
 lib/python1.5/site-packages/wxPython/demo/FontEnumerator.pyo
+lib/python1.5/site-packages/wxPython/demo/GenericButtons.py
+lib/python1.5/site-packages/wxPython/demo/GenericButtons.pyc
+lib/python1.5/site-packages/wxPython/demo/GenericButtons.pyo
+lib/python1.5/site-packages/wxPython/demo/GridCustTable.py
+lib/python1.5/site-packages/wxPython/demo/GridCustTable.pyc
+lib/python1.5/site-packages/wxPython/demo/GridCustTable.pyo
+lib/python1.5/site-packages/wxPython/demo/GridHugeTable.py
+lib/python1.5/site-packages/wxPython/demo/GridHugeTable.pyc
+lib/python1.5/site-packages/wxPython/demo/GridHugeTable.pyo
+lib/python1.5/site-packages/wxPython/demo/GridSimple.py
+lib/python1.5/site-packages/wxPython/demo/GridSimple.pyc
+lib/python1.5/site-packages/wxPython/demo/GridSimple.pyo
+lib/python1.5/site-packages/wxPython/demo/GridStdEdRend.py
+lib/python1.5/site-packages/wxPython/demo/GridStdEdRend.pyc
+lib/python1.5/site-packages/wxPython/demo/GridStdEdRend.pyo
 lib/python1.5/site-packages/wxPython/demo/Layoutf.py
 lib/python1.5/site-packages/wxPython/demo/Layoutf.pyc
 lib/python1.5/site-packages/wxPython/demo/Layoutf.pyo
@@ -81,19 +105,26 @@ lib/python1.5/site-packages/wxPython/demo/bitmaps/image.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/image.gif
 lib/python1.5/site-packages/wxPython/demo/bitmaps/image.jpg
 lib/python1.5/site-packages/wxPython/demo/bitmaps/image.png
+lib/python1.5/site-packages/wxPython/demo/bitmaps/lb1.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/lb2.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/mondrian.ico
 lib/python1.5/site-packages/wxPython/demo/bitmaps/new.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/open.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/paste.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/smiles.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/smiles.ico
+lib/python1.5/site-packages/wxPython/demo/bitmaps/splash.gif
 lib/python1.5/site-packages/wxPython/demo/bitmaps/test2.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/test_image.png
+lib/python1.5/site-packages/wxPython/demo/bitmaps/test_mask.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/tog1.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/tog2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/grid.i
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.htm
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.png
 lib/python1.5/site-packages/wxPython/demo/data/pic.png
 lib/python1.5/site-packages/wxPython/demo/data/pic2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/stc.h
 lib/python1.5/site-packages/wxPython/demo/data/tables.htm
 lib/python1.5/site-packages/wxPython/demo/data/test.htm
 lib/python1.5/site-packages/wxPython/demo/data/widgetTest.htm
@@ -109,6 +140,9 @@ lib/python1.5/site-packages/wxPython/demo/hangman.pyo
 lib/python1.5/site-packages/wxPython/demo/pyTree.py
 lib/python1.5/site-packages/wxPython/demo/pyTree.pyc
 lib/python1.5/site-packages/wxPython/demo/pyTree.pyo
+lib/python1.5/site-packages/wxPython/demo/run.py
+lib/python1.5/site-packages/wxPython/demo/run.pyc
+lib/python1.5/site-packages/wxPython/demo/run.pyo
 lib/python1.5/site-packages/wxPython/demo/widgetTest.py
 lib/python1.5/site-packages/wxPython/demo/widgetTest.pyc
 lib/python1.5/site-packages/wxPython/demo/widgetTest.pyo
@@ -139,6 +173,9 @@ lib/python1.5/site-packages/wxPython/demo/wxDialog.pyo
 lib/python1.5/site-packages/wxPython/demo/wxDirDialog.py
 lib/python1.5/site-packages/wxPython/demo/wxDirDialog.pyc
 lib/python1.5/site-packages/wxPython/demo/wxDirDialog.pyo
+lib/python1.5/site-packages/wxPython/demo/wxEditor.py
+lib/python1.5/site-packages/wxPython/demo/wxEditor.pyc
+lib/python1.5/site-packages/wxPython/demo/wxEditor.pyo
 lib/python1.5/site-packages/wxPython/demo/wxFileDialog.py
 lib/python1.5/site-packages/wxPython/demo/wxFileDialog.pyc
 lib/python1.5/site-packages/wxPython/demo/wxFileDialog.pyo
@@ -175,6 +212,12 @@ lib/python1.5/site-packages/wxPython/demo/wxListBox.pyo
 lib/python1.5/site-packages/wxPython/demo/wxListCtrl.py
 lib/python1.5/site-packages/wxPython/demo/wxListCtrl.pyc
 lib/python1.5/site-packages/wxPython/demo/wxListCtrl.pyo
+lib/python1.5/site-packages/wxPython/demo/wxMVCTree.py
+lib/python1.5/site-packages/wxPython/demo/wxMVCTree.pyc
+lib/python1.5/site-packages/wxPython/demo/wxMVCTree.pyo
+lib/python1.5/site-packages/wxPython/demo/wxMask.py
+lib/python1.5/site-packages/wxPython/demo/wxMask.pyc
+lib/python1.5/site-packages/wxPython/demo/wxMask.pyo
 lib/python1.5/site-packages/wxPython/demo/wxMessageDialog.py
 lib/python1.5/site-packages/wxPython/demo/wxMessageDialog.pyc
 lib/python1.5/site-packages/wxPython/demo/wxMessageDialog.pyo
@@ -235,6 +278,12 @@ lib/python1.5/site-packages/wxPython/demo/wxStaticText.pyo
 lib/python1.5/site-packages/wxPython/demo/wxStatusBar.py
 lib/python1.5/site-packages/wxPython/demo/wxStatusBar.pyc
 lib/python1.5/site-packages/wxPython/demo/wxStatusBar.pyo
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_1.py
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyc
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_1.pyo
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_2.py
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyc
+lib/python1.5/site-packages/wxPython/demo/wxStyledTextCtrl_2.pyo
 lib/python1.5/site-packages/wxPython/demo/wxTextCtrl.py
 lib/python1.5/site-packages/wxPython/demo/wxTextCtrl.pyc
 lib/python1.5/site-packages/wxPython/demo/wxTextCtrl.pyo
@@ -250,6 +299,9 @@ lib/python1.5/site-packages/wxPython/demo/wxToolBar.pyo
 lib/python1.5/site-packages/wxPython/demo/wxTreeCtrl.py
 lib/python1.5/site-packages/wxPython/demo/wxTreeCtrl.pyc
 lib/python1.5/site-packages/wxPython/demo/wxTreeCtrl.pyo
+lib/python1.5/site-packages/wxPython/demo/wxVTKRenderWindow.py
+lib/python1.5/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/wxVTKRenderWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/wxValidator.py
 lib/python1.5/site-packages/wxPython/demo/wxValidator.pyc
 lib/python1.5/site-packages/wxPython/demo/wxValidator.pyo
@@ -262,6 +314,9 @@ lib/python1.5/site-packages/wxPython/frames.pyo
 lib/python1.5/site-packages/wxPython/gdi.py
 lib/python1.5/site-packages/wxPython/gdi.pyc
 lib/python1.5/site-packages/wxPython/gdi.pyo
+lib/python1.5/site-packages/wxPython/grid.py
+lib/python1.5/site-packages/wxPython/grid.pyc
+lib/python1.5/site-packages/wxPython/grid.pyo
 lib/python1.5/site-packages/wxPython/html.py
 lib/python1.5/site-packages/wxPython/html.pyc
 lib/python1.5/site-packages/wxPython/html.pyo
@@ -278,12 +333,34 @@ lib/python1.5/site-packages/wxPython/lib/CDate.pyo
 lib/python1.5/site-packages/wxPython/lib/__init__.py
 lib/python1.5/site-packages/wxPython/lib/__init__.pyc
 lib/python1.5/site-packages/wxPython/lib/__init__.pyo
+lib/python1.5/site-packages/wxPython/lib/activexwrapper.py
+lib/python1.5/site-packages/wxPython/lib/activexwrapper.pyc
+lib/python1.5/site-packages/wxPython/lib/activexwrapper.pyo
+lib/python1.5/site-packages/wxPython/lib/buttons.py
+lib/python1.5/site-packages/wxPython/lib/buttons.pyc
+lib/python1.5/site-packages/wxPython/lib/buttons.pyo
 lib/python1.5/site-packages/wxPython/lib/calendar.py
 lib/python1.5/site-packages/wxPython/lib/calendar.pyc
 lib/python1.5/site-packages/wxPython/lib/calendar.pyo
 lib/python1.5/site-packages/wxPython/lib/dialogs.py
 lib/python1.5/site-packages/wxPython/lib/dialogs.pyc
 lib/python1.5/site-packages/wxPython/lib/dialogs.pyo
+lib/python1.5/site-packages/wxPython/lib/editor/README.txt
+lib/python1.5/site-packages/wxPython/lib/editor/__init__.py
+lib/python1.5/site-packages/wxPython/lib/editor/__init__.pyc
+lib/python1.5/site-packages/wxPython/lib/editor/__init__.pyo
+lib/python1.5/site-packages/wxPython/lib/editor/editor.py
+lib/python1.5/site-packages/wxPython/lib/editor/editor.pyc
+lib/python1.5/site-packages/wxPython/lib/editor/editor.pyo
+lib/python1.5/site-packages/wxPython/lib/editor/py_editor.py
+lib/python1.5/site-packages/wxPython/lib/editor/py_editor.pyc
+lib/python1.5/site-packages/wxPython/lib/editor/py_editor.pyo
+lib/python1.5/site-packages/wxPython/lib/editor/tokenizer.py
+lib/python1.5/site-packages/wxPython/lib/editor/tokenizer.pyc
+lib/python1.5/site-packages/wxPython/lib/editor/tokenizer.pyo
+lib/python1.5/site-packages/wxPython/lib/filebrowsebutton.py
+lib/python1.5/site-packages/wxPython/lib/filebrowsebutton.pyc
+lib/python1.5/site-packages/wxPython/lib/filebrowsebutton.pyo
 lib/python1.5/site-packages/wxPython/lib/floatbar.py
 lib/python1.5/site-packages/wxPython/lib/floatbar.pyc
 lib/python1.5/site-packages/wxPython/lib/floatbar.pyo
@@ -314,6 +391,12 @@ lib/python1.5/site-packages/wxPython/lib/sizers/shape.pyo
 lib/python1.5/site-packages/wxPython/lib/sizers/sizer.py
 lib/python1.5/site-packages/wxPython/lib/sizers/sizer.pyc
 lib/python1.5/site-packages/wxPython/lib/sizers/sizer.pyo
+lib/python1.5/site-packages/wxPython/lib/splashscreen.py
+lib/python1.5/site-packages/wxPython/lib/splashscreen.pyc
+lib/python1.5/site-packages/wxPython/lib/splashscreen.pyo
+lib/python1.5/site-packages/wxPython/lib/vtk.py
+lib/python1.5/site-packages/wxPython/lib/vtk.pyc
+lib/python1.5/site-packages/wxPython/lib/vtk.pyo
 lib/python1.5/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/python1.5/site-packages/wxPython/lib/wxPlotCanvas.pyc
 lib/python1.5/site-packages/wxPython/lib/wxPlotCanvas.pyo
@@ -351,6 +434,7 @@ lib/python1.5/site-packages/wxPython/wx.py
 lib/python1.5/site-packages/wxPython/wx.pyc
 lib/python1.5/site-packages/wxPython/wx.pyo
 lib/python1.5/site-packages/wxPython/wxcmodule.so
+@dirrm lib/python1.5/site-packages/wxPython/lib/editor
 @dirrm lib/python1.5/site-packages/wxPython/lib/sizers
 @dirrm lib/python1.5/site-packages/wxPython/lib
 @dirrm lib/python1.5/site-packages/wxPython/demo/data