5 files changed, 16 insertions, 25 deletions

diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index b77c7e9cce5a..d39490caf530 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	opengl
-PORTVERSION=	1.5.6.a2
+PORTVERSION=	1.5.6.b1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
 PKGNAMEPREFIX=	py-
-DISTNAME=	PyOpenGL-${PORTVERSION:S/.a/a/}
+DISTNAME=	PyOpenGL-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
@@ -32,7 +32,7 @@ SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 do-configure:
 	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/setup.py ${WRKSRC}/togl_setup.py ${WRKSRC}/Tkinter.py
+		${WRKSRC}/config.py ${WRKSRC}/Tkinter.py
 
 do-build:
 	${SETUP_CMD} build
diff --git a/graphics/py-opengl/distinfo b/graphics/py-opengl/distinfo
index 2ec68b5d6c6d..2a305a2ee0ca 100644
--- a/graphics/py-opengl/distinfo
+++ b/graphics/py-opengl/distinfo
@@ -1 +1 @@
-MD5 (PyOpenGL-1.5.6a2.tar.gz) = bdf8725bf9354c3351b10ab885a98f45
+MD5 (PyOpenGL-1.5.6b1.tar.gz) = 4879a28f98a3ec0103a4132f535ea1ee
diff --git a/graphics/py-opengl/files/patch-ab b/graphics/py-opengl/files/patch-ab
index 8b2e1a9a829a..ba09ad72c8a6 100644
--- a/graphics/py-opengl/files/patch-ab
+++ b/graphics/py-opengl/files/patch-ab
@@ -1,13 +1,13 @@
---- setup.py	2000/12/04 14:04:20	1.1
-+++ setup.py	2000/12/04 14:05:08
-@@ -80,8 +80,8 @@
+--- config.py	2000/12/18 16:41:01	1.1
++++ config.py	2000/12/18 16:42:29
+@@ -97,8 +97,8 @@
      gl_libs = ["GL","X11","Xext"] # some Mesa versions need X11 here
-     glu_libs = ["GLU","Xext","X11"] + gl_libs 
+     glu_libs = ["GLU"] + gl_libs 
      glut_libs = ["glut","Xi","Xmu"] + glu_libs # + ['cvt'] SGI IRIX6
 -    include_dirs = ["src","/usr/local/include","/usr/X11/include","/usr/include"]
 -    gl_lib_dirs = ["/usr/local/lib","/usr/X11/lib","/usr/lib"]
 +    include_dirs = ["src","%%LOCALBASE%%/include","%%X11BASE%%/include","/usr/include"]
 +    gl_lib_dirs = ["%%LOCALBASE%%/lib","%%X11BASE%%/lib","/usr/lib"]
-     glu_lib_dirs = gl_lib_dirs 
-     glut_lib_dirs = glu_lib_dirs 
-     wgl_extension = []
+     # special case for IRIX #########
+     # you may have to specify your own paths here
+     if sys.platform[0:4] == "irix": gl_lib_dirs = []
diff --git a/graphics/py-opengl/files/patch-ac b/graphics/py-opengl/files/patch-ac
index fbe9dc1760a9..adaf5aa3e77a 100644
--- a/graphics/py-opengl/files/patch-ac
+++ b/graphics/py-opengl/files/patch-ac
@@ -1,6 +1,6 @@
---- togl_setup.py.orig	Fri Nov  3 16:19:44 2000
-+++ togl_setup.py	Mon Dec  4 17:35:23 2000
-@@ -60,16 +60,16 @@
+--- togl_setup.py.orig	Fri Nov 10 16:37:06 2000
++++ togl_setup.py	Mon Dec 18 18:44:45 2000
+@@ -56,8 +56,8 @@
          tk_include_dir = string.replace(tk.getvar('tk_library'),"/lib/","/include/")
          tcl_lib_dir = os.path.normpath(os.path.join(tk.getvar('tcl_library'),".."))
          tk_lib_dir = os.path.normpath(os.path.join(tk.getvar('tk_library'),".."))
@@ -10,14 +10,4 @@
 +        tk_lib = "tk" + string.replace(tk.getvar('tk_version'),".","")
  
          # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
--        include_dirs = ["src/"+Togl, "/usr/local/include", "/usr/X11/include",
-+        include_dirs = ["src/"+Togl, "%%LOCALBASE%%/include", "%%X11BASE%%/include",
-                         tcl_include_dir, tk_include_dir]
-         # Libraries to link with (-ldl for Linux only?):
-         libraries = [tk_lib,tcl_lib,"GLU","GL","X11","Xmu","Xext","Xt","m"]
-         # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries:
--        library_dirs = ["/usr/local/lib","/usr/X11/lib", 
-+        library_dirs = ["%%LOCALBASE%%/lib","%%X11BASE%%/lib", 
-                         tcl_lib_dir, tk_lib_dir]
-         runtime_library_dirs = None
- 
+         include_dirs = [os.path.join("src",Togl)] + config.togl_include_dirs + \
diff --git a/graphics/py-opengl/pkg-plist b/graphics/py-opengl/pkg-plist
index 55b7590fd6ee..2f422fb324dd 100644
--- a/graphics/py-opengl/pkg-plist
+++ b/graphics/py-opengl/pkg-plist
@@ -112,6 +112,7 @@ lib/%%PYTHON_VERSION%%/site-packages/OpenGL/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/_glu.so
+lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/_glu_num.so
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/_glut.so
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/_opengl.so
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/_opengl_num.so