- Enable GL support;

- unbroke with Python 2.1;
- take over maintainership.

12 files changed, 108 insertions, 16 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 1db332f..729cfa0 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -7,24 +7,24 @@
 
 PORTNAME=	py-wxPython
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxPython-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	sobomax@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
-SETUP_ARGS=	BUILD_GLCANVAS=0
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
 do-build:
diff --git a/x11-toolkits/py-wxPython/files/patch-my_distutils.py b/x11-toolkits/py-wxPython/files/patch-my_distutils.py
new file mode 100644
index 0000000..dce6b08
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/patch-my_distutils.py
@@ -0,0 +1,20 @@
+
+$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-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 3ffaaab..38fbc00 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -213,6 +213,9 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvasc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 1db332f..729cfa0 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -7,24 +7,24 @@
 
 PORTNAME=	py-wxPython
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxPython-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	sobomax@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
-SETUP_ARGS=	BUILD_GLCANVAS=0
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
 do-build:
diff --git a/x11-toolkits/py-wxPython24/files/patch-my_distutils.py b/x11-toolkits/py-wxPython24/files/patch-my_distutils.py
new file mode 100644
index 0000000..dce6b08
--- /dev/null
+++ b/x11-toolkits/py-wxPython24/files/patch-my_distutils.py
@@ -0,0 +1,20 @@
+
+$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-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 3ffaaab..38fbc00 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -213,6 +213,9 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvasc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 1db332f..729cfa0 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -7,24 +7,24 @@
 
 PORTNAME=	py-wxPython
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxPython-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	sobomax@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
-SETUP_ARGS=	BUILD_GLCANVAS=0
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
 do-build:
diff --git a/x11-toolkits/py-wxPython26/files/patch-my_distutils.py b/x11-toolkits/py-wxPython26/files/patch-my_distutils.py
new file mode 100644
index 0000000..dce6b08
--- /dev/null
+++ b/x11-toolkits/py-wxPython26/files/patch-my_distutils.py
@@ -0,0 +1,20 @@
+
+$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-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 3ffaaab..38fbc00 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -213,6 +213,9 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvasc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 1db332f..729cfa0 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -7,24 +7,24 @@
 
 PORTNAME=	py-wxPython
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxPython-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	sobomax@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wx-config"
-SETUP_ARGS=	BUILD_GLCANVAS=0
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
+SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
 
 do-build:
diff --git a/x11-toolkits/py-wxPython28/files/patch-my_distutils.py b/x11-toolkits/py-wxPython28/files/patch-my_distutils.py
new file mode 100644
index 0000000..dce6b08
--- /dev/null
+++ b/x11-toolkits/py-wxPython28/files/patch-my_distutils.py
@@ -0,0 +1,20 @@
+
+$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/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 3ffaaab..38fbc00 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -213,6 +213,9 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/frames.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gdi.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/glcanvasc.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/grid.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/gridc.so