From owner-freebsd-ports Sun Aug 4 9:40:16 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA5B337B400 for ; Sun, 4 Aug 2002 09:40:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE55043E70 for ; Sun, 4 Aug 2002 09:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g74Ge2JU071518 for ; Sun, 4 Aug 2002 09:40:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g74Ge2Ov071517; Sun, 4 Aug 2002 09:40:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AC4837B400 for ; Sun, 4 Aug 2002 09:31:33 -0700 (PDT) Received: from kiste.thiemo.net (kiste.thiemo.net [193.159.181.84]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FA5B43E3B for ; Sun, 4 Aug 2002 09:31:32 -0700 (PDT) (envelope-from rk@ronald.org) Received: (from uucp@localhost) by kiste.thiemo.net (8.9.3/8.9.3) with UUCP id SAA49240 for FreeBSD-gnats-submit@freebsd.org; Sun, 4 Aug 2002 18:31:30 +0200 (CEST) (envelope-from rk@ronald.org) Received: from wallace.home.ronald.org (rk@localhost [127.0.0.1]) by wallace.home.ronald.org (8.12.5/8.12.5) with ESMTP id g74GUxPH000772 for ; Sun, 4 Aug 2002 18:31:03 +0200 (CEST) (envelope-from rk@ronald.org) Received: (from rk@localhost) by wallace.home.ronald.org (8.12.5/8.12.5/Submit) id g74GUwG7000771; Sun, 4 Aug 2002 18:30:58 +0200 (CEST) (envelope-from rk) Message-Id: <200208041630.g74GUwG7000771@wallace.home.ronald.org> Date: Sun, 4 Aug 2002 18:30:58 +0200 (CEST) From: Ronald Kuehn Reply-To: Ronald Kuehn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41318: update port: graphics/lablgl: version 0.98 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41318 >Category: ports >Synopsis: update port: graphics/lablgl: version 0.98 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Aug 04 09:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Ronald Kuehn >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD wallace.home.ronald.org 4.6-STABLE FreeBSD 4.6-STABLE #8: Sun Jul 7 17:09:01 CEST 2002 rk@merlin.home.ronald.org:/usr/build/obj/usr/src/sys/WALLACE i386 >Description: This is an update to lablgl-0.98. The port requires ocaml-3.05. Please make sure PR ports/41299 is committed first. As agreed by Jacques Garrigue (author of lablgl) PR ports/37215 can be closed since this PR supersedes it. PR ports/40097 (submitted by me) is obsolete as well. Please remove "files/patch-aa". >How-To-Repeat: >Fix: diff -ruN lablgl.old/Makefile lablgl/Makefile --- lablgl.old/Makefile Fri Aug 2 21:35:06 2002 +++ lablgl/Makefile Fri Aug 2 21:32:25 2002 @@ -6,7 +6,7 @@ # PORTNAME= lablgl -PORTVERSION= 0.97 +PORTVERSION= 0.98 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/ @@ -17,6 +17,7 @@ RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml USE_MESA= yes +USE_GMAKE= yes WRKSRC= ${WRKDIR}/lablGL-${PORTVERSION} ALL_TARGET= all opt EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} diff -ruN lablgl.old/distinfo lablgl/distinfo --- lablgl.old/distinfo Fri Aug 2 21:35:06 2002 +++ lablgl/distinfo Fri Aug 2 20:43:33 2002 @@ -1 +1 @@ -MD5 (lablgl-0.97.tar.gz) = e084a62ff47492cade8887f3f6b60c5b +MD5 (lablgl-0.98.tar.gz) = c39cb9d48539397960db85229a529357 diff -ruN lablgl.old/files/patch-aa lablgl/files/patch-aa --- lablgl.old/files/patch-aa Fri Aug 2 21:35:06 2002 +++ lablgl/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- Makefile.orig Thu Nov 1 09:44:16 2001 -+++ Makefile Sun Jan 13 19:27:18 2002 -@@ -104,8 +104,8 @@ - - real-install: - if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi -- if test `grep -s -c '^$(INSTALLDIR)$$' $(LIBDIR)/ld.conf || :` = 0; \ -- then echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf; fi -+# if test `grep -s -c '^$(INSTALLDIR)$$' $(LIBDIR)/ld.conf || :` = 0; \ -+# then echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf; fi - cp $(MLOBJS:.cmo=.cmi) $(INSTALLDIR) - cp $(MLOBJS:.cmo=.mli) $(INSTALLDIR) - cp liblablgl.a lablgl.cma libtogl.a togl.cma $(INSTALLDIR) diff -ruN lablgl.old/files/patch-ab lablgl/files/patch-ab --- lablgl.old/files/patch-ab Fri Aug 2 21:35:06 2002 +++ lablgl/files/patch-ab Fri Aug 2 20:53:21 2002 @@ -1,6 +1,6 @@ ---- Makefile.config.orig Sun Jan 13 19:30:59 2002 -+++ Makefile.config Sun Jan 13 19:44:33 2002 -@@ -7,22 +7,22 @@ +--- Makefile.config.orig Fri Aug 2 20:48:31 2002 ++++ Makefile.config Fri Aug 2 20:52:28 2002 +@@ -7,28 +7,28 @@ ##### Adjust these always # Where to put the lablgl script @@ -26,14 +26,19 @@ -GLLIBS = -lGL -lGLU +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) - # GLLIBS = -lGL -lGLU -lXmu -lXext -lpthread + #GLLIBS = -lGL -lGLU -lXmu -lXext -lpthread -@@ -45,7 +45,7 @@ - TOGLDIR = Togl + # 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 +@@ -55,4 +55,4 @@ + #TOGLDIR = Togl # C Compiler options --COPTS = -c -O +-#COPTS = -c -O +COPTS = -c ${CFLAGS} - - ###### No need to change these - diff -ruN lablgl.old/pkg-plist lablgl/pkg-plist --- lablgl.old/pkg-plist Fri Aug 2 21:35:06 2002 +++ lablgl/pkg-plist Fri Aug 2 21:20:50 2002 @@ -35,13 +35,11 @@ lib/ocaml/lablGL/glLight.mli lib/ocaml/lablGL/gl.mli lib/ocaml/lablGL/togl.mli +lib/ocaml/lablGL/lablgltop lib/ocaml/lablGL/togl.cma lib/ocaml/lablGL/libtogl.a lib/ocaml/lablGL/lablgl.cma lib/ocaml/lablGL/liblablgl.a -lib/ocaml/lablGL/lablgltop -lib/ocaml/lablGL/dlltogl.so -lib/ocaml/lablGL/dlllablgl.so lib/ocaml/lablGL/lablgl.cmxa lib/ocaml/lablGL/gluMat.cmx lib/ocaml/lablGL/gluTess.cmx @@ -64,6 +62,8 @@ lib/ocaml/lablGL/togl.cmxa lib/ocaml/lablGL/lablgl.a lib/ocaml/lablGL/togl.cmx +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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message