Update 2.1b3 -> 2.1.11

Submitted by:	tg

4 files changed, 121 insertions, 17 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index fd048bbb2d28..36ad7517a5d9 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:    wxPython
-# Version required:     		2.1b3
+# Version required:     		2.1.11
 # Date created:         		September 18, 1999
 # Whom:					nectar@FreeBSD.ORG
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wxPython-2.1b3
-PKGNAME=	py-wxPython-2.1b3
+DISTNAME=	wxPython-2.1.11
+PKGNAME=	py-wxPython-2.1.11
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	http://alldunn.com/wxPython/ \
+MASTER_SITES=	http://alldunn.com/wxPython/dist/ \
 		http://www.nectar.com/distfiles/
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-LIB_DEPENDS=	wx_gtk.1:${PORTSDIR}/x11-toolkits/wxgtk
+LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
@@ -26,16 +26,26 @@ MAKE_ENV=	"LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
 ALL_TARGET=	default
 INSTALL_TARGET=	install-freebsd
 
-TARGETDIR=	${LOCALBASE}/lib/python1.5/site-packages/wxPython
-HELPERLIBDIR=	${LOCALBASE}/lib
+TARGETDIR=	${PREFIX}/lib/python1.5/site-packages/wxPython
+HELPERLIBDIR=	${PREFIX}/lib
+HTMLSRC=	${WRKSRC}/../modules/html
 
 do-configure:
 	${SED} 	-e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:"   \
 		-e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:"   \
 		-e "s:%TARGETDIR%:${TARGETDIR}:"		     \
 		-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:"		     \
-		-e "s:%CXX%:${CXX}:"                                 \
-		${FILESDIR}/build.local > ${WRKSRC}/build.local
+		-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:"      \
+		${FILESDIR}/build.local > ${WRKSRC}/../build.local
 	cd ${WRKSRC} && ../distrib/build.py
+	cd ${HTMLSRC} && ../../distrib/build.py
+
+post-build:
+	@(cd ${HTMLSRC}; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+	@(cd ${HTMLSRC}; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index 5a94794b6322..80fbb89c9de2 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1b3.tar.gz) = a4a505d6be201fc02ed1915b4ebbcff8
+MD5 (wxPython-2.1.11.tar.gz) = a60b03da0304cbc49cd68cbaa6d7b04c
diff --git a/x11-toolkits/py-wxPython/files/build.local b/x11-toolkits/py-wxPython/files/build.local
index 9f1962af333e..a3d759b1bbf2 100644
--- a/x11-toolkits/py-wxPython/files/build.local
+++ b/x11-toolkits/py-wxPython/files/build.local
@@ -1,3 +1,4 @@
+WXPSRCDIR   = "%WRKSRC%"
 CCC         = "%CXX%"
 OTHERCFLAGS = "%CFLAGS%"
 OTHERLFLAGS = "%LFLAGS%"
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 7cbc62d35872..52c25df62d89 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -3,6 +3,12 @@ lib/libwxPyHelpers.so.1
 lib/python1.5/site-packages/wxPython/__init__.py
 lib/python1.5/site-packages/wxPython/__init__.pyc
 lib/python1.5/site-packages/wxPython/__init__.pyo
+lib/python1.5/site-packages/wxPython/__version__.py
+lib/python1.5/site-packages/wxPython/__version__.pyc
+lib/python1.5/site-packages/wxPython/__version__.pyo
+lib/python1.5/site-packages/wxPython/clip_dnd.py
+lib/python1.5/site-packages/wxPython/clip_dnd.pyc
+lib/python1.5/site-packages/wxPython/clip_dnd.pyo
 lib/python1.5/site-packages/wxPython/cmndlgs.py
 lib/python1.5/site-packages/wxPython/cmndlgs.pyc
 lib/python1.5/site-packages/wxPython/cmndlgs.pyo
@@ -12,21 +18,45 @@ lib/python1.5/site-packages/wxPython/controls.pyo
 lib/python1.5/site-packages/wxPython/controls2.py
 lib/python1.5/site-packages/wxPython/controls2.pyc
 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/ColorPanel.py
 lib/python1.5/site-packages/wxPython/demo/ColorPanel.pyc
 lib/python1.5/site-packages/wxPython/demo/ColorPanel.pyo
+lib/python1.5/site-packages/wxPython/demo/CustomDragAndDrop.py
+lib/python1.5/site-packages/wxPython/demo/CustomDragAndDrop.pyc
+lib/python1.5/site-packages/wxPython/demo/CustomDragAndDrop.pyo
 lib/python1.5/site-packages/wxPython/demo/DialogUnits.py
 lib/python1.5/site-packages/wxPython/demo/DialogUnits.pyc
 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/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/Layoutf.py
 lib/python1.5/site-packages/wxPython/demo/Layoutf.pyc
 lib/python1.5/site-packages/wxPython/demo/Layoutf.pyo
+lib/python1.5/site-packages/wxPython/demo/MDIDemo.py
+lib/python1.5/site-packages/wxPython/demo/MDIDemo.pyc
+lib/python1.5/site-packages/wxPython/demo/MDIDemo.pyo
 lib/python1.5/site-packages/wxPython/demo/Main.py
 lib/python1.5/site-packages/wxPython/demo/Main.pyc
 lib/python1.5/site-packages/wxPython/demo/Main.pyo
+lib/python1.5/site-packages/wxPython/demo/OldSizers.py
+lib/python1.5/site-packages/wxPython/demo/OldSizers.pyc
+lib/python1.5/site-packages/wxPython/demo/OldSizers.pyo
 lib/python1.5/site-packages/wxPython/demo/PrintFramework.py
 lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyc
 lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyo
+lib/python1.5/site-packages/wxPython/demo/PyShell.py
+lib/python1.5/site-packages/wxPython/demo/PyShell.pyc
+lib/python1.5/site-packages/wxPython/demo/PyShell.pyo
+lib/python1.5/site-packages/wxPython/demo/PythonEvents.py
+lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyc
+lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyo
 lib/python1.5/site-packages/wxPython/demo/README.txt
 lib/python1.5/site-packages/wxPython/demo/Sizers.py
 lib/python1.5/site-packages/wxPython/demo/Sizers.pyc
@@ -34,9 +64,18 @@ lib/python1.5/site-packages/wxPython/demo/Sizers.pyo
 lib/python1.5/site-packages/wxPython/demo/SlashDot.py
 lib/python1.5/site-packages/wxPython/demo/SlashDot.pyc
 lib/python1.5/site-packages/wxPython/demo/SlashDot.pyo
+lib/python1.5/site-packages/wxPython/demo/Threads.py
+lib/python1.5/site-packages/wxPython/demo/Threads.pyc
+lib/python1.5/site-packages/wxPython/demo/Threads.pyo
 lib/python1.5/site-packages/wxPython/demo/XMLtreeview.py
 lib/python1.5/site-packages/wxPython/demo/XMLtreeview.pyc
 lib/python1.5/site-packages/wxPython/demo/XMLtreeview.pyo
+lib/python1.5/site-packages/wxPython/demo/bitmaps/Calend.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/DbDec.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/DbInc.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/Dec.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/Inc.bmp
+lib/python1.5/site-packages/wxPython/demo/bitmaps/Pt.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/copy.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/image.bmp
 lib/python1.5/site-packages/wxPython/demo/bitmaps/image.gif
@@ -51,6 +90,13 @@ lib/python1.5/site-packages/wxPython/demo/bitmaps/smiles.ico
 lib/python1.5/site-packages/wxPython/demo/bitmaps/test2.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/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/tables.htm
+lib/python1.5/site-packages/wxPython/demo/data/test.htm
+lib/python1.5/site-packages/wxPython/demo/data/widgetTest.htm
 lib/python1.5/site-packages/wxPython/demo/demo.py
 lib/python1.5/site-packages/wxPython/demo/demo.pyc
 lib/python1.5/site-packages/wxPython/demo/demo.pyo
@@ -60,18 +106,18 @@ lib/python1.5/site-packages/wxPython/demo/demoMainLoop.pyo
 lib/python1.5/site-packages/wxPython/demo/hangman.py
 lib/python1.5/site-packages/wxPython/demo/hangman.pyc
 lib/python1.5/site-packages/wxPython/demo/hangman.pyo
-lib/python1.5/site-packages/wxPython/demo/htmlview.py
-lib/python1.5/site-packages/wxPython/demo/htmlview.pyc
-lib/python1.5/site-packages/wxPython/demo/htmlview.pyo
-lib/python1.5/site-packages/wxPython/demo/htmlwidget.py
-lib/python1.5/site-packages/wxPython/demo/htmlwidget.pyc
-lib/python1.5/site-packages/wxPython/demo/htmlwidget.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/widgetTest.py
+lib/python1.5/site-packages/wxPython/demo/widgetTest.pyc
+lib/python1.5/site-packages/wxPython/demo/widgetTest.pyo
 lib/python1.5/site-packages/wxPython/demo/wxButton.py
 lib/python1.5/site-packages/wxPython/demo/wxButton.pyc
 lib/python1.5/site-packages/wxPython/demo/wxButton.pyo
+lib/python1.5/site-packages/wxPython/demo/wxCalendar.py
+lib/python1.5/site-packages/wxPython/demo/wxCalendar.pyc
+lib/python1.5/site-packages/wxPython/demo/wxCalendar.pyo
 lib/python1.5/site-packages/wxPython/demo/wxCheckBox.py
 lib/python1.5/site-packages/wxPython/demo/wxCheckBox.pyc
 lib/python1.5/site-packages/wxPython/demo/wxCheckBox.pyo
@@ -96,6 +142,9 @@ lib/python1.5/site-packages/wxPython/demo/wxDirDialog.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
+lib/python1.5/site-packages/wxPython/demo/wxFloatBar.py
+lib/python1.5/site-packages/wxPython/demo/wxFloatBar.pyc
+lib/python1.5/site-packages/wxPython/demo/wxFloatBar.pyo
 lib/python1.5/site-packages/wxPython/demo/wxFontDialog.py
 lib/python1.5/site-packages/wxPython/demo/wxFontDialog.pyc
 lib/python1.5/site-packages/wxPython/demo/wxFontDialog.pyo
@@ -111,6 +160,9 @@ lib/python1.5/site-packages/wxPython/demo/wxGauge.pyo
 lib/python1.5/site-packages/wxPython/demo/wxGrid.py
 lib/python1.5/site-packages/wxPython/demo/wxGrid.pyc
 lib/python1.5/site-packages/wxPython/demo/wxGrid.pyo
+lib/python1.5/site-packages/wxPython/demo/wxHtmlWindow.py
+lib/python1.5/site-packages/wxPython/demo/wxHtmlWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/wxHtmlWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/wxImage.py
 lib/python1.5/site-packages/wxPython/demo/wxImage.pyc
 lib/python1.5/site-packages/wxPython/demo/wxImage.pyo
@@ -135,6 +187,9 @@ lib/python1.5/site-packages/wxPython/demo/wxMultipleChoiceDialog.pyo
 lib/python1.5/site-packages/wxPython/demo/wxNotebook.py
 lib/python1.5/site-packages/wxPython/demo/wxNotebook.pyc
 lib/python1.5/site-packages/wxPython/demo/wxNotebook.pyo
+lib/python1.5/site-packages/wxPython/demo/wxOGL.py
+lib/python1.5/site-packages/wxPython/demo/wxOGL.pyc
+lib/python1.5/site-packages/wxPython/demo/wxOGL.pyo
 lib/python1.5/site-packages/wxPython/demo/wxPageSetupDialog.py
 lib/python1.5/site-packages/wxPython/demo/wxPageSetupDialog.pyc
 lib/python1.5/site-packages/wxPython/demo/wxPageSetupDialog.pyo
@@ -195,6 +250,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/wxValidator.py
+lib/python1.5/site-packages/wxPython/demo/wxValidator.pyc
+lib/python1.5/site-packages/wxPython/demo/wxValidator.pyo
 lib/python1.5/site-packages/wxPython/events.py
 lib/python1.5/site-packages/wxPython/events.pyc
 lib/python1.5/site-packages/wxPython/events.pyo
@@ -204,18 +262,43 @@ 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/html.py
+lib/python1.5/site-packages/wxPython/html.pyc
+lib/python1.5/site-packages/wxPython/html.pyo
+lib/python1.5/site-packages/wxPython/htmlcmodule.so
+lib/python1.5/site-packages/wxPython/htmlhelp.py
+lib/python1.5/site-packages/wxPython/htmlhelp.pyc
+lib/python1.5/site-packages/wxPython/htmlhelp.pyo
 lib/python1.5/site-packages/wxPython/image.py
 lib/python1.5/site-packages/wxPython/image.pyc
 lib/python1.5/site-packages/wxPython/image.pyo
+lib/python1.5/site-packages/wxPython/lib/CDate.py
+lib/python1.5/site-packages/wxPython/lib/CDate.pyc
+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/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/floatbar.py
+lib/python1.5/site-packages/wxPython/lib/floatbar.pyc
+lib/python1.5/site-packages/wxPython/lib/floatbar.pyo
+lib/python1.5/site-packages/wxPython/lib/grids.py
+lib/python1.5/site-packages/wxPython/lib/grids.pyc
+lib/python1.5/site-packages/wxPython/lib/grids.pyo
 lib/python1.5/site-packages/wxPython/lib/layoutf.py
 lib/python1.5/site-packages/wxPython/lib/layoutf.pyc
 lib/python1.5/site-packages/wxPython/lib/layoutf.pyo
+lib/python1.5/site-packages/wxPython/lib/mvctree.py
+lib/python1.5/site-packages/wxPython/lib/mvctree.pyc
+lib/python1.5/site-packages/wxPython/lib/mvctree.pyo
+lib/python1.5/site-packages/wxPython/lib/shell.py
+lib/python1.5/site-packages/wxPython/lib/shell.pyc
+lib/python1.5/site-packages/wxPython/lib/shell.pyo
 lib/python1.5/site-packages/wxPython/lib/sizers/__init__.py
 lib/python1.5/site-packages/wxPython/lib/sizers/__init__.pyc
 lib/python1.5/site-packages/wxPython/lib/sizers/__init__.pyo
@@ -225,12 +308,18 @@ lib/python1.5/site-packages/wxPython/lib/sizers/border.pyo
 lib/python1.5/site-packages/wxPython/lib/sizers/box.py
 lib/python1.5/site-packages/wxPython/lib/sizers/box.pyc
 lib/python1.5/site-packages/wxPython/lib/sizers/box.pyo
+lib/python1.5/site-packages/wxPython/lib/sizers/shape.py
+lib/python1.5/site-packages/wxPython/lib/sizers/shape.pyc
+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/wxPlotCanvas.py
 lib/python1.5/site-packages/wxPython/lib/wxPlotCanvas.pyc
 lib/python1.5/site-packages/wxPython/lib/wxPlotCanvas.pyo
+lib/python1.5/site-packages/wxPython/lib/wxpTag.py
+lib/python1.5/site-packages/wxPython/lib/wxpTag.pyc
+lib/python1.5/site-packages/wxPython/lib/wxpTag.pyo
 lib/python1.5/site-packages/wxPython/mdi.py
 lib/python1.5/site-packages/wxPython/mdi.pyc
 lib/python1.5/site-packages/wxPython/mdi.pyo
@@ -243,6 +332,9 @@ lib/python1.5/site-packages/wxPython/misc2.pyo
 lib/python1.5/site-packages/wxPython/printfw.py
 lib/python1.5/site-packages/wxPython/printfw.pyc
 lib/python1.5/site-packages/wxPython/printfw.pyo
+lib/python1.5/site-packages/wxPython/sizers.py
+lib/python1.5/site-packages/wxPython/sizers.pyc
+lib/python1.5/site-packages/wxPython/sizers.pyo
 lib/python1.5/site-packages/wxPython/stattool.py
 lib/python1.5/site-packages/wxPython/stattool.pyc
 lib/python1.5/site-packages/wxPython/stattool.pyo
@@ -261,6 +353,7 @@ lib/python1.5/site-packages/wxPython/wx.pyo
 lib/python1.5/site-packages/wxPython/wxcmodule.so
 @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
 @dirrm lib/python1.5/site-packages/wxPython/demo/bitmaps
 @dirrm lib/python1.5/site-packages/wxPython/demo
-@dirrm lib/python1.5/site-packages/wxPython
\ No newline at end of file
+@dirrm lib/python1.5/site-packages/wxPython