diff options
Diffstat (limited to 'graphics/py-opengl/files')
| -rw-r--r-- | graphics/py-opengl/files/patch-ac | 38 | ||||
| -rw-r--r-- | graphics/py-opengl/files/patch-config::freebsd.cfg | 27 |
2 files changed, 12 insertions, 53 deletions
diff --git a/graphics/py-opengl/files/patch-ac b/graphics/py-opengl/files/patch-ac deleted file mode 100644 index c88c2b3211c9..000000000000 --- a/graphics/py-opengl/files/patch-ac +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- 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: -- 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'),'.','')) - - # 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'] - build_ext.compiler.link_shared_object ( - objects, - output_filename, diff --git a/graphics/py-opengl/files/patch-config::freebsd.cfg b/graphics/py-opengl/files/patch-config::freebsd.cfg index abdb50ef0162..3618ad54abf9 100644 --- a/graphics/py-opengl/files/patch-config::freebsd.cfg +++ b/graphics/py-opengl/files/patch-config::freebsd.cfg @@ -1,16 +1,13 @@ - -$FreeBSD$ - ---- config/freebsd.cfg 2003/01/14 17:28:11 1.1 -+++ config/freebsd.cfg 2003/01/14 17:29:05 +--- 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 --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] + [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:%%X11BASE%%/include
++library_dirs=/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib
+
+ ; a os.pathsep separated list of the libs needed when linking GL
+ [GL]
|
