6 files changed, 61 insertions, 39 deletions

diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 729cfa086c9b..d147683f508e 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.3.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
@@ -19,12 +18,16 @@ BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
+WX_CONFIG=	${X11BASE}/bin/wx-config
+
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
+SETUP_ARGS=	WX_CONFIG="${WX_CONFIG}"
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+			${SETUP_ARGS}
 DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
 do-build:
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index 2626a40c33de..381842498288 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.2.5.tar.gz) = 04f6b94549c1fa0949d35d0c9d9bcb3c
+MD5 (wxPython-2.3.0.tar.gz) = 110c2dfd1e30725917faf70b2b1c5257
diff --git a/x11-toolkits/py-wxPython28/files/patch-ac b/x11-toolkits/py-wxPython28/files/patch-ac
index 3dec6284f128..79ffff04c345 100644
--- a/x11-toolkits/py-wxPython28/files/patch-ac
+++ b/x11-toolkits/py-wxPython28/files/patch-ac
@@ -1,6 +1,9 @@
---- setup.py	2000/12/12 14:56:17	1.1
-+++ setup.py	2000/12/12 15:22:46
-@@ -68,6 +68,19 @@
+
+$FreeBSD$
+
+--- setup.py.orig	Tue May 22 19:02:54 2001
++++ setup.py	Mon May 28 19:58:15 2001
+@@ -86,6 +86,16 @@
  
  
  #----------------------------------------------------------------------
@@ -10,9 +13,6 @@
 +try: gtk_config = os.environ['GTK_CONFIG']
 +except KeyError: gtk_config = 'gtk-config'
 +
-+try: wx_config = os.environ['WX_CONFIG']
-+except KeyError: wx_config = 'wx-config'
-+
 +try: sys_libs = string.split(os.environ['LIBS'])
 +except KeyError: sys_libs = []
 +
@@ -20,20 +20,15 @@
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -172,12 +185,13 @@
+@@ -229,9 +239,10 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
--    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
+     cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
 -             os.popen('gtk-config --cflags', 'r').read()[:-1]
-+    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
 +             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
      cflags = string.split(cflags)
  
--    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
-+    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
-     lflags = string.split(lflags)
- 
- 
+     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
diff --git a/x11-toolkits/py-wxPython28/files/patch-my_distutils.py b/x11-toolkits/py-wxPython28/files/patch-my_distutils.py
deleted file mode 100644
index dce6b0885145..000000000000
--- a/x11-toolkits/py-wxPython28/files/patch-my_distutils.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- my_distutils.py	2001/05/28 14:50:41	1.1
-+++ my_distutils.py	2001/05/28 14:51:09
-@@ -122,10 +122,10 @@
- 
- from distutils import ccompiler
- 
--ccompiler.default_compiler['nt'] = 'my_msvc'
--ccompiler.compiler_class['my_msvc'] = ('my_distutils',
--                                       'MyMSVCCompiler',
--                                       'My MSVC derived class')
-+#ccompiler.default_compiler['nt'] = 'my_msvc'
-+#ccompiler.compiler_class['my_msvc'] = ('my_distutils',
-+#                                       'MyMSVCCompiler',
-+#                                       'My MSVC derived class')
- 
- 
- # make it look like it is part of the package...
diff --git a/x11-toolkits/py-wxPython28/files/patch-src::gtk::misc2.cpp b/x11-toolkits/py-wxPython28/files/patch-src::gtk::misc2.cpp
new file mode 100644
index 000000000000..484ce2d3096b
--- /dev/null
+++ b/x11-toolkits/py-wxPython28/files/patch-src::gtk::misc2.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/gtk/misc2.cpp	2001/05/28 18:13:20	1.1
++++ src/gtk/misc2.cpp	2001/05/28 18:13:40
+@@ -221,7 +221,7 @@
+     int GetUPosition() { return -1; }
+     int GetVPosition() { return -1; }
+     int GetMovementThreshold() { return -1; }
+-    void SetMovementThreshold(int threshold) ;
++    void SetMovementThreshold(int threshold) { return; };
+ 
+     bool IsOk(void) { return FALSE; }
+     int GetNumberJoysticks() { return -1; }
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 38fbc00de133..c01f4550fafc 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -21,6 +21,10 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ActiveXWrapper_IE.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColorPanel.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColourDB.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColourDB.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColourSelect.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ColourSelect.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/CustomDragAndDrop.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/DialogUnits.py
@@ -47,6 +51,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridSimple.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/GridStdEdRend.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ImageBrowser.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/ImageBrowser.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/LayoutAnchors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Layoutf.py
@@ -57,6 +63,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/MDISashDemo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/Main.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OOR.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/OOR.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PrintFramework.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/PyShell.py
@@ -77,8 +85,16 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/demoMainLoop.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/encode_bitmaps.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/encode_bitmaps.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/hangman.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/images.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/images.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/infoframe.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/infoframe.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/joystick_wdr.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/joystick_wdr.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/pyTree.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/redemo.py
@@ -133,6 +149,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxHtmlWindow.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxImage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxJoystick.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxJoystick.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxLayoutConstraints.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxListBox.py
@@ -197,6 +215,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTextEntryDialog.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTimer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToggleButton.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToggleButton.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxToolBar.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxTreeCtrl.py
@@ -205,6 +225,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxVTKRenderWindow.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxValidator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxWave.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/wxWave.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/events.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/filesys.py
@@ -238,6 +260,10 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/buttons.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/calendar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/colourdb.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/colourdb.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/colourselect.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/colourselect.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/dialogs.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/editor/__init__.py
@@ -256,6 +282,10 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/floatbar.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/grids.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/imagebrowser.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/imagebrowser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/infoframe.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/infoframe.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/layoutf.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/lib/mvctree.py