aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2000-05-20 21:35:35 +0800
committernectar <nectar@FreeBSD.org>2000-05-20 21:35:35 +0800
commit1c05bb5b01200fe3f1c7a4a0baf4224c2770b758 (patch)
tree98c1a1bef39e5a48ea3734a9e8be1eadf9129d97 /x11-toolkits
parentf5a944bb1c8b06bb187bde173c19c03b4b0a2de4 (diff)
downloadfreebsd-ports-gnome-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.tar.gz
freebsd-ports-gnome-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.tar.zst
freebsd-ports-gnome-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.zip
Update 2.1.11 -> 2.1.15
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/py-wxPython/Makefile8
-rw-r--r--x11-toolkits/py-wxPython/distinfo2
-rw-r--r--x11-toolkits/py-wxPython/pkg-plist84
-rw-r--r--x11-toolkits/py-wxPython24/Makefile8
-rw-r--r--x11-toolkits/py-wxPython24/distinfo2
-rw-r--r--x11-toolkits/py-wxPython24/pkg-plist84
-rw-r--r--x11-toolkits/py-wxPython26/Makefile8
-rw-r--r--x11-toolkits/py-wxPython26/distinfo2
-rw-r--r--x11-toolkits/py-wxPython26/pkg-plist84
-rw-r--r--x11-toolkits/py-wxPython28/Makefile8
-rw-r--r--x11-toolkits/py-wxPython28/distinfo2
-rw-r--r--x11-toolkits/py-wxPython28/pkg-plist84
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile5
-rw-r--r--x11-toolkits/wxgtk-devel/distinfo2
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-aa55
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-ac61
-rw-r--r--x11-toolkits/wxgtk-devel/pkg-plist34
-rw-r--r--x11-toolkits/wxgtk/Makefile5
-rw-r--r--x11-toolkits/wxgtk/distinfo2
-rw-r--r--x11-toolkits/wxgtk/files/patch-aa55
-rw-r--r--x11-toolkits/wxgtk/files/patch-ac61
-rw-r--r--x11-toolkits/wxgtk/pkg-plist34
-rw-r--r--x11-toolkits/wxgtk24/Makefile5
-rw-r--r--x11-toolkits/wxgtk24/distinfo2
-rw-r--r--x11-toolkits/wxgtk24/files/patch-aa55
-rw-r--r--x11-toolkits/wxgtk24/files/patch-ac61
-rw-r--r--x11-toolkits/wxgtk24/pkg-plist34
27 files changed, 639 insertions, 208 deletions
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 232621f1df08..3eb70adba8fc 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/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-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index 80fbb89c9de2..63d28d2c68b9 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/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-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 52c25df62d89..59328bcd0f9b 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/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
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
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 232621f1df08..3eb70adba8fc 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/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-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index 80fbb89c9de2..63d28d2c68b9 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/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-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 52c25df62d89..59328bcd0f9b 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/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
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 232621f1df08..3eb70adba8fc 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/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-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index 80fbb89c9de2..63d28d2c68b9 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/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-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 52c25df62d89..59328bcd0f9b 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/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
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 2aed603137c5..cbd0e36203d9 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.1.11
+PORTVERSION= 2.1.15
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
- http://www.nectar.com/distfiles/
+MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 14aaa4ac7666..e242a6636e21 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.1.11.tgz) = a897a00260879ef527dd77bdda0fc2c5
+MD5 (wxGTK-2.1.15.tgz) = 4d4845a68d9e34c27560b9e0c8117ef7
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index d83cf9891695..fb3c109b989b 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,51 +1,27 @@
---- configure.in.orig Tue Nov 9 10:48:20 1999
-+++ configure.in Mon Jan 17 09:13:20 2000
-@@ -22,17 +22,17 @@
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- fi
-
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk12-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
-@@ -1501,7 +1501,7 @@
- if test "$wxUSE_GTK" = 1; then
- dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
- dnl only then, if it wasn't found, for an older one
-- AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
-+ AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk12-config in path and GTK+ is version 1.2.1 or above?))
-
- TOOLKIT_INCLUDE="$GTK_CFLAGS"
- GUI_TK_LIBRARY="$GTK_LIBS"
-@@ -1701,12 +1701,10 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+--- configure.in.orig Sun Apr 23 07:59:54 2000
++++ configure.in Sun Apr 23 08:04:06 2000
+@@ -1974,16 +1974,12 @@
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
dnl shared library settings
SHARED_LD=
-@@ -2964,8 +2962,6 @@
+@@ -3645,8 +3641,6 @@
AC_SUBST(WX_LIBRARY)
AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_LIBRARY_LINK1)
@@ -53,4 +29,13 @@
-AC_SUBST(WX_LIBRARY_LINK3)
AC_SUBST(PROGRAM_EXT)
+ dnl global gl options
+@@ -3656,8 +3650,6 @@
+ AC_SUBST(WX_LIBRARY_GL)
+ AC_SUBST(WX_TARGET_LIBRARY_GL)
+ AC_SUBST(WX_LIBRARY_LINK1_GL)
+-AC_SUBST(WX_LIBRARY_LINK2_GL)
+-AC_SUBST(WX_LIBRARY_LINK3_GL)
+
dnl are we supposed to create the links?
+ AC_SUBST(WX_ALL)
diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac
index 6af51255b4b9..ae25a9c7982d 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-ac
+++ b/x11-toolkits/wxgtk-devel/files/patch-ac
@@ -1,41 +1,60 @@
---- Makefile.in.orig Fri Jan 14 09:27:03 2000
-+++ Makefile.in Fri Jan 14 09:27:48 2000
-@@ -2050,19 +2050,11 @@
+--- Makefile.in.orig Wed Mar 22 13:12:38 2000
++++ Makefile.in Sun Apr 23 08:08:08 2000
+@@ -311,39 +311,23 @@
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@
- @$(RM) ./lib/@WX_LIBRARY_LINK2@
- @$(RM) ./lib/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
+ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+ @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
+
+ CREATE_INSTALLED_LINKS: preinstall
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
+
+ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+ $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
-@@ -2115,9 +2107,7 @@
- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-
- $(INSTALL) -d $(includedir)/wx
-- $(INSTALL) -d $(includedir)/wx/msw
- $(INSTALL) -d $(includedir)/wx/gtk
-- $(INSTALL) -d $(includedir)/wx/motif
- $(INSTALL) -d $(includedir)/wx/html
- $(INSTALL) -d $(includedir)/wx/protocol
- $(INSTALL) -d $(includedir)/wx/unix
-@@ -2148,8 +2138,6 @@
+@@ -437,13 +421,9 @@
@echo " Removing library..."
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+ @echo " Removing GL library..."
+ @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
@echo " Removing helper files..."
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index b2538cbca939..f89fded1a714 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -1,4 +1,5 @@
bin/wx-config
+bin/wxgtk-config
include/wx/accel.h
include/wx/app.h
include/wx/arrimpl.cpp
@@ -8,12 +9,14 @@ include/wx/brush.h
include/wx/buffer.h
include/wx/busyinfo.h
include/wx/button.h
+include/wx/calctrl.h
include/wx/caret.h
include/wx/checkbox.h
include/wx/checklst.h
include/wx/choicdlg.h
include/wx/choice.h
include/wx/clipbrd.h
+include/wx/cmdline.h
include/wx/cmndata.h
include/wx/colordlg.h
include/wx/colour.h
@@ -25,6 +28,8 @@ include/wx/ctrlsub.h
include/wx/cursor.h
include/wx/dataobj.h
include/wx/date.h
+include/wx/datetime.h
+include/wx/datetime.inl
include/wx/datstrm.h
include/wx/db.h
include/wx/dbtable.h
@@ -39,6 +44,7 @@ include/wx/debug.h
include/wx/defs.h
include/wx/dialog.h
include/wx/dialup.h
+include/wx/dir.h
include/wx/dirdlg.h
include/wx/dnd.h
include/wx/docmdi.h
@@ -46,6 +52,7 @@ include/wx/docview.h
include/wx/dragimag.h
include/wx/dynarray.h
include/wx/dynlib.h
+include/wx/encconv.h
include/wx/event.h
include/wx/expr.h
include/wx/ffile.h
@@ -61,15 +68,18 @@ include/wx/fontmap.h
include/wx/fontutil.h
include/wx/frame.h
include/wx/fs_inet.h
+include/wx/fs_mem.h
include/wx/fs_zip.h
include/wx/gauge.h
include/wx/gdicmn.h
include/wx/gdiobj.h
+include/wx/generic/calctrl.h
include/wx/generic/caret.h
include/wx/generic/choicdgg.h
include/wx/generic/colrdlgg.h
include/wx/generic/dcpsg.h
include/wx/generic/dirdlgg.h
+include/wx/generic/dragimgg.h
include/wx/generic/filedlgg.h
include/wx/generic/fontdlgg.h
include/wx/generic/grid.h
@@ -84,6 +94,7 @@ include/wx/generic/listctrl.h
include/wx/generic/msgdlgg.h
include/wx/generic/notebook.h
include/wx/generic/panelg.h
+include/wx/generic/plot.h
include/wx/generic/printps.h
include/wx/generic/prntdlgg.h
include/wx/generic/progdlgg.h
@@ -94,7 +105,10 @@ include/wx/generic/statusbr.h
include/wx/generic/tabg.h
include/wx/generic/textdlgg.h
include/wx/generic/treectrl.h
+include/wx/generic/wizard.h
+include/wx/geometry.h
include/wx/gifdecod.h
+include/wx/glcanvas.h
include/wx/grid.h
include/wx/gsocket.h
include/wx/gtk/accel.h
@@ -126,6 +140,7 @@ include/wx/gtk/fontdlg.h
include/wx/gtk/frame.h
include/wx/gtk/gauge.h
include/wx/gtk/gdiobj.h
+include/wx/gtk/glcanvas.h
include/wx/gtk/icon.h
include/wx/gtk/joystick.h
include/wx/gtk/listbox.h
@@ -176,11 +191,20 @@ include/wx/html/htmprint.h
include/wx/html/m_templ.h
include/wx/html/winpars.h
include/wx/icon.h
+include/wx/imagbmp.h
include/wx/image.h
+include/wx/imaggif.h
+include/wx/imagjpeg.h
include/wx/imaglist.h
+include/wx/imagpcx.h
+include/wx/imagpng.h
+include/wx/imagpnm.h
+include/wx/imagtiff.h
include/wx/intl.h
include/wx/ioswrap.h
include/wx/ipcbase.h
+include/wx/isql.h
+include/wx/isqlext.h
include/wx/joystick.h
include/wx/layout.h
include/wx/laywin.h
@@ -192,6 +216,7 @@ include/wx/log.h
include/wx/longlong.h
include/wx/matrix.h
include/wx/mdi.h
+include/wx/memconf.h
include/wx/memory.h
include/wx/menu.h
include/wx/menuitem.h
@@ -210,7 +235,7 @@ include/wx/palette.h
include/wx/panel.h
include/wx/paper.h
include/wx/pen.h
-include/wx/pnghand.h
+include/wx/plot.h
include/wx/print.h
include/wx/printdlg.h
include/wx/prntbase.h
@@ -253,9 +278,7 @@ include/wx/string.h
include/wx/tab.h
include/wx/tabctrl.h
include/wx/taskbar.h
-include/wx/tbar95.h
include/wx/tbarbase.h
-include/wx/tbarmsw.h
include/wx/tbarsmpl.h
include/wx/textctrl.h
include/wx/textdlg.h
@@ -272,6 +295,8 @@ include/wx/txtstrm.h
include/wx/types.h
include/wx/unix/execute.h
include/wx/unix/fontutil.h
+include/wx/unix/gsockunx.h
+include/wx/unix/mimetype.h
include/wx/url.h
include/wx/utils.h
include/wx/valgen.h
@@ -282,6 +307,7 @@ include/wx/version.h
include/wx/wave.h
include/wx/wfstream.h
include/wx/window.h
+include/wx/wizard.h
include/wx/wx.h
include/wx/wx_cw.h
include/wx/wx_cw_cm.h
@@ -330,8 +356,8 @@ share/wx/gs_afm/TimesRo.afm
@dirrm lib/wx/include/wx
@dirrm lib/wx/include
@dirrm lib/wx
-@dirrm share/wx/gs_afm
@dirrm share/wx/afm
+@dirrm share/wx/gs_afm
@dirrm share/wx
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 2aed603137c5..cbd0e36203d9 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.1.11
+PORTVERSION= 2.1.15
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
- http://www.nectar.com/distfiles/
+MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo
index 14aaa4ac7666..e242a6636e21 100644
--- a/x11-toolkits/wxgtk/distinfo
+++ b/x11-toolkits/wxgtk/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.1.11.tgz) = a897a00260879ef527dd77bdda0fc2c5
+MD5 (wxGTK-2.1.15.tgz) = 4d4845a68d9e34c27560b9e0c8117ef7
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index d83cf9891695..fb3c109b989b 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,51 +1,27 @@
---- configure.in.orig Tue Nov 9 10:48:20 1999
-+++ configure.in Mon Jan 17 09:13:20 2000
-@@ -22,17 +22,17 @@
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- fi
-
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk12-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
-@@ -1501,7 +1501,7 @@
- if test "$wxUSE_GTK" = 1; then
- dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
- dnl only then, if it wasn't found, for an older one
-- AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
-+ AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk12-config in path and GTK+ is version 1.2.1 or above?))
-
- TOOLKIT_INCLUDE="$GTK_CFLAGS"
- GUI_TK_LIBRARY="$GTK_LIBS"
-@@ -1701,12 +1701,10 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+--- configure.in.orig Sun Apr 23 07:59:54 2000
++++ configure.in Sun Apr 23 08:04:06 2000
+@@ -1974,16 +1974,12 @@
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
dnl shared library settings
SHARED_LD=
-@@ -2964,8 +2962,6 @@
+@@ -3645,8 +3641,6 @@
AC_SUBST(WX_LIBRARY)
AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_LIBRARY_LINK1)
@@ -53,4 +29,13 @@
-AC_SUBST(WX_LIBRARY_LINK3)
AC_SUBST(PROGRAM_EXT)
+ dnl global gl options
+@@ -3656,8 +3650,6 @@
+ AC_SUBST(WX_LIBRARY_GL)
+ AC_SUBST(WX_TARGET_LIBRARY_GL)
+ AC_SUBST(WX_LIBRARY_LINK1_GL)
+-AC_SUBST(WX_LIBRARY_LINK2_GL)
+-AC_SUBST(WX_LIBRARY_LINK3_GL)
+
dnl are we supposed to create the links?
+ AC_SUBST(WX_ALL)
diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
index 6af51255b4b9..ae25a9c7982d 100644
--- a/x11-toolkits/wxgtk/files/patch-ac
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -1,41 +1,60 @@
---- Makefile.in.orig Fri Jan 14 09:27:03 2000
-+++ Makefile.in Fri Jan 14 09:27:48 2000
-@@ -2050,19 +2050,11 @@
+--- Makefile.in.orig Wed Mar 22 13:12:38 2000
++++ Makefile.in Sun Apr 23 08:08:08 2000
+@@ -311,39 +311,23 @@
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@
- @$(RM) ./lib/@WX_LIBRARY_LINK2@
- @$(RM) ./lib/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
+ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+ @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
+
+ CREATE_INSTALLED_LINKS: preinstall
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
+
+ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+ $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
-@@ -2115,9 +2107,7 @@
- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-
- $(INSTALL) -d $(includedir)/wx
-- $(INSTALL) -d $(includedir)/wx/msw
- $(INSTALL) -d $(includedir)/wx/gtk
-- $(INSTALL) -d $(includedir)/wx/motif
- $(INSTALL) -d $(includedir)/wx/html
- $(INSTALL) -d $(includedir)/wx/protocol
- $(INSTALL) -d $(includedir)/wx/unix
-@@ -2148,8 +2138,6 @@
+@@ -437,13 +421,9 @@
@echo " Removing library..."
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+ @echo " Removing GL library..."
+ @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
@echo " Removing helper files..."
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist
index b2538cbca939..f89fded1a714 100644
--- a/x11-toolkits/wxgtk/pkg-plist
+++ b/x11-toolkits/wxgtk/pkg-plist
@@ -1,4 +1,5 @@
bin/wx-config
+bin/wxgtk-config
include/wx/accel.h
include/wx/app.h
include/wx/arrimpl.cpp
@@ -8,12 +9,14 @@ include/wx/brush.h
include/wx/buffer.h
include/wx/busyinfo.h
include/wx/button.h
+include/wx/calctrl.h
include/wx/caret.h
include/wx/checkbox.h
include/wx/checklst.h
include/wx/choicdlg.h
include/wx/choice.h
include/wx/clipbrd.h
+include/wx/cmdline.h
include/wx/cmndata.h
include/wx/colordlg.h
include/wx/colour.h
@@ -25,6 +28,8 @@ include/wx/ctrlsub.h
include/wx/cursor.h
include/wx/dataobj.h
include/wx/date.h
+include/wx/datetime.h
+include/wx/datetime.inl
include/wx/datstrm.h
include/wx/db.h
include/wx/dbtable.h
@@ -39,6 +44,7 @@ include/wx/debug.h
include/wx/defs.h
include/wx/dialog.h
include/wx/dialup.h
+include/wx/dir.h
include/wx/dirdlg.h
include/wx/dnd.h
include/wx/docmdi.h
@@ -46,6 +52,7 @@ include/wx/docview.h
include/wx/dragimag.h
include/wx/dynarray.h
include/wx/dynlib.h
+include/wx/encconv.h
include/wx/event.h
include/wx/expr.h
include/wx/ffile.h
@@ -61,15 +68,18 @@ include/wx/fontmap.h
include/wx/fontutil.h
include/wx/frame.h
include/wx/fs_inet.h
+include/wx/fs_mem.h
include/wx/fs_zip.h
include/wx/gauge.h
include/wx/gdicmn.h
include/wx/gdiobj.h
+include/wx/generic/calctrl.h
include/wx/generic/caret.h
include/wx/generic/choicdgg.h
include/wx/generic/colrdlgg.h
include/wx/generic/dcpsg.h
include/wx/generic/dirdlgg.h
+include/wx/generic/dragimgg.h
include/wx/generic/filedlgg.h
include/wx/generic/fontdlgg.h
include/wx/generic/grid.h
@@ -84,6 +94,7 @@ include/wx/generic/listctrl.h
include/wx/generic/msgdlgg.h
include/wx/generic/notebook.h
include/wx/generic/panelg.h
+include/wx/generic/plot.h
include/wx/generic/printps.h
include/wx/generic/prntdlgg.h
include/wx/generic/progdlgg.h
@@ -94,7 +105,10 @@ include/wx/generic/statusbr.h
include/wx/generic/tabg.h
include/wx/generic/textdlgg.h
include/wx/generic/treectrl.h
+include/wx/generic/wizard.h
+include/wx/geometry.h
include/wx/gifdecod.h
+include/wx/glcanvas.h
include/wx/grid.h
include/wx/gsocket.h
include/wx/gtk/accel.h
@@ -126,6 +140,7 @@ include/wx/gtk/fontdlg.h
include/wx/gtk/frame.h
include/wx/gtk/gauge.h
include/wx/gtk/gdiobj.h
+include/wx/gtk/glcanvas.h
include/wx/gtk/icon.h
include/wx/gtk/joystick.h
include/wx/gtk/listbox.h
@@ -176,11 +191,20 @@ include/wx/html/htmprint.h
include/wx/html/m_templ.h
include/wx/html/winpars.h
include/wx/icon.h
+include/wx/imagbmp.h
include/wx/image.h
+include/wx/imaggif.h
+include/wx/imagjpeg.h
include/wx/imaglist.h
+include/wx/imagpcx.h
+include/wx/imagpng.h
+include/wx/imagpnm.h
+include/wx/imagtiff.h
include/wx/intl.h
include/wx/ioswrap.h
include/wx/ipcbase.h
+include/wx/isql.h
+include/wx/isqlext.h
include/wx/joystick.h
include/wx/layout.h
include/wx/laywin.h
@@ -192,6 +216,7 @@ include/wx/log.h
include/wx/longlong.h
include/wx/matrix.h
include/wx/mdi.h
+include/wx/memconf.h
include/wx/memory.h
include/wx/menu.h
include/wx/menuitem.h
@@ -210,7 +235,7 @@ include/wx/palette.h
include/wx/panel.h
include/wx/paper.h
include/wx/pen.h
-include/wx/pnghand.h
+include/wx/plot.h
include/wx/print.h
include/wx/printdlg.h
include/wx/prntbase.h
@@ -253,9 +278,7 @@ include/wx/string.h
include/wx/tab.h
include/wx/tabctrl.h
include/wx/taskbar.h
-include/wx/tbar95.h
include/wx/tbarbase.h
-include/wx/tbarmsw.h
include/wx/tbarsmpl.h
include/wx/textctrl.h
include/wx/textdlg.h
@@ -272,6 +295,8 @@ include/wx/txtstrm.h
include/wx/types.h
include/wx/unix/execute.h
include/wx/unix/fontutil.h
+include/wx/unix/gsockunx.h
+include/wx/unix/mimetype.h
include/wx/url.h
include/wx/utils.h
include/wx/valgen.h
@@ -282,6 +307,7 @@ include/wx/version.h
include/wx/wave.h
include/wx/wfstream.h
include/wx/window.h
+include/wx/wizard.h
include/wx/wx.h
include/wx/wx_cw.h
include/wx/wx_cw_cm.h
@@ -330,8 +356,8 @@ share/wx/gs_afm/TimesRo.afm
@dirrm lib/wx/include/wx
@dirrm lib/wx/include
@dirrm lib/wx
-@dirrm share/wx/gs_afm
@dirrm share/wx/afm
+@dirrm share/wx/gs_afm
@dirrm share/wx
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 2aed603137c5..cbd0e36203d9 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.1.11
+PORTVERSION= 2.1.15
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
- http://www.nectar.com/distfiles/
+MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
DISTNAME= wxGTK-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
index 14aaa4ac7666..e242a6636e21 100644
--- a/x11-toolkits/wxgtk24/distinfo
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.1.11.tgz) = a897a00260879ef527dd77bdda0fc2c5
+MD5 (wxGTK-2.1.15.tgz) = 4d4845a68d9e34c27560b9e0c8117ef7
diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa
index d83cf9891695..fb3c109b989b 100644
--- a/x11-toolkits/wxgtk24/files/patch-aa
+++ b/x11-toolkits/wxgtk24/files/patch-aa
@@ -1,51 +1,27 @@
---- configure.in.orig Tue Nov 9 10:48:20 1999
-+++ configure.in Mon Jan 17 09:13:20 2000
-@@ -22,17 +22,17 @@
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- fi
-
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk12-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
-@@ -1501,7 +1501,7 @@
- if test "$wxUSE_GTK" = 1; then
- dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
- dnl only then, if it wasn't found, for an older one
-- AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
-+ AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk12-config in path and GTK+ is version 1.2.1 or above?))
-
- TOOLKIT_INCLUDE="$GTK_CFLAGS"
- GUI_TK_LIBRARY="$GTK_LIBS"
-@@ -1701,12 +1701,10 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+--- configure.in.orig Sun Apr 23 07:59:54 2000
++++ configure.in Sun Apr 23 08:04:06 2000
+@@ -1974,16 +1974,12 @@
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
dnl shared library settings
SHARED_LD=
-@@ -2964,8 +2962,6 @@
+@@ -3645,8 +3641,6 @@
AC_SUBST(WX_LIBRARY)
AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_LIBRARY_LINK1)
@@ -53,4 +29,13 @@
-AC_SUBST(WX_LIBRARY_LINK3)
AC_SUBST(PROGRAM_EXT)
+ dnl global gl options
+@@ -3656,8 +3650,6 @@
+ AC_SUBST(WX_LIBRARY_GL)
+ AC_SUBST(WX_TARGET_LIBRARY_GL)
+ AC_SUBST(WX_LIBRARY_LINK1_GL)
+-AC_SUBST(WX_LIBRARY_LINK2_GL)
+-AC_SUBST(WX_LIBRARY_LINK3_GL)
+
dnl are we supposed to create the links?
+ AC_SUBST(WX_ALL)
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
index 6af51255b4b9..ae25a9c7982d 100644
--- a/x11-toolkits/wxgtk24/files/patch-ac
+++ b/x11-toolkits/wxgtk24/files/patch-ac
@@ -1,41 +1,60 @@
---- Makefile.in.orig Fri Jan 14 09:27:03 2000
-+++ Makefile.in Fri Jan 14 09:27:48 2000
-@@ -2050,19 +2050,11 @@
+--- Makefile.in.orig Wed Mar 22 13:12:38 2000
++++ Makefile.in Sun Apr 23 08:08:08 2000
+@@ -311,39 +311,23 @@
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@
- @$(RM) ./lib/@WX_LIBRARY_LINK2@
- @$(RM) ./lib/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
+ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+ @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+ cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
+
+ CREATE_INSTALLED_LINKS: preinstall
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
-- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
+
+ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+ $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+ cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
++ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
-@@ -2115,9 +2107,7 @@
- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-
- $(INSTALL) -d $(includedir)/wx
-- $(INSTALL) -d $(includedir)/wx/msw
- $(INSTALL) -d $(includedir)/wx/gtk
-- $(INSTALL) -d $(includedir)/wx/motif
- $(INSTALL) -d $(includedir)/wx/html
- $(INSTALL) -d $(includedir)/wx/protocol
- $(INSTALL) -d $(includedir)/wx/unix
-@@ -2148,8 +2138,6 @@
+@@ -437,13 +421,9 @@
@echo " Removing library..."
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+ @echo " Removing GL library..."
+ @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
@echo " Removing helper files..."
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index b2538cbca939..f89fded1a714 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -1,4 +1,5 @@
bin/wx-config
+bin/wxgtk-config
include/wx/accel.h
include/wx/app.h
include/wx/arrimpl.cpp
@@ -8,12 +9,14 @@ include/wx/brush.h
include/wx/buffer.h
include/wx/busyinfo.h
include/wx/button.h
+include/wx/calctrl.h
include/wx/caret.h
include/wx/checkbox.h
include/wx/checklst.h
include/wx/choicdlg.h
include/wx/choice.h
include/wx/clipbrd.h
+include/wx/cmdline.h
include/wx/cmndata.h
include/wx/colordlg.h
include/wx/colour.h
@@ -25,6 +28,8 @@ include/wx/ctrlsub.h
include/wx/cursor.h
include/wx/dataobj.h
include/wx/date.h
+include/wx/datetime.h
+include/wx/datetime.inl
include/wx/datstrm.h
include/wx/db.h
include/wx/dbtable.h
@@ -39,6 +44,7 @@ include/wx/debug.h
include/wx/defs.h
include/wx/dialog.h
include/wx/dialup.h
+include/wx/dir.h
include/wx/dirdlg.h
include/wx/dnd.h
include/wx/docmdi.h
@@ -46,6 +52,7 @@ include/wx/docview.h
include/wx/dragimag.h
include/wx/dynarray.h
include/wx/dynlib.h
+include/wx/encconv.h
include/wx/event.h
include/wx/expr.h
include/wx/ffile.h
@@ -61,15 +68,18 @@ include/wx/fontmap.h
include/wx/fontutil.h
include/wx/frame.h
include/wx/fs_inet.h
+include/wx/fs_mem.h
include/wx/fs_zip.h
include/wx/gauge.h
include/wx/gdicmn.h
include/wx/gdiobj.h
+include/wx/generic/calctrl.h
include/wx/generic/caret.h
include/wx/generic/choicdgg.h
include/wx/generic/colrdlgg.h
include/wx/generic/dcpsg.h
include/wx/generic/dirdlgg.h
+include/wx/generic/dragimgg.h
include/wx/generic/filedlgg.h
include/wx/generic/fontdlgg.h
include/wx/generic/grid.h
@@ -84,6 +94,7 @@ include/wx/generic/listctrl.h
include/wx/generic/msgdlgg.h
include/wx/generic/notebook.h
include/wx/generic/panelg.h
+include/wx/generic/plot.h
include/wx/generic/printps.h
include/wx/generic/prntdlgg.h
include/wx/generic/progdlgg.h
@@ -94,7 +105,10 @@ include/wx/generic/statusbr.h
include/wx/generic/tabg.h
include/wx/generic/textdlgg.h
include/wx/generic/treectrl.h
+include/wx/generic/wizard.h
+include/wx/geometry.h
include/wx/gifdecod.h
+include/wx/glcanvas.h
include/wx/grid.h
include/wx/gsocket.h
include/wx/gtk/accel.h
@@ -126,6 +140,7 @@ include/wx/gtk/fontdlg.h
include/wx/gtk/frame.h
include/wx/gtk/gauge.h
include/wx/gtk/gdiobj.h
+include/wx/gtk/glcanvas.h
include/wx/gtk/icon.h
include/wx/gtk/joystick.h
include/wx/gtk/listbox.h
@@ -176,11 +191,20 @@ include/wx/html/htmprint.h
include/wx/html/m_templ.h
include/wx/html/winpars.h
include/wx/icon.h
+include/wx/imagbmp.h
include/wx/image.h
+include/wx/imaggif.h
+include/wx/imagjpeg.h
include/wx/imaglist.h
+include/wx/imagpcx.h
+include/wx/imagpng.h
+include/wx/imagpnm.h
+include/wx/imagtiff.h
include/wx/intl.h
include/wx/ioswrap.h
include/wx/ipcbase.h
+include/wx/isql.h
+include/wx/isqlext.h
include/wx/joystick.h
include/wx/layout.h
include/wx/laywin.h
@@ -192,6 +216,7 @@ include/wx/log.h
include/wx/longlong.h
include/wx/matrix.h
include/wx/mdi.h
+include/wx/memconf.h
include/wx/memory.h
include/wx/menu.h
include/wx/menuitem.h
@@ -210,7 +235,7 @@ include/wx/palette.h
include/wx/panel.h
include/wx/paper.h
include/wx/pen.h
-include/wx/pnghand.h
+include/wx/plot.h
include/wx/print.h
include/wx/printdlg.h
include/wx/prntbase.h
@@ -253,9 +278,7 @@ include/wx/string.h
include/wx/tab.h
include/wx/tabctrl.h
include/wx/taskbar.h
-include/wx/tbar95.h
include/wx/tbarbase.h
-include/wx/tbarmsw.h
include/wx/tbarsmpl.h
include/wx/textctrl.h
include/wx/textdlg.h
@@ -272,6 +295,8 @@ include/wx/txtstrm.h
include/wx/types.h
include/wx/unix/execute.h
include/wx/unix/fontutil.h
+include/wx/unix/gsockunx.h
+include/wx/unix/mimetype.h
include/wx/url.h
include/wx/utils.h
include/wx/valgen.h
@@ -282,6 +307,7 @@ include/wx/version.h
include/wx/wave.h
include/wx/wfstream.h
include/wx/window.h
+include/wx/wizard.h
include/wx/wx.h
include/wx/wx_cw.h
include/wx/wx_cw_cm.h
@@ -330,8 +356,8 @@ share/wx/gs_afm/TimesRo.afm
@dirrm lib/wx/include/wx
@dirrm lib/wx/include
@dirrm lib/wx
-@dirrm share/wx/gs_afm
@dirrm share/wx/afm
+@dirrm share/wx/gs_afm
@dirrm share/wx
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
generated by cgit (git 2.34.1) at 2024-12-21 02:08:23 +0800