- Update to 1.5.6.a2;

- take over maintainership (mail addressed to the old maintainer bounces);
- use USE_PYTHON;
- new MASTER_SITES and WWW (project has been moved to Sourceforge).

6 files changed, 61 insertions, 113 deletions

diff --git a/graphics/py-opengl/files/Setup.add.togl b/graphics/py-opengl/files/Setup.add.togl
deleted file mode 100644
index 4468da3a6f16..000000000000
--- a/graphics/py-opengl/files/Setup.add.togl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# TOGL 1.5b3
-# This is a Tk widget module that lets PyOpenGL draw into a Tkinter window.
-# If you don't want/have togl, comment out all of the following lines
-#
-togl	\
-# This must match the name of the Togl source directory
-	-I./Togl-1.5 \
-# These must match the version you have installed
-	-ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
-	-LLOCALBASE/lib -ltk82 -ltcl82 \
-# You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
-	-IX11BASE/include -LX11BASE/lib \
-	-lGLU -lGL \
-# Various combinations of these depending on your platform:
-	-lX11 -lXmu -lXext -lXt \
-# If you don't have this, something is really wrong!
-	-lm \
-# for Linux only?
-#	-ldl \
-togl.c  # putting this at the end for \ reasons
diff --git a/graphics/py-opengl/files/Setup.base b/graphics/py-opengl/files/Setup.base
deleted file mode 100644
index 135f8317b498..000000000000
--- a/graphics/py-opengl/files/Setup.base
+++ /dev/null
@@ -1,80 +0,0 @@
-*shared*
-
-###
-#
-# This is the Setup file for the PyOpenGL extensions.
-#
-# It should work with OpenGL 1.0, 1.1, or the corresponding versions
-# of Mesa.
-#
-
-# This module provides most of the interfaces to the standard OpenGL API
-_opengl	_openglmodule.c  -IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
-
-# Some convenience functions contributed by users.
-openglutil	openglutil.c  -IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
-
-# 
-# If you have the Numeric extensions installed, make sure the
-# following two modules are uncommented.  If you don't, make sure
-# they're commented out.
-# 
-# These modules provide a few more features than the two modules
-# above, and significantly more speed in some circumstances
-#
-# (( Will these guys ever decide on "one" include directory name?! ))
-_opengl_num	_opengl_nummodule.c  -DNUMERIC \
-	-ILOCALBASE/include/python1.5/numerical \
-	-ILOCALBASE/include/python1.5/Numeric \
-	-IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
-
-openglutil_num	openglutil_num.c  -DNUMERIC \
-	-ILOCALBASE/include/python1.5/numerical \
-	-ILOCALBASE/include/python1.5/Numeric \
-	-IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
-# NOTES:  
-#  - The -lX11 for _opengl_num and openglutil_num is a hack around 
-#    XFree86 4.0 libGL.so's undeclared dependence on libX11 (e.g. XFreePixmap).
-#  - The -lXext for _opengl_num and opengl_num is a hack around
-#    XFree86 4.0 libGL.so's undeclared depdnence on libXext 
-#    (e.g. XextAddDisplay)
-
-# The GLU utility library -- part of most standard OpenGL setups
-_glu	_glumodule.c  \
-	-IX11BASE/include -LX11BASE/lib -lGLU -lGL -lXext -lX11
-
-# The GLUT toolkit interface
-_glut	\
-# You'll definitely need this one:
-	-lglut  \
-# You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
-	-IX11BASE/include -LX11BASE/lib \
-	-lGLU -lGL \
-# Various combinations of these depending on your platform:
-	-lXi -lXmu -lXext -lX11 \
-# on SGI IRIX 6, uncomment the following
-#	-lcvt  \
-_glutmodule.c  # putting this at the end for \ reasons
-
-
-## #
-## # TOGL 1.5b3
-## # This is a Tk widget module that lets PyOpenGL draw into a Tkinter window.
-## # If you don't want/have togl, comment out all of the following lines
-## #
-## togl	\
-## # This must match the name of the Togl source directory
-##         -I./Togl-1.5 \
-## # These must match the version you have installed
-##         -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
-##         -LLOCALBASE/lib -ltk82 -ltcl82 \
-## # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
-##         -IX11BASE/include -LX11BASE/lib \
-##         -lGLU -lGL \
-## # Various combinations of these depending on your platform:
-##         -lX11 -lXmu -lXext -lXt \
-## # If you don't have this, something is really wrong!
-##         -lm \
-## # for Linux only?
-## #	-ldl \
-## togl.c  # putting this at the end for \ reasons
diff --git a/graphics/py-opengl/files/patch-aa b/graphics/py-opengl/files/patch-aa
deleted file mode 100644
index c19a89843783..000000000000
--- a/graphics/py-opengl/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Togl-1.5/ORIG/togl.c	Fri Aug 21 23:06:00 1998
-+++ Togl-1.5/togl.c	Wed Aug 18 18:41:24 1999
-@@ -118,7 +118,7 @@
- #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==2
- #  include "tkInt8.0p2.h"
- #else
--   Sorry, you will have to edit togl.c to include the right tkInt.h file
-+#  include "tkInt.h"
- #endif
- #elif defined(WIN32)
- #if TK_MAJOR_VERSION<8
diff --git a/graphics/py-opengl/files/patch-ab b/graphics/py-opengl/files/patch-ab
new file mode 100644
index 000000000000..8b2e1a9a829a
--- /dev/null
+++ b/graphics/py-opengl/files/patch-ab
@@ -0,0 +1,13 @@
+--- setup.py	2000/12/04 14:04:20	1.1
++++ setup.py	2000/12/04 14:05:08
+@@ -80,8 +80,8 @@
+     gl_libs = ["GL","X11","Xext"] # some Mesa versions need X11 here
+     glu_libs = ["GLU","Xext","X11"] + 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 = []
diff --git a/graphics/py-opengl/files/patch-ac b/graphics/py-opengl/files/patch-ac
new file mode 100644
index 000000000000..fbe9dc1760a9
--- /dev/null
+++ b/graphics/py-opengl/files/patch-ac
@@ -0,0 +1,23 @@
+--- 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 @@
+         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'),".."))
+-        tcl_lib = "tcl" + tk.getvar('tcl_version')
+-        tk_lib = "tk" + tk.getvar('tk_version')
++        tcl_lib = "tcl" + string.replace(tk.getvar('tcl_version'),".","")
++        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
+ 
diff --git a/graphics/py-opengl/files/patch-ad b/graphics/py-opengl/files/patch-ad
new file mode 100644
index 000000000000..1163bffb8528
--- /dev/null
+++ b/graphics/py-opengl/files/patch-ad
@@ -0,0 +1,25 @@
+--- Tkinter.py.orig	Mon Dec  4 19:27:43 2000
++++ Tkinter.py	Mon Dec  4 19:36:19 2000
+@@ -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.3'
++		if varname == 'tcl_library':
++			return '%%LOCALBASE%%/lib/tcl8.3'
++		if varname == 'tk_library':
++			return '%%LOCALBASE%%/lib/tk8.3'
++		return ''