lablgl -> ocaml-lablgl

lablgtk -> ocaml-lablgtk

Approved by:    portmgr,maintainer

8 files changed, 2 insertions, 176 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 8f64ed1355f7..f2c02bcfce35 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -165,7 +165,6 @@
     SUBDIR += kisomandel
     SUBDIR += kludge3d
     SUBDIR += kuickshow
-    SUBDIR += lablgl
     SUBDIR += landscape
     SUBDIR += lcms
     SUBDIR += leafpak
@@ -243,6 +242,7 @@
     SUBDIR += netpbm
     SUBDIR += netshow
     SUBDIR += nurbs++
+    SUBDIR += ocaml-lablgl
     SUBDIR += ogle
     SUBDIR += ogle-gui
     SUBDIR += okle
diff --git a/graphics/lablgl/Makefile b/graphics/lablgl/Makefile
deleted file mode 100644
index 6736b20c58bb..000000000000
--- a/graphics/lablgl/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:    lablgl
-# Date created:         13. January 2002
-# Whom:                 Ronald Kuehn <rk@ronald.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	lablgl
-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/
-
-MAINTAINER=	rk@ronald.org
-
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-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}
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-
-post-extract:
-	@${CP} ${WRKSRC}/Makefile.config.ex ${WRKSRC}/Makefile.config
-
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.if !defined(NO_PORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/graphics/lablgl/distinfo b/graphics/lablgl/distinfo
deleted file mode 100644
index 8bf48d10093a..000000000000
--- a/graphics/lablgl/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (lablgl-0.98.tar.gz) = c39cb9d48539397960db85229a529357
diff --git a/graphics/lablgl/files/patch-ab b/graphics/lablgl/files/patch-ab
deleted file mode 100644
index 2c9893a6d007..000000000000
--- a/graphics/lablgl/files/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
--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
- 
- # Where to find Tcl/Tk headers
- # This must the same version as for LablTk
--TKINCLUDES = -I/usr/local/include
-+TKINCLUDES = -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3
- # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
--#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83
-+TKLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83
- 
- # Where to find OpenGL/Mesa headers and libraries
- GLINCLUDES =
--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
- 
- # 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 ${CFLAGS}
diff --git a/graphics/lablgl/pkg-comment b/graphics/lablgl/pkg-comment
deleted file mode 100644
index a3a9bf5f4571..000000000000
--- a/graphics/lablgl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenGL interface for Objective Caml
diff --git a/graphics/lablgl/pkg-descr b/graphics/lablgl/pkg-descr
deleted file mode 100644
index da4859e29b04..000000000000
--- a/graphics/lablgl/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-LablGL is an OpenGL interface for Objective Caml. Since it includes
-support for the Togl widget, you can comfortably use it with LablTk.
-
-All of the GL and GLU libraries are available. Read a good book
-about how to use these. Translating from OpenGL to LablGL is rather
-straitforward: there is a LablGL function for each OpenGL one.  For
-ease of retrieving, both GL and GLU are cut in smaller modules of
-related functions.
-
-Please see ${PREFIX}/share/doc/ocaml/lablgl/README for further information.
diff --git a/graphics/lablgl/pkg-plist b/graphics/lablgl/pkg-plist
deleted file mode 100644
index 37af27a1573c..000000000000
--- a/graphics/lablgl/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-@comment $FreeBSD$
-bin/lablgl
-lib/ocaml/lablGL/raw.cmi
-lib/ocaml/lablGL/gluMat.cmi
-lib/ocaml/lablGL/gluTess.cmi
-lib/ocaml/lablGL/gluQuadric.cmi
-lib/ocaml/lablGL/gluNurbs.cmi
-lib/ocaml/lablGL/gluMisc.cmi
-lib/ocaml/lablGL/glFunc.cmi
-lib/ocaml/lablGL/glDraw.cmi
-lib/ocaml/lablGL/glTex.cmi
-lib/ocaml/lablGL/glClear.cmi
-lib/ocaml/lablGL/glPix.cmi
-lib/ocaml/lablGL/glMisc.cmi
-lib/ocaml/lablGL/glMat.cmi
-lib/ocaml/lablGL/glMap.cmi
-lib/ocaml/lablGL/glList.cmi
-lib/ocaml/lablGL/glLight.cmi
-lib/ocaml/lablGL/gl.cmi
-lib/ocaml/lablGL/togl.cmi
-lib/ocaml/lablGL/raw.mli
-lib/ocaml/lablGL/gluMat.mli
-lib/ocaml/lablGL/gluTess.mli
-lib/ocaml/lablGL/gluQuadric.mli
-lib/ocaml/lablGL/gluNurbs.mli
-lib/ocaml/lablGL/gluMisc.mli
-lib/ocaml/lablGL/glFunc.mli
-lib/ocaml/lablGL/glDraw.mli
-lib/ocaml/lablGL/glTex.mli
-lib/ocaml/lablGL/glClear.mli
-lib/ocaml/lablGL/glPix.mli
-lib/ocaml/lablGL/glMisc.mli
-lib/ocaml/lablGL/glMat.mli
-lib/ocaml/lablGL/glMap.mli
-lib/ocaml/lablGL/glList.mli
-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/lablgl.cmxa
-lib/ocaml/lablGL/gluMat.cmx
-lib/ocaml/lablGL/gluTess.cmx
-lib/ocaml/lablGL/gluQuadric.cmx
-lib/ocaml/lablGL/gluNurbs.cmx
-lib/ocaml/lablGL/gluMisc.cmx
-lib/ocaml/lablGL/glFunc.cmx
-lib/ocaml/lablGL/glDraw.cmx
-lib/ocaml/lablGL/glTex.cmx
-lib/ocaml/lablGL/glClear.cmx
-lib/ocaml/lablGL/glPix.cmx
-lib/ocaml/lablGL/glMisc.cmx
-lib/ocaml/lablGL/glMat.cmx
-lib/ocaml/lablGL/glMap.cmx
-lib/ocaml/lablGL/glList.cmx
-lib/ocaml/lablGL/glLight.cmx
-lib/ocaml/lablGL/gl.cmx
-lib/ocaml/lablGL/raw.cmx
-lib/ocaml/lablGL/togl.a
-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
-share/examples/ocaml/lablgl/checker.ml
-share/examples/ocaml/lablgl/double.ml
-share/examples/ocaml/lablgl/gears.ml
-share/examples/ocaml/lablgl/morph3d.ml
-share/examples/ocaml/lablgl/planet.ml
-share/examples/ocaml/lablgl/scene.ml
-share/examples/ocaml/lablgl/simple.ml
-share/examples/ocaml/lablgl/tennis.ml
-share/examples/ocaml/lablgl/texturesurf.ml
-@dirrm lib/ocaml/lablGL
-@dirrm share/examples/ocaml/lablgl
-%%PORTDOCS%%@dirrm share/doc/ocaml/lablgl
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index 6736b20c58bb..65cf00177c6e 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -10,6 +10,7 @@ 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/
+PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	rk@ronald.org