version bump, fixes building with ocaml-3.06

5 files changed, 156 insertions, 1 deletions

diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index b3904ef558f8..d1791037367b 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/lablgl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.1 2002/06/29 04:39:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.2 2002/09/03 17:46:02 george Exp $
+
+*lablgl-0.98.ebuild (03 Sep 2002)
+
+  03 Sep 2002; G Shapovalov <george@gentoo.org> lablgl-0.98.ebuild, files/{LablGL-0.98-Makefile-destdir.patch,LablGL-0.98-Makefile.config,digest-lablgl-0.98} :
+
+  updated to 0.98. This fixes some build failures with ocaml-3.06.
 
 *lablgl-0.97.ebuild (28 Jun 2002)
 
diff --git a/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch b/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch
new file mode 100644
index 000000000000..546036afabf1
--- /dev/null
+++ b/dev-ml/lablgl/files/LablGL-0.98-Makefile-destdir.patch
@@ -0,0 +1,45 @@
+--- 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
new file mode 100644
index 000000000000..b1373bd6d774
--- /dev/null
+++ b/dev-ml/lablgl/files/LablGL-0.98-Makefile.config
@@ -0,0 +1,59 @@
+#	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/digest-lablgl-0.98 b/dev-ml/lablgl/files/digest-lablgl-0.98
new file mode 100644
index 000000000000..6d6cabe76b1a
--- /dev/null
+++ b/dev-ml/lablgl/files/digest-lablgl-0.98
@@ -0,0 +1 @@
+MD5 c39cb9d48539397960db85229a529357 lablgl-0.98.tar.gz 245484
diff --git a/dev-ml/lablgl/lablgl-0.98.ebuild b/dev-ml/lablgl/lablgl-0.98.ebuild
new file mode 100644
index 000000000000..a10b0a120aa8
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-0.98.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-0.98.ebuild,v 1.1 2002/09/03 17:46:02 george Exp $
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+LICENSE="as-is"
+
+DEPEND=">=dev-lang/ocaml-3.05
+	opengl? ( virtual/opengl )"
+RDEPEND="${DEPEND}"
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+S=${WORKDIR}/lablGL-${PV}
+SLOT="0"
+KEYWORDS="x86"
+
+#need to do some mangling to keep ebuild name lowercase
+#(anyway package uses mixture of upper and lower case letters)
+Name="LablGL"
+
+src_unpack() {
+
+	unpack ${A}
+	
+	# patch the makefile to include DESTDIR support
+	cd ${S} || die
+	patch -p0 < ${FILESDIR}/${Name}-${PV}-Makefile-destdir.patch || die
+}
+
+src_compile() {
+
+	# make configuration file
+	cp ${FILESDIR}/${Name}-${PV}-Makefile.config ${S}/Makefile.config || die
+	
+	# build
+	make all opt || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc README CHANGES COPYRIGHT
+}