4 files changed, 49 insertions, 37 deletions

diff --git a/graphics/py-opengl/files/patch-ab b/graphics/py-opengl/files/patch-ab
deleted file mode 100644
index 24a6d69c8f84..000000000000
--- a/graphics/py-opengl/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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"] + gl_libs 
-     glut_libs = ["glut","Xi","Xmu"] + glu_libs # + ['cvt'] SGI IRIX6
--    include_dirs = ["src","/usr/local/include","/usr/X11/include","/usr/X11R6/include","/usr/include"]
--    gl_lib_dirs = ["/usr/local/lib","/usr/X11/lib","/usr/X11R6/lib","/usr/lib"]
-+    include_dirs = ["src","%%LOCALBASE%%/include","%%X11BASE%%/include","/usr/include"]
-+    gl_lib_dirs = ["%%LOCALBASE%%/lib","%%X11BASE%%/lib","/usr/lib"]
-     # 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 fba6135a9381..c88c2b3211c9 100644
--- a/graphics/py-opengl/files/patch-ac
+++ b/graphics/py-opengl/files/patch-ac
@@ -1,32 +1,38 @@
 
 $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
+--- setup/togl_setup.py	2003/01/14 17:31:36	1.1
++++ setup/togl_setup.py	2003/01/14 17:37:16
+@@ -40,7 +40,7 @@
+     sources = [os.path.join('src',Togl,'togl.c')]
+ 
+     include_dirs.append(os.path.join('src',Togl))
+-    include_dirs.append(os.path.join(tk.getvar('tk_library'), '..', '..', 'include'))
++    include_dirs.append(tk.getvar('tk_library').replace('/lib/', '/include/'))
+ 
+     lib_dirs.append(os.path.normpath(os.path.join(tk.getvar('tk_library'), '..')))
+ 
+@@ -53,12 +53,12 @@
+         libs.append('tcl' + string.replace(tk.getvar('tcl_version'), '.', ''))
+         libs.append('tk' + string.replace(tk.getvar('tk_version'), '.', ''))
      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')
--        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'),".","")
+-        include_dirs.append(os.path.normpath(os.path.join(tk.getvar('tcl_library'), '..', '..', 'include')))
++        include_dirs.append(tk.getvar('tcl_library').replace('/lib/', '/include/'))
+ 
+         lib_dirs.append(os.path.normpath(os.path.join(tk.getvar('tcl_library'), '..')))
+ 
+-        libs.append('tcl' + tk.getvar('tcl_version'))
+-        libs.append('tk' + tk.getvar('tk_version'))
++        libs.append('tcl' + string.replace(tk.getvar('tcl_version'),'.',''))
++        libs.append('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),
-@@ -102,6 +100,7 @@
+     # rest of this function was inspired by build_ext.py , build_extensions() 
+     
+@@ -91,6 +91,7 @@
                              extra_postargs=extra_compile_args)
  
          # link all together
-+        extra_link_args = ["-Wl,-E"]
++	extra_link_args = ['-Wl,-E']
          build_ext.compiler.link_shared_object (
                  objects, 
                  output_filename,
diff --git a/graphics/py-opengl/files/patch-ad b/graphics/py-opengl/files/patch-ad
index 1163bffb8528..aaf341f715a6 100644
--- a/graphics/py-opengl/files/patch-ad
+++ b/graphics/py-opengl/files/patch-ad
@@ -1,5 +1,8 @@
---- Tkinter.py.orig	Mon Dec  4 19:27:43 2000
-+++ Tkinter.py	Mon Dec  4 19:36:19 2000
+
+$FreeBSD$
+
+--- 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
 +
@@ -8,7 +11,7 @@
 +		pass
 +	def call(self, a1='', a2='', a3='', a4='', a5=''):
 +		os.system('echo' + ' ' + a1 + ' ' + a2 + ' ' + a3 + ' ' + a4 + \
-+		 ' ' + a5 + ' >> register.tcl')
++		 ' ' + a5 + ' > register.tcl')
 +
 +class Tk:
 +	tk = None
diff --git a/graphics/py-opengl/files/patch-config::freebsd.cfg b/graphics/py-opengl/files/patch-config::freebsd.cfg
new file mode 100644
index 000000000000..abdb50ef0162
--- /dev/null
+++ b/graphics/py-opengl/files/patch-config::freebsd.cfg
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- config/freebsd.cfg	2003/01/14 17:28:11	1.1
++++ config/freebsd.cfg	2003/01/14 17:29:05
+@@ -11,8 +11,8 @@
+ [General]
+ build_togl=1
+ gl_platform=GLX
+-include_dirs=/usr/include:/usr/local/include:/usr/X11/include
+-library_dirs=/usr/lib:/usr/local/lib:/usr/X11/lib
++include_dirs=/usr/include:%%LOCALBASE%%l/include:%%X11BASE%%/include
++library_dirs=/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib
+ 
+ ; a sys.pathsep separated list of the libs needed when linking GL
+ [GL]