Date: Mon, 23 Feb 2004 01:05:24 +0100 (CET) From: Ronald Kuehn <rk@ronald.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63246: graphics/ocaml-lablgl: fix breakage and upgrade to 1.00 Message-ID: <200402230005.i1N05NBM036065@merlin.home.ronald.org> Resent-Message-ID: <200402230010.i1N0ASWM041333@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63246 >Category: ports >Synopsis: graphics/ocaml-lablgl: fix breakage and upgrade to 1.00 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Feb 22 16:10:27 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ronald Kuehn >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD merlin.home.ronald.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Sun Dec 14 06:59:24 CET 2003 rk@merlin.home.ronald.org:/usr/src/sys/compile/MERLIN i386 >Description: The change of the lang/ocaml port to use tcl/tk 8.4.x broke graphics/ocaml-lablgl. This patch updates lablgl to 1.00 and changes it to also use tcl/tk 8.4.x. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/cvs/ports/graphics/ocaml-lablgl/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 9 Feb 2004 01:57:31 -0000 1.7 +++ Makefile 22 Feb 2004 23:55:23 -0000 @@ -6,8 +6,7 @@ # PORTNAME= lablgl -PORTVERSION= 0.99 -PORTREVISION= 1 +PORTVERSION= 1.00 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/ @@ -19,28 +18,42 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -USE_MESA= yes +USE_GL= yes USE_GMAKE= yes -WRKSRC= ${WRKDIR}/lablGL-${PORTVERSION} +WRKSRC= ${WRKDIR}/lablgl-${PORTVERSION} ALL_TARGET= all opt -EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +#EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} +#DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502000 -BROKEN= "Does not compile" -.endif - post-extract: - @${CP} ${WRKSRC}/Makefile.config.ex ${WRKSRC}/Makefile.config + @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} + ${MKDIR} ${EXAMPLESDIR}/LablGlut/caml-images \ + ${EXAMPLESDIR}/LablGlut/etc \ + ${EXAMPLESDIR}/LablGlut/etc/in-progress \ + ${EXAMPLESDIR}/LablGlut/lablGL \ + ${EXAMPLESDIR}/LablGlut/nehe \ + ${EXAMPLESDIR}/Togl + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/README \ + ${EXAMPLESDIR}/LablGlut + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/caml-images/* \ + ${EXAMPLESDIR}/LablGlut/caml-images + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/etc/d* \ + ${EXAMPLESDIR}/LablGlut/etc + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/etc/in-progress/* \ + ${EXAMPLESDIR}/LablGlut/etc/in-progress + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/lablGL/* \ + ${EXAMPLESDIR}/LablGlut/lablGL + ${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/nehe/* \ + ${EXAMPLESDIR}/LablGlut/nehe + ${INSTALL_DATA} ${WRKSRC}/Togl/examples/* \ + ${EXAMPLESDIR}/Togl .if !defined(NO_PORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /usr/cvs/ports/graphics/ocaml-lablgl/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 18 Aug 2003 06:23:17 -0000 1.3 +++ distinfo 22 Feb 2004 21:54:54 -0000 @@ -1 +1,2 @@ -MD5 (lablgl-0.99.tar.gz) = 5b5ea7889536246c58a5e747d61d6d14 +MD5 (lablgl-1.00.tar.gz) = 92bcfe3121650c43e5bc4c018778405b +SIZE (lablgl-1.00.tar.gz) = 390570 Index: pkg-plist =================================================================== RCS file: /usr/cvs/ports/graphics/ocaml-lablgl/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 18 Aug 2003 06:23:17 -0000 1.3 +++ pkg-plist 22 Feb 2004 23:49:16 -0000 @@ -1,8 +1,12 @@ @comment $FreeBSD: ports/graphics/ocaml-lablgl/pkg-plist,v 1.3 2003/08/18 06:23:17 daichi Exp $ bin/lablgl +bin/lablglut lib/ocaml/lablGL/gl.cmi lib/ocaml/lablGL/gl.cmx lib/ocaml/lablGL/gl.mli +lib/ocaml/lablGL/glArray.cmi +lib/ocaml/lablGL/glArray.cmx +lib/ocaml/lablGL/glArray.mli lib/ocaml/lablGL/glClear.cmi lib/ocaml/lablGL/glClear.cmx lib/ocaml/lablGL/glClear.mli @@ -48,11 +52,17 @@ lib/ocaml/lablGL/gluTess.cmi lib/ocaml/lablGL/gluTess.cmx lib/ocaml/lablGL/gluTess.mli +lib/ocaml/lablGL/glut.cmi +lib/ocaml/lablGL/glut.cmx +lib/ocaml/lablGL/glut.mli lib/ocaml/lablGL/lablgl.a lib/ocaml/lablGL/lablgl.cma lib/ocaml/lablGL/lablgl.cmxa -lib/ocaml/lablGL/lablgltop +lib/ocaml/lablGL/lablglut.a +lib/ocaml/lablGL/lablglut.cma +lib/ocaml/lablGL/lablglut.cmxa lib/ocaml/lablGL/liblablgl.a +lib/ocaml/lablGL/liblablglut.a lib/ocaml/lablGL/libtogl.a lib/ocaml/lablGL/raw.cmi lib/ocaml/lablGL/raw.cmx @@ -65,18 +75,47 @@ lib/ocaml/lablGL/togl.mli lib/ocaml/stublibs/dlllablgl.so lib/ocaml/stublibs/dlltogl.so -%%PORTDOCS%%share/doc/ocaml/lablgl/README -share/examples/ocaml/lablgl/Makefile -share/examples/ocaml/lablgl/README -share/examples/ocaml/lablgl/checker.ml -share/examples/ocaml/lablgl/double.ml -share/examples/ocaml/lablgl/gears.ml -share/examples/ocaml/lablgl/morph3d.ml -share/examples/ocaml/lablgl/planet.ml -share/examples/ocaml/lablgl/scene.ml -share/examples/ocaml/lablgl/simple.ml -share/examples/ocaml/lablgl/tennis.ml -share/examples/ocaml/lablgl/texturesurf.ml +lib/ocaml/stublibs/dlllablglut.so +%%PORTDOCS%%%%DOCSDIR%%/README +%%EXAMPLESDIR%%/LablGlut/caml-images/ChangeLog +%%EXAMPLESDIR%%/LablGlut/caml-images/Makefile +%%EXAMPLESDIR%%/LablGlut/caml-images/OCamlMakefile +%%EXAMPLESDIR%%/LablGlut/caml-images/main.ml +%%EXAMPLESDIR%%/LablGlut/caml-images/ppm.ppm +%%EXAMPLESDIR%%/LablGlut/etc/in-progress/scene_graph.ml +%%EXAMPLESDIR%%/LablGlut/etc/draw2d.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/README +%%EXAMPLESDIR%%/LablGlut/lablGL/checker.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/gears.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/morph3d.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/planet.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/scene.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/simple.ml +%%EXAMPLESDIR%%/LablGlut/lablGL/texturesurf.ml +%%EXAMPLESDIR%%/LablGlut/nehe/lesson2.ml +%%EXAMPLESDIR%%/LablGlut/nehe/lesson3.ml +%%EXAMPLESDIR%%/LablGlut/nehe/lesson4.ml +%%EXAMPLESDIR%%/LablGlut/nehe/lesson5.ml +%%EXAMPLESDIR%%/LablGlut/README +%%EXAMPLESDIR%%/Togl/Makefile +%%EXAMPLESDIR%%/Togl/README +%%EXAMPLESDIR%%/Togl/checker.ml +%%EXAMPLESDIR%%/Togl/double.ml +%%EXAMPLESDIR%%/Togl/gears.ml +%%EXAMPLESDIR%%/Togl/gears_a.ml +%%EXAMPLESDIR%%/Togl/morph3d.ml +%%EXAMPLESDIR%%/Togl/planet.ml +%%EXAMPLESDIR%%/Togl/scene.ml +%%EXAMPLESDIR%%/Togl/simple.ml +%%EXAMPLESDIR%%/Togl/tennis.ml +%%EXAMPLESDIR%%/Togl/texturesurf.ml @dirrm lib/ocaml/lablGL -@dirrm share/examples/ocaml/lablgl -%%PORTDOCS%%@dirrm share/doc/ocaml/lablgl +@dirrm %%EXAMPLESDIR%%/LablGlut/caml-images +@dirrm %%EXAMPLESDIR%%/LablGlut/etc/in-progress +@dirrm %%EXAMPLESDIR%%/LablGlut/etc +@dirrm %%EXAMPLESDIR%%/LablGlut/lablGL +@dirrm %%EXAMPLESDIR%%/LablGlut/nehe +@dirrm %%EXAMPLESDIR%%/LablGlut +@dirrm %%EXAMPLESDIR%%/Togl +@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-ab =================================================================== RCS file: /usr/cvs/ports/graphics/ocaml-lablgl/files/patch-ab,v retrieving revision 1.3 diff -u -r1.3 patch-ab --- files/patch-ab 18 Aug 2003 06:23:17 -0000 1.3 +++ files/patch-ab 22 Feb 2004 22:08:35 -0000 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402230005.i1N05NBM036065>