ports/129223: [Update]graphics/py-opengl:update to 3.0.0.b6

[Wen Heping]

>Number:         129223
>Category:       ports
>Synopsis:       [Update]graphics/py-opengl:update to 3.0.0.b6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 27 09:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Wen Heping
>Release:        FreeBSD-8.0 Current
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Sep 21 18:56:51 HKT 2008     root at fb8.wenjing.com:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
update to 3.0.0.b6 from 2.0.1.7
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -curN py-opengl/Makefile py-opengl.new/Makefile
--- py-opengl/Makefile	2008-04-20 01:50:36.000000000 +0800
+++ py-opengl.new/Makefile	2008-11-27 21:56:43.000000000 +0800
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	opengl
-PORTVERSION=	2.0.1.07
-PORTREVISION=	4
+PORTVERSION=	3.0.0.b6
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
@@ -19,7 +18,6 @@
 
 BUILD_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
-#		swig1.3:${PORTSDIR}/devel/swig13
 RUN_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
@@ -29,8 +27,9 @@
 
 USE_GL=		yes
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	PyOpenGL
+PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/.b/b/}
 
 .include <bsd.port.pre.mk>
 
@@ -43,14 +42,12 @@
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s|||"
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc\.h>|<stdlib.h>|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/config/freebsd.cfg ${WRKSRC}/Tkinter.py
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-install:
-	@${FIND} ${PYTHON_SITELIBDIR}/OpenGL -type f | \
+	@${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PYTHON_SITELIBDIR}/OpenGL -type d | ${SORT} -r | \
+	@${FIND} ${PYTHON_SITELIBDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff -curN py-opengl/distinfo py-opengl.new/distinfo
--- py-opengl/distinfo	2005-11-26 09:47:57.000000000 +0800
+++ py-opengl.new/distinfo	2008-11-27 21:54:45.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (PyOpenGL-2.0.1.07.tar.gz) = 02e4331778fad4da7549ff1585a7a4a4
-SHA256 (PyOpenGL-2.0.1.07.tar.gz) = 7af4abf30b873cfc00d2800ea7d2a83cc4c66b27bb7d132c1daf8ab40b76ba34
-SIZE (PyOpenGL-2.0.1.07.tar.gz) = 1884617
+MD5 (PyOpenGL-3.0.0b6.tar.gz) = 6a70dd315767064ec78b84a92d2420a8
+SHA256 (PyOpenGL-3.0.0b6.tar.gz) = ddfee8ce7832dcb45e95d2199a8379da1191bbb245a8b664ac44d4c0e329c0bc
+SIZE (PyOpenGL-3.0.0b6.tar.gz) = 573360
diff -curN py-opengl/files/patch-ad py-opengl.new/files/patch-ad
--- py-opengl/files/patch-ad	2003-08-20 18:32:03.000000000 +0800
+++ py-opengl.new/files/patch-ad	1970-01-01 08:00:00.000000000 +0800
@@ -1,28 +0,0 @@
-
-$FreeBSD: ports/graphics/py-opengl/files/patch-ad,v 1.3 2003/08/20 10:32:03 perky Exp $
-
---- Tkinter.py.orig	Tue Jan 14 19:47:57 2003
-+++ Tkinter.py	Tue Jan 14 19:57:55 2003
-@@ -0,0 +1,22 @@
-+import os
-+
-+class nullcall:
-+	def __init(self):
-+		pass
-+	def call(self, a1='', a2='', a3='', a4='', a5=''):
-+		os.system('echo' + ' ' + a1 + ' ' + a2 + ' ' + a3 + ' ' + a4 + \
-+		 ' ' + a5 + ' > register.tcl')
-+
-+class Tk:
-+	tk = None
-+	def __init__(self):
-+		self.tk = nullcall()
-+		pass
-+	def getvar(self, varname):
-+		if varname == 'tk_version' or varname == 'tcl_version':
-+			return '8.4'
-+		if varname == 'tcl_library':
-+			return '%%LOCALBASE%%/lib/tcl8.4'
-+		if varname == 'tk_library':
-+			return '%%LOCALBASE%%/lib/tk8.4'
-+		return ''
diff -curN py-opengl/files/patch-config::freebsd.cfg py-opengl.new/files/patch-config::freebsd.cfg
--- py-opengl/files/patch-config::freebsd.cfg	2008-04-20 01:50:36.000000000 +0800
+++ py-opengl.new/files/patch-config::freebsd.cfg	1970-01-01 08:00:00.000000000 +0800
@@ -1,13 +0,0 @@
---- config/freebsd.cfg.orig	Thu May 13 09:25:15 2004
-+++ config/freebsd.cfg	Thu May 13 09:25:37 2004
-@@ -11,8 +11,8 @@
- [General]
- build_togl=1
- gl_platform=GLX
--include_dirs=/usr/include:/usr/local/include:/usr/X11/include:/usr/X11R6/include
--library_dirs=/usr/lib:/usr/local/lib:/usr/X11/lib:/usr/X11R6/lib
-+include_dirs=/usr/include:%%LOCALBASE%%/include
-+library_dirs=/usr/lib:%%LOCALBASE%%/lib
- 
- ; a os.pathsep separated list of the libs needed when linking GL
- [GL]


>Release-Note:
>Audit-Trail:
>Unformatted: