diff options
| -rw-r--r-- | dev-ml/lablgl/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-ml/lablgl/Manifest | 4 | ||||
| -rw-r--r-- | dev-ml/lablgl/files/LablGL-0.97-Makefile-destdir.patch | 34 | ||||
| -rw-r--r-- | dev-ml/lablgl/files/LablGL-0.97-Makefile.config | 59 | ||||
| -rw-r--r-- | dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch | 45 | ||||
| -rw-r--r-- | dev-ml/lablgl/files/LablGL-0.98-Makefile.config | 59 |
6 files changed, 8 insertions, 202 deletions
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog index 25b7d3f7af51..a9e8baf679b0 100644 --- a/dev-ml/lablgl/ChangeLog +++ b/dev-ml/lablgl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ml/lablgl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.28 2004/08/25 21:41:38 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.29 2004/08/25 21:44:53 mattam Exp $ + + 25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> + -files/LablGL-0.97-Makefile-destdir.patch, + -files/LablGL-0.97-Makefile.config, + -files/LablGL-0.98-Makefile-destdir.patch, + -files/LablGL-0.98-Makefile.config: + Remove old, unused files. 25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -lablgl-0.97.ebuild, -lablgl-0.98.ebuild, -lablgl-0.99-r1.ebuild, -lablgl-0.99.ebuild, diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest index 340612c810d1..a42f780785e5 100644 --- a/dev-ml/lablgl/Manifest +++ b/dev-ml/lablgl/Manifest @@ -1,9 +1,5 @@ MD5 ad78f10fd3e803bbb57eb4bdb253d96a ChangeLog 4350 MD5 b5a23c657baf5595f062ed597e743e1c lablgl-1.00.ebuild 2160 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157 -MD5 b5f4f06ceeac8ce19b70d33f538b885a files/LablGL-0.97-Makefile-destdir.patch 1350 -MD5 7b95aa62137ce4a457a8603803892bcd files/LablGL-0.97-Makefile.config 1422 -MD5 007f6ebc610ac1d9f52d6396f5b430e1 files/LablGL-0.98-Makefile-destdir.patch 1540 -MD5 7b95aa62137ce4a457a8603803892bcd files/LablGL-0.98-Makefile.config 1422 MD5 e3979d1e494a41fb22b8dbd98f82978d files/digest-lablgl-1.00 63 MD5 fe2f6d4854f565091bda3022e0a62b31 files/lablgl-1.00-Makefile.config 371 diff --git a/dev-ml/lablgl/files/LablGL-0.97-Makefile-destdir.patch b/dev-ml/lablgl/files/LablGL-0.97-Makefile-destdir.patch deleted file mode 100644 index 46204fa57534..000000000000 --- a/dev-ml/lablgl/files/LablGL-0.97-Makefile-destdir.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig 2002-05-29 20:04:00.000000000 +0200 -+++ Makefile 2002-05-29 20:28:16.000000000 +0200 -@@ -103,22 +103,21 @@ - @$(MAKE) real-install LIBDIR=$(LIBDIR) - - 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 -- cp $(MLOBJS:.cmo=.cmi) $(INSTALLDIR) -- cp $(MLOBJS:.cmo=.mli) $(INSTALLDIR) -- cp liblablgl.a lablgl.cma libtogl.a togl.cma $(INSTALLDIR) -- cp lablgltop $(INSTALLDIR) -- cp lablgl $(BINDIR) -+ mkdir -p $(DESTDIR)$(INSTALLDIR) -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp $(MLOBJS:.cmo=.cmi) $(DESTDIR)$(INSTALLDIR) -+ cp $(MLOBJS:.cmo=.mli) $(DESTDIR)$(INSTALLDIR) -+ cp liblablgl.a lablgl.cma libtogl.a togl.cma $(DESTDIR)$(INSTALLDIR) -+ cp lablgltop $(DESTDIR)$(INSTALLDIR) -+ cp lablgl $(DESTDIR)$(BINDIR) - @if test -f dlllablgl.so; then $(MAKE) installdll; fi - @if test -f lablgl.cmxa; then $(MAKE) installopt LIBDIR=$(LIBDIR); fi - - installdll: -- cp dlllablgl.so dlltogl.so $(INSTALLDIR) -+ cp dlllablgl.so dlltogl.so $(DESTDIR)$(INSTALLDIR) - - installopt: -- cp lablgl.cmxa lablgl.a togl.cmxa togl.a $(MLOBJS:.cmo=.cmx) $(INSTALLDIR) -+ cp lablgl.cmxa lablgl.a togl.cmxa togl.a $(MLOBJS:.cmo=.cmx) $(DESTDIR)$(INSTALLDIR) - - clean: - rm -f *.cm* *.a *.o *.opt *_tags.c *_tags.h *~ \ diff --git a/dev-ml/lablgl/files/LablGL-0.97-Makefile.config b/dev-ml/lablgl/files/LablGL-0.97-Makefile.config deleted file mode 100644 index b1373bd6d774..000000000000 --- a/dev-ml/lablgl/files/LablGL-0.97-Makefile.config +++ /dev/null @@ -1,59 +0,0 @@ -# LablGL and Togl configuration file -# -# Please have a look at the config/Makefile in the Objective Caml distribution, -# or at the labltklink script to get the information needed here -# - -##### Adjust these always - -# Where to put the lablgl script -BINDIR = /usr/bin - -# Where to find X headers -XINCLUDES = -I/usr/X11R6/include -# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 - -# Where to find Tcl/Tk headers -# This must the same version as for LablTk -#TKINCLUDES = -I/usr/local/include -# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83 - -# Where to find OpenGL/Mesa headers and libraries -GLINCLUDES = -GLLIBS = -lGL -lGLU -# 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 -RANLIB = ranlib -#RANLIB = : - -##### Adjust these if non standard - -# The Objective Caml library directory -LIBDIR = `ocamlc -where` - -# Where is LablTk (standard) -LABLTKDIR = $(LIBDIR)/labltk - -# Where to put LablGL (standard) -INSTALLDIR = $(LIBDIR)/lablGL - -# Where is Togl (default) -TOGLDIR = Togl - -# C Compiler options -COPTS = -c -O - -###### No need to change these - -# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: -INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES) - -# Libraries to link with: -LIBS = $(TKLIBS) $(GLLIBS) $(XLIBS) - -# Leave this empty -LIBDIRS = diff --git a/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch b/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch deleted file mode 100644 index 546036afabf1..000000000000 --- a/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.orig Fri Aug 2 16:41:18 2002 -+++ Makefile Fri Aug 2 17:12:13 2002 -@@ -30,11 +30,11 @@ - INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES) - LIBS = $(TKLIBS) $(GLLIBS) $(XLIBS) - LIBDIRS = - - --OCAMLINC=-I +labltk -+OCAMLINC=-I +labltk -I +stublibs - - # Files - LIBOBJS = raw.cmo \ - gl.cmo glLight.cmo glList.cmo glMap.cmo \ - glMat.cmo glMisc.cmo glPix.cmo glClear.cmo \ -@@ -153,21 +153,26 @@ - - glu_tags.c: glu_tags.var - ./var2switch GLU_ < glu_tags.var > $@ - - install: -- @$(MAKE) real-install LIBDIR="$(LIBDIR)" -+ @$(MAKE) real-install LIBDIR="$(LIBDIR)" \ -+ INSTALLDIR="$(DESTDIR)$(INSTALLDIR)" \ -+ DLLDIR="$(DESTDIR)$(DLLDIR)" \ -+ BINDIR="$(DESTDIR)$(BINDIR)" - - real-install: - if test -d "$(INSTALLDIR)"; then : ; else mkdir -p "$(INSTALLDIR)"; fi -+ if test -d "$(DLLDIR)"; then : ; else mkdir -p "$(DLLDIR)"; fi -+ if test -d "$(BINDIR)"; then : ; else mkdir -p "$(BINDIR)"; fi - cp $(MLOBJS:.cmo=.cmi) "$(INSTALLDIR)" - cp $(MLOBJS:.cmo=.mli) "$(INSTALLDIR)" - cp liblablgl$(XA) lablgl.cma libtogl$(XA) togl.cma $(INSTTOP) "$(INSTALLDIR)" - cd "$(INSTALLDIR)" && $(RANLIB) liblablgl$(XA) libtogl$(XA) - cp lablgl$(XB) "$(BINDIR)" -- @if test -f dlllablgl$(XS); then $(MAKE) installdll; fi -- @if test -f lablgl.cmxa; then $(MAKE) installopt LIBDIR="$(LIBDIR)"; fi -+ @if test -f dlllablgl$(XS); then $(MAKE) DLLDIR="$(DLLDIR)" installdll; fi -+ @if test -f lablgl.cmxa; then $(MAKE) installopt INSTALLDIR="$(INSTALLDIR)" LIBDIR="$(LIBDIR)"; fi - - installdll: - cp dlllablgl$(XS) dlltogl$(XS) "$(DLLDIR)" - - installopt: diff --git a/dev-ml/lablgl/files/LablGL-0.98-Makefile.config b/dev-ml/lablgl/files/LablGL-0.98-Makefile.config deleted file mode 100644 index b1373bd6d774..000000000000 --- a/dev-ml/lablgl/files/LablGL-0.98-Makefile.config +++ /dev/null @@ -1,59 +0,0 @@ -# LablGL and Togl configuration file -# -# Please have a look at the config/Makefile in the Objective Caml distribution, -# or at the labltklink script to get the information needed here -# - -##### Adjust these always - -# Where to put the lablgl script -BINDIR = /usr/bin - -# Where to find X headers -XINCLUDES = -I/usr/X11R6/include -# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 - -# Where to find Tcl/Tk headers -# This must the same version as for LablTk -#TKINCLUDES = -I/usr/local/include -# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83 - -# Where to find OpenGL/Mesa headers and libraries -GLINCLUDES = -GLLIBS = -lGL -lGLU -# 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 -RANLIB = ranlib -#RANLIB = : - -##### Adjust these if non standard - -# The Objective Caml library directory -LIBDIR = `ocamlc -where` - -# Where is LablTk (standard) -LABLTKDIR = $(LIBDIR)/labltk - -# Where to put LablGL (standard) -INSTALLDIR = $(LIBDIR)/lablGL - -# Where is Togl (default) -TOGLDIR = Togl - -# C Compiler options -COPTS = -c -O - -###### No need to change these - -# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: -INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES) - -# Libraries to link with: -LIBS = $(TKLIBS) $(GLLIBS) $(XLIBS) - -# Leave this empty -LIBDIRS = |