diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2004-03-04 07:49:12 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2004-03-04 07:49:12 +0000 |
| commit | c99ca03f1bc1c97b7dfb8e0385448b58430e85fc (patch) | |
| tree | 5b1cefe6f5d60457ffcd91f674c5997e56d19eae /graphics/ocaml-lablgl/files | |
| parent | 55db7303d9e28cb59cc130e1ed3cefe8ac717192 (diff) | |
Notes
Diffstat (limited to 'graphics/ocaml-lablgl/files')
| -rw-r--r-- | graphics/ocaml-lablgl/files/patch-ab | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/graphics/ocaml-lablgl/files/patch-ab b/graphics/ocaml-lablgl/files/patch-ab index d6a7f3b34c41..4363cf4315b6 100644 --- a/graphics/ocaml-lablgl/files/patch-ab +++ b/graphics/ocaml-lablgl/files/patch-ab @@ -1,7 +1,7 @@ ---- Makefile.config.orig Sun Aug 17 09:16:13 2003 -+++ Makefile.config Sun Aug 17 09:15:43 2003 -@@ -11,28 +11,28 @@ - #CAMLOPT = ocamlopt.opt +--- Makefile.config.orig Sun Feb 22 23:03:48 2004 ++++ Makefile.config Sun Feb 22 23:06:44 2004 +@@ -9,18 +9,18 @@ + ##### Adjust these always # Where to put the lablgl script -BINDIR = /usr/local/bin @@ -11,24 +11,23 @@ -XINCLUDES = -I/usr/X11R6/include +XINCLUDES = -I${X11BASE}/include # X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) - #XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 +-XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 ++XLIBS = -L${X11BASE}/lib -lXext -lXmu -lX11 # Where to find Tcl/Tk headers # This must the same version as for LablTk --TKINCLUDES = -I/usr/local/include -+TKINCLUDES = -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 +-TKINCLUDES = -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3 ++TKINCLUDES = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) --#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83 -+TKLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83 +-TKLIBS = -L/usr/local/lib -ltk83 -ltcl83 ++TKLIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 # Where to find OpenGL/Mesa headers and libraries GLINCLUDES = --GLLIBS = -lGL -lGLU -+GLLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lGL -lGLU -lXmu -lXext +@@ -29,8 +29,8 @@ # The following libraries may be required (try to add them one at a time) - #GLLIBS = -lGL -lGLU -lXmu -lXext -lpthread - # How to index a library after installing (ranlib required on MacOSX) + # How to index a library after installing (required on MacOSX) -RANLIB = : -#RANLIB = ranlib +#RANLIB = : @@ -36,7 +35,7 @@ ##### Uncomment these for windows #TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -@@ -59,4 +59,4 @@ +@@ -57,4 +57,4 @@ #TOGLDIR = Togl # C Compiler options |