Date: Tue, 1 Aug 2006 01:10:23 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rk@ronald.org Subject: ports/101127: [PATCH] graphics/ocaml-lablgl: update to 1.02 Message-ID: <20060731211023.F01721208B@fonon.realnet> Resent-Message-ID: <200607312120.k6VLKCsd011051@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101127 >Category: ports >Synopsis: [PATCH] graphics/ocaml-lablgl: update to 1.02 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 31 21:20:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 >Description: - Depend on TK'ied OCaml (we need this) - Use new OCaml framework - Use version-independent patch (via sed) - Install examples efficiently - Use common ocaml examples/docs directory - Update to 1.02 I removed the following files: - files/patch-ab Note: this PR heavily depends on ports/101100 Copy of this message was sent to (rk@ronald.org). >How-To-Repeat: >Fix: --- ocaml-lablgl-1.02.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/ocaml-lablgl/Makefile /var/tmp/ocaml-lablgl/Makefile --- /usr/ports/graphics/ocaml-lablgl/Makefile Thu Jan 12 15:54:20 2006 +++ /var/tmp/ocaml-lablgl/Makefile Tue Aug 1 01:07:20 2006 @@ -6,8 +6,8 @@ # PORTNAME= lablgl -PORTVERSION= 1.00 -PORTREVISION= 1 +PORTVERSION= 1.02 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/ @@ -16,44 +16,63 @@ MAINTAINER= rk@ronald.org COMMENT= OpenGL interface for Objective Caml -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut -RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml USE_GL= yes USE_GMAKE= yes -WRKSRC= ${WRKDIR}/lablgl-${PORTVERSION} +USE_OCAML= yes ALL_TARGET= all opt -#EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} -#DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +DEPENDS_ARGS+= WITH_TK=yes + +MASTERPORT= ${PORTSDIR}/devel/ocaml-camlidl +PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] + +DOCSDIR= ${PREFIX}/share/doc/ocaml/lablgl +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl + +# XXX: exists untill it will be committed to bsd.port.mk +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \ + ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- + +.include <bsd.port.pre.mk> +.include "${MASTERPORT}/bsd.ocaml.mk" post-extract: @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config + @${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" \ + -e "s,/usr/local,${LOCALBASE},g" \ + -e "s,^\(BINDIR[ \t]*=\).*,\1${PREFIX}/bin,g" \ + -e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \ + -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \ + ${WRKSRC}/Makefile.config + + @${REINPLACE_CMD} \ + -e "s,^\(INSTALLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/lablGL,g" \ + -e "s,^\(COPTS[ \t]*=\).*,\1-c ${CFLAGS},g" \ + ${WRKSRC}/Makefile.common ${WRKSRC}/Makefile + + @${REINPLACE_CMD} -E \ + -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ + -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ + -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ + ${WRKSRC}/src/Makefile ${WRKSRC}/LablGlut/src/Makefile \ + ${WRKSRC}/Togl/src/Makefile + post-install: - ${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 + ${MKDIR} ${EXAMPLESDIR}/lablglut + ${MKDIR} ${EXAMPLESDIR}/togl + @(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} \* \ + ${EXAMPLESDIR}/lablglut '! -name Makefile') + @(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} \* \ + ${EXAMPLESDIR}/togl '! -name Makefile') + .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/graphics/ocaml-lablgl/distinfo /var/tmp/ocaml-lablgl/distinfo --- /usr/ports/graphics/ocaml-lablgl/distinfo Sun Jan 22 15:35:01 2006 +++ /var/tmp/ocaml-lablgl/distinfo Mon Jul 31 18:23:45 2006 @@ -1,3 +1,3 @@ -MD5 (lablgl-1.00.tar.gz) = 92bcfe3121650c43e5bc4c018778405b -SHA256 (lablgl-1.00.tar.gz) = f52558487b545776f29658f2c2d12c58c3915760818a6acb9847cb3b0d060a71 -SIZE (lablgl-1.00.tar.gz) = 390570 +MD5 (lablgl-1.02.tar.gz) = b50e4e7d856c26bc4449151e4307b37b +SHA256 (lablgl-1.02.tar.gz) = 364d81533b32b31820142107b49c3413e96541c5a6d3fb57ec406fb5fcc9849e +SIZE (lablgl-1.02.tar.gz) = 388662 diff -ruN --exclude=CVS /usr/ports/graphics/ocaml-lablgl/files/patch-ab /var/tmp/ocaml-lablgl/files/patch-ab --- /usr/ports/graphics/ocaml-lablgl/files/patch-ab Thu Mar 4 10:49:12 2004 +++ /var/tmp/ocaml-lablgl/files/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,43 +0,0 @@ ---- 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 -+BINDIR = ${PREFIX}/bin - - # Where to find X headers --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${X11BASE}/lib -lXext -lXmu -lX11 - - # Where to find Tcl/Tk headers - # This must the same version as for LablTk --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 -ltk84 -ltcl84 - - # Where to find OpenGL/Mesa headers and libraries - GLINCLUDES = -@@ -29,8 +29,8 @@ - # The following libraries may be required (try to add them one at a time) - - # How to index a library after installing (required on MacOSX) --RANLIB = : --#RANLIB = ranlib -+#RANLIB = : -+RANLIB = ranlib - - ##### Uncomment these for windows - #TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -@@ -57,4 +57,4 @@ - #TOGLDIR = Togl - - # C Compiler options --#COPTS = -c -O -+COPTS = -c ${CFLAGS} diff -ruN --exclude=CVS /usr/ports/graphics/ocaml-lablgl/pkg-plist /var/tmp/ocaml-lablgl/pkg-plist --- /usr/ports/graphics/ocaml-lablgl/pkg-plist Thu Mar 4 10:49:12 2004 +++ /var/tmp/ocaml-lablgl/pkg-plist Tue Aug 1 01:04:40 2006 @@ -1,59 +1,77 @@ -@comment $FreeBSD: ports/graphics/ocaml-lablgl/pkg-plist,v 1.4 2004/03/04 07:49:12 linimon Exp $ bin/lablgl bin/lablglut +lib/ocaml/lablGL/build.ml lib/ocaml/lablGL/gl.cmi lib/ocaml/lablGL/gl.cmx +lib/ocaml/lablGL/gl.ml lib/ocaml/lablGL/gl.mli lib/ocaml/lablGL/glArray.cmi lib/ocaml/lablGL/glArray.cmx +lib/ocaml/lablGL/glArray.ml lib/ocaml/lablGL/glArray.mli lib/ocaml/lablGL/glClear.cmi lib/ocaml/lablGL/glClear.cmx +lib/ocaml/lablGL/glClear.ml lib/ocaml/lablGL/glClear.mli lib/ocaml/lablGL/glDraw.cmi lib/ocaml/lablGL/glDraw.cmx +lib/ocaml/lablGL/glDraw.ml lib/ocaml/lablGL/glDraw.mli lib/ocaml/lablGL/glFunc.cmi lib/ocaml/lablGL/glFunc.cmx +lib/ocaml/lablGL/glFunc.ml lib/ocaml/lablGL/glFunc.mli lib/ocaml/lablGL/glLight.cmi lib/ocaml/lablGL/glLight.cmx +lib/ocaml/lablGL/glLight.ml lib/ocaml/lablGL/glLight.mli lib/ocaml/lablGL/glList.cmi lib/ocaml/lablGL/glList.cmx +lib/ocaml/lablGL/glList.ml lib/ocaml/lablGL/glList.mli lib/ocaml/lablGL/glMap.cmi lib/ocaml/lablGL/glMap.cmx +lib/ocaml/lablGL/glMap.ml lib/ocaml/lablGL/glMap.mli lib/ocaml/lablGL/glMat.cmi lib/ocaml/lablGL/glMat.cmx +lib/ocaml/lablGL/glMat.ml lib/ocaml/lablGL/glMat.mli lib/ocaml/lablGL/glMisc.cmi lib/ocaml/lablGL/glMisc.cmx +lib/ocaml/lablGL/glMisc.ml lib/ocaml/lablGL/glMisc.mli lib/ocaml/lablGL/glPix.cmi lib/ocaml/lablGL/glPix.cmx +lib/ocaml/lablGL/glPix.ml lib/ocaml/lablGL/glPix.mli lib/ocaml/lablGL/glTex.cmi lib/ocaml/lablGL/glTex.cmx +lib/ocaml/lablGL/glTex.ml lib/ocaml/lablGL/glTex.mli lib/ocaml/lablGL/gluMat.cmi lib/ocaml/lablGL/gluMat.cmx +lib/ocaml/lablGL/gluMat.ml lib/ocaml/lablGL/gluMat.mli lib/ocaml/lablGL/gluMisc.cmi lib/ocaml/lablGL/gluMisc.cmx +lib/ocaml/lablGL/gluMisc.ml lib/ocaml/lablGL/gluMisc.mli lib/ocaml/lablGL/gluNurbs.cmi lib/ocaml/lablGL/gluNurbs.cmx +lib/ocaml/lablGL/gluNurbs.ml lib/ocaml/lablGL/gluNurbs.mli lib/ocaml/lablGL/gluQuadric.cmi lib/ocaml/lablGL/gluQuadric.cmx +lib/ocaml/lablGL/gluQuadric.ml lib/ocaml/lablGL/gluQuadric.mli lib/ocaml/lablGL/gluTess.cmi lib/ocaml/lablGL/gluTess.cmx +lib/ocaml/lablGL/gluTess.ml lib/ocaml/lablGL/gluTess.mli lib/ocaml/lablGL/glut.cmi lib/ocaml/lablGL/glut.cmx +lib/ocaml/lablGL/glut.ml lib/ocaml/lablGL/glut.mli lib/ocaml/lablGL/lablgl.a lib/ocaml/lablGL/lablgl.cma @@ -66,56 +84,51 @@ lib/ocaml/lablGL/libtogl.a lib/ocaml/lablGL/raw.cmi lib/ocaml/lablGL/raw.cmx +lib/ocaml/lablGL/raw.ml lib/ocaml/lablGL/raw.mli lib/ocaml/lablGL/togl.a lib/ocaml/lablGL/togl.cma lib/ocaml/lablGL/togl.cmi lib/ocaml/lablGL/togl.cmx lib/ocaml/lablGL/togl.cmxa +lib/ocaml/lablGL/togl.ml lib/ocaml/lablGL/togl.mli -lib/ocaml/stublibs/dlllablgl.so -lib/ocaml/stublibs/dlltogl.so -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 %%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 +%%EXAMPLESDIR%%/lablglut/caml-images/ChangeLog +%%EXAMPLESDIR%%/lablglut/caml-images/OCamlMakefile +%%EXAMPLESDIR%%/lablglut/caml-images/main.ml +%%EXAMPLESDIR%%/lablglut/caml-images/ppm.ppm +%%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%%/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/tesselate.ml +%%EXAMPLESDIR%%/togl/texturesurf.ml +@dirrm %%EXAMPLESDIR%%/togl +@dirrm %%EXAMPLESDIR%%/lablglut/nehe +@dirrm %%EXAMPLESDIR%%/lablglut/lablGL +@dirrm %%EXAMPLESDIR%%/lablglut/caml-images +@dirrm %%EXAMPLESDIR%%/lablglut @dirrm %%EXAMPLESDIR%% +@dirrmtry share/examples/ocaml %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrmtry share/doc/ocaml +@dirrm lib/ocaml/lablGL --- ocaml-lablgl-1.02.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060731211023.F01721208B>