4 files changed, 31 insertions, 7 deletions

diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index d39490caf530..4ab15c2d5d18 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opengl
-PORTVERSION=	1.5.6.b1
+PORTVERSION=	1.5.6
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
diff --git a/graphics/py-opengl/distinfo b/graphics/py-opengl/distinfo
index 2a305a2ee0ca..beec17e02218 100644
--- a/graphics/py-opengl/distinfo
+++ b/graphics/py-opengl/distinfo
@@ -1 +1 @@
-MD5 (PyOpenGL-1.5.6b1.tar.gz) = 4879a28f98a3ec0103a4132f535ea1ee
+MD5 (PyOpenGL-1.5.6.tar.gz) = 9abb6ba377a82efd73d885784a1a37f5
diff --git a/graphics/py-opengl/files/patch-ac b/graphics/py-opengl/files/patch-ac
index adaf5aa3e77a..fba6135a9381 100644
--- a/graphics/py-opengl/files/patch-ac
+++ b/graphics/py-opengl/files/patch-ac
@@ -1,7 +1,18 @@
---- 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/")
+
+$FreeBSD$
+
+--- togl_setup.py.orig	Wed Jan 10 14:43:40 2001
++++ togl_setup.py	Mon Jan 22 13:28:56 2001
+@@ -52,14 +52,12 @@
+         library_dirs = config.togl_lib_dirs + [tk_dir]
+         runtime_library_dirs = None
+     else:
+-        tcl_include_dir = os.path.join( tk.getvar('tcl_library'),
+-                                        "../../include" )
+-        tk_include_dir = os.path.join(tk.getvar('tk_library'),
+-                                        "../../include" )
++        tcl_include_dir = tk.getvar('tcl_library').replace('/lib/', '/include/')
++        tk_include_dir = tk.getvar('tk_library').replace('/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'),".."))
 -        tcl_lib = "tcl" + tk.getvar('tcl_version')
@@ -10,4 +21,12 @@
 +        tk_lib = "tk" + string.replace(tk.getvar('tk_version'),".","")
  
          # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
-         include_dirs = [os.path.join("src",Togl)] + config.togl_include_dirs + \
+         include_dirs = [os.path.join("src",Togl),
+@@ -102,6 +100,7 @@
+                             extra_postargs=extra_compile_args)
+ 
+         # link all together
++        extra_link_args = ["-Wl,-E"]
+         build_ext.compiler.link_shared_object (
+                 objects, 
+                 output_filename,
diff --git a/graphics/py-opengl/pkg-plist b/graphics/py-opengl/pkg-plist
index 2f422fb324dd..ec6068d5a406 100644
--- a/graphics/py-opengl/pkg-plist
+++ b/graphics/py-opengl/pkg-plist
@@ -109,6 +109,10 @@ lib/%%PYTHON_VERSION%%/site-packages/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3/Togl.so
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3/pkgIndex.tcl
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/OpenGL/doc/license.txt
+lib/%%PYTHON_VERSION%%/site-packages/OpenGL/doc/readme.txt
+lib/%%PYTHON_VERSION%%/site-packages/OpenGL/doc/releasenotes.txt
+lib/%%PYTHON_VERSION%%/site-packages/OpenGL/doc/todo.txt
 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
@@ -120,6 +124,7 @@ lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/opengluti
 lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%/openglutil_num.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload/freebsd%%OSMAJOR%%
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/dynload
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/doc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/Tk
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/OpenGL/GLUT