Attachment 24132 Details for Bug 41318 – file.diff

[patch] file.diff

file.diff (text/plain), 3.55 KB, created by rk on 2002-08-04 17:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rk

Created: 2002-08-04 17:40:01 UTC

Size: 3.55 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 41318: 24132