sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The change of the lang/ocaml port to use tcl/tk 8.4.x broke

Browse source 
graphics/ocaml-lablgl. This patch updates lablgl to 1.00 and
changes it to also use tcl/tk 8.4.x.  Summary of changes
from CHANGES:

  split togl, move examples to Togl/examples; add mingw support;
  reorganized directories and Makefiles; merge ijtrotts' LablGlut;
  add glArray support.

PR:		ports/63246
Submitted by:	Ronald Kuehn <rk@ronald.org> (maintainer)
This commit is contained in:
Mark Linimon 2004-03-04 07:49:12 +00:00
parent 55db7303d9
commit c99ca03f1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=102889
4 changed files with 97 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
graphics/ocaml-lablgl/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= lablgl PORTNAME= lablgl
PORTVERSION= 0.99 PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/ ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
@ -19,24 +18,40 @@ COMMENT= OpenGL interface for Objective Caml
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
BROKEN= "Does not compile" USE_GL= yes
USE_MESA= yes
USE_GMAKE= yes USE_GMAKE= yes
WRKSRC= ${WRKDIR}/lablGL-${PORTVERSION} WRKSRC= ${WRKDIR}/lablgl-${PORTVERSION}
ALL_TARGET= all opt ALL_TARGET= all opt
EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} #EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} #DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
post-extract: post-extract:
@${CP} ${WRKSRC}/Makefile.config.ex ${WRKSRC}/Makefile.config @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config
post-install: post-install:
@${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}/LablGlut/caml-images \
@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} ${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) .if !defined(NO_PORTDOCS)
@${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>

3
graphics/ocaml-lablgl/distinfo
View file

@ -1 +1,2 @@
MD5 (lablgl-0.99.tar.gz) = 5b5ea7889536246c58a5e747d61d6d14 MD5 (lablgl-1.00.tar.gz) = 92bcfe3121650c43e5bc4c018778405b
SIZE (lablgl-1.00.tar.gz) = 390570

27
graphics/ocaml-lablgl/files/patch-ab
View file

@ -1,7 +1,7 @@
--- Makefile.config.orig Sun Aug 17 09:16:13 2003 --- Makefile.config.orig Sun Feb 22 23:03:48 2004
+++ Makefile.config Sun Aug 17 09:15:43 2003 +++ Makefile.config Sun Feb 22 23:06:44 2004
@@ -11,28 +11,28 @@ @@ -9,18 +9,18 @@
#CAMLOPT = ocamlopt.opt ##### Adjust these always
# Where to put the lablgl script # Where to put the lablgl script
-BINDIR = /usr/local/bin -BINDIR = /usr/local/bin
@ -11,24 +11,23 @@
-XINCLUDES = -I/usr/X11R6/include -XINCLUDES = -I/usr/X11R6/include
+XINCLUDES = -I${X11BASE}/include +XINCLUDES = -I${X11BASE}/include
# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) # 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 # Where to find Tcl/Tk headers
# This must the same version as for LablTk # This must the same version as for LablTk
-TKINCLUDES = -I/usr/local/include -TKINCLUDES = -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3
+TKINCLUDES = -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/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) # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
-#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83 -TKLIBS = -L/usr/local/lib -ltk83 -ltcl83
+TKLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83 +TKLIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84
# Where to find OpenGL/Mesa headers and libraries # Where to find OpenGL/Mesa headers and libraries
GLINCLUDES = GLINCLUDES =
-GLLIBS = -lGL -lGLU @@ -29,8 +29,8 @@
+GLLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lGL -lGLU -lXmu -lXext
# The following libraries may be required (try to add them one at a time) # 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 -#RANLIB = ranlib
+#RANLIB = : +#RANLIB = :
@ -36,7 +35,7 @@
##### Uncomment these for windows ##### Uncomment these for windows
#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib #TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib
@@ -59,4 +59,4 @@ @@ -57,4 +57,4 @@
#TOGLDIR = Togl #TOGLDIR = Togl
# C Compiler options # C Compiler options

69
graphics/ocaml-lablgl/pkg-plist
View file

@ -1,8 +1,12 @@
@comment $FreeBSD$ @comment $FreeBSD$
bin/lablgl bin/lablgl
bin/lablglut
lib/ocaml/lablGL/gl.cmi lib/ocaml/lablGL/gl.cmi
lib/ocaml/lablGL/gl.cmx lib/ocaml/lablGL/gl.cmx
lib/ocaml/lablGL/gl.mli 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.cmi
lib/ocaml/lablGL/glClear.cmx lib/ocaml/lablGL/glClear.cmx
lib/ocaml/lablGL/glClear.mli lib/ocaml/lablGL/glClear.mli
@ -48,11 +52,17 @@ lib/ocaml/lablGL/gluQuadric.mli
lib/ocaml/lablGL/gluTess.cmi lib/ocaml/lablGL/gluTess.cmi
lib/ocaml/lablGL/gluTess.cmx lib/ocaml/lablGL/gluTess.cmx
lib/ocaml/lablGL/gluTess.mli 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.a
lib/ocaml/lablGL/lablgl.cma lib/ocaml/lablGL/lablgl.cma
lib/ocaml/lablGL/lablgl.cmxa 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/liblablgl.a
lib/ocaml/lablGL/liblablglut.a
lib/ocaml/lablGL/libtogl.a lib/ocaml/lablGL/libtogl.a
lib/ocaml/lablGL/raw.cmi lib/ocaml/lablGL/raw.cmi
lib/ocaml/lablGL/raw.cmx lib/ocaml/lablGL/raw.cmx
@ -65,18 +75,47 @@ lib/ocaml/lablGL/togl.cmxa
lib/ocaml/lablGL/togl.mli lib/ocaml/lablGL/togl.mli
lib/ocaml/stublibs/dlllablgl.so lib/ocaml/stublibs/dlllablgl.so
lib/ocaml/stublibs/dlltogl.so lib/ocaml/stublibs/dlltogl.so
%%PORTDOCS%%share/doc/ocaml/lablgl/README lib/ocaml/stublibs/dlllablglut.so
share/examples/ocaml/lablgl/Makefile %%PORTDOCS%%%%DOCSDIR%%/README
share/examples/ocaml/lablgl/README %%EXAMPLESDIR%%/LablGlut/caml-images/ChangeLog
share/examples/ocaml/lablgl/checker.ml %%EXAMPLESDIR%%/LablGlut/caml-images/Makefile
share/examples/ocaml/lablgl/double.ml %%EXAMPLESDIR%%/LablGlut/caml-images/OCamlMakefile
share/examples/ocaml/lablgl/gears.ml %%EXAMPLESDIR%%/LablGlut/caml-images/main.ml
share/examples/ocaml/lablgl/morph3d.ml %%EXAMPLESDIR%%/LablGlut/caml-images/ppm.ppm
share/examples/ocaml/lablgl/planet.ml %%EXAMPLESDIR%%/LablGlut/etc/in-progress/scene_graph.ml
share/examples/ocaml/lablgl/scene.ml %%EXAMPLESDIR%%/LablGlut/etc/draw2d.ml
share/examples/ocaml/lablgl/simple.ml %%EXAMPLESDIR%%/LablGlut/lablGL/README
share/examples/ocaml/lablgl/tennis.ml %%EXAMPLESDIR%%/LablGlut/lablGL/checker.ml
share/examples/ocaml/lablgl/texturesurf.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 lib/ocaml/lablGL
@dirrm share/examples/ocaml/lablgl @dirrm %%EXAMPLESDIR%%/LablGlut/caml-images
%%PORTDOCS%%@dirrm share/doc/ocaml/lablgl @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%%