7 files changed, 2 insertions, 370 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 914aa102b8ea..a06d27b2fc34 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -64,7 +64,6 @@
     SUBDIR += iv
     SUBDIR += iwidgets
     SUBDIR += jx
-    SUBDIR += lablgtk
     SUBDIR += lesstif
     SUBDIR += libbonoboui
     SUBDIR += libgail-gnome
@@ -84,6 +83,7 @@
     SUBDIR += mowitz
     SUBDIR += neXtaw
     SUBDIR += notif2
+    SUBDIR += ocaml-lablgtk
     SUBDIR += open-motif
     SUBDIR += p5-GdkImlib
     SUBDIR += p5-GdkPixbuf
diff --git a/x11-toolkits/lablgtk/Makefile b/x11-toolkits/lablgtk/Makefile
deleted file mode 100644
index 0b2072f5a78b..000000000000
--- a/x11-toolkits/lablgtk/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# New ports collection makefile for:    lablgtk
-# Date created:         30. June 2002
-# Whom:                 Ronald Kuehn <rk@ronald.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	lablgtk
-PORTVERSION=	1.2.5
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
-		ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
-PKGNAMESUFFIX=	${SFXGL}${SFXGNOME}${SFXGLADE}
-
-MAINTAINER=	rk@ronald.org
-
-BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml
-RUN_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml
-.if defined(WITHOUT_GL)
-PLIST_SUB+=	GL="@comment "
-SFXGL=		-nogl
-.else
-PLIST_SUB+=	GL=""
-BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/lablgl
-RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/lablgl
-LIB_DEPENDS+=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-CONFIGURE_ENV+=	USE_GL=1
-.endif
-.if defined(WITHOUT_GNOME)
-PLIST_SUB+=	GNOME="@comment "
-SFXGNOME=	-nognome
-.else
-PLIST_SUB+=	GNOME=""
-USE_GNOMENG=	yes
-USE_GNOME=	gdkpixbuf
-CONFIGURE_ENV+=	USE_GNOME=1
-.endif
-.if defined(WITHOUT_GLADE)
-PLIST_SUB+=	GLADE="@comment "
-SFXGLADE=	-noglade
-.else
-PLIST_SUB+=	GLADE=""
-.if defined(WITHOUT_GNOME)
-LIB_DEPENDS+=	glade.4:${PORTSDIR}/devel/libglade
-BUILD_DEPENDS+=	libglade-config:${PORTSDIR}/devel/libglade
-.else
-USE_GNOME+=	libglade
-.endif
-CONFIGURE_ENV+=	USE_GLADE=1
-.endif
-
-USE_GMAKE=	yes
-USE_GTK=	yes
-ALL_TARGET=	all opt
-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-CONFIGURE_ENV+=	USE_CC=1 USE_DOTOPT=1 GTK_CONFIG=${GTK_CONFIG}
-CONFIGURE_ENV+=	LIBDIR=${PREFIX}/lib/ocaml BINDIR=${PREFIX}/bin
-CONFIGURE_ENV+=	INSTALLDIR=${PREFIX}/lib/ocaml/lablgtk
-
-do-configure:
-	@(cd ${WRKSRC} && ${GMAKE} configure ${CONFIGURE_ENV})
-
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/*.rgb \
-		${WRKSRC}/examples/*.ml ${WRKSRC}/examples/*.xpm ${EXAMPLESDIR}
-.if !defined(WITHOUT_GL)
-	@${MKDIR} ${EXAMPLESDIR}/GL
-	@${INSTALL_DATA} ${WRKSRC}/examples/GL/* ${EXAMPLESDIR}/GL
-.endif
-.if !defined(WITHOUT_GNOME)
-	@${MKDIR} ${EXAMPLESDIR}/xmhtml
-	@${INSTALL_DATA} ${WRKSRC}/examples/xmhtml/* ${EXAMPLESDIR}/xmhtml
-.endif
-.if !defined(WITHOUT_GLADE)
-	@${MKDIR} ${EXAMPLESDIR}/glade
-	@${INSTALL_DATA} ${WRKSRC}/examples/glade/* ${EXAMPLESDIR}/glade
-.endif
-.if !defined(NO_PORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/lablgtk/distinfo b/x11-toolkits/lablgtk/distinfo
deleted file mode 100644
index cc60ea830505..000000000000
--- a/x11-toolkits/lablgtk/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (lablgtk-1.2.5.tar.gz) = 92628c756d2d3e2706b59d0382f23c19
diff --git a/x11-toolkits/lablgtk/pkg-comment b/x11-toolkits/lablgtk/pkg-comment
deleted file mode 100644
index c5305aeb32a5..000000000000
--- a/x11-toolkits/lablgtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Objective Caml interface to gtk+
diff --git a/x11-toolkits/lablgtk/pkg-descr b/x11-toolkits/lablgtk/pkg-descr
deleted file mode 100644
index a40379344541..000000000000
--- a/x11-toolkits/lablgtk/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-LablGTK uses the rich type system of Objective Caml 3 to provide a
-strongly typed, yet very comfortable, object-oriented interface to
-gtk+. This is not that easy if you know the dynamic typing approach
-taken by gtk+.
-
-It is still under development, but already fully functional. All
-widgets (but one) are available, with almost all their methods. The
-GLArea widget is also supported in combination with LablGL. Lots of
-examples are provided.
-
-Objective Caml threads are supported, including for the toplevel,
-which allows for interactive use of the library.
-
-Please see ${PREFIX}/share/doc/ocaml/lablgtk/README for further
-information.
-
-WWW: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
diff --git a/x11-toolkits/lablgtk/pkg-plist b/x11-toolkits/lablgtk/pkg-plist
deleted file mode 100644
index d537f293cb9e..000000000000
--- a/x11-toolkits/lablgtk/pkg-plist
+++ /dev/null
@@ -1,265 +0,0 @@
-bin/lablgtk
-%%GLADE%%bin/lablgladecc
-%%GLADE%%lib/ocaml/stublibs/dlllablglade.so
-%%GNOME%%lib/ocaml/stublibs/dlllablgnome.so
-lib/ocaml/stublibs/dlllablgtk.so
-%%GL%%lib/ocaml/stublibs/dlllablgtkgl.so
-lib/ocaml/lablgtk/gBin.cmi
-lib/ocaml/lablgtk/gBin.cmx
-lib/ocaml/lablgtk/gBin.ml
-lib/ocaml/lablgtk/gBin.mli
-lib/ocaml/lablgtk/gButton.cmi
-lib/ocaml/lablgtk/gButton.cmx
-lib/ocaml/lablgtk/gButton.ml
-lib/ocaml/lablgtk/gButton.mli
-lib/ocaml/lablgtk/gContainer.cmi
-lib/ocaml/lablgtk/gContainer.cmx
-lib/ocaml/lablgtk/gContainer.ml
-lib/ocaml/lablgtk/gContainer.mli
-lib/ocaml/lablgtk/gData.cmi
-lib/ocaml/lablgtk/gData.cmx
-lib/ocaml/lablgtk/gData.ml
-lib/ocaml/lablgtk/gData.mli
-lib/ocaml/lablgtk/gDraw.cmi
-lib/ocaml/lablgtk/gDraw.cmx
-lib/ocaml/lablgtk/gDraw.ml
-lib/ocaml/lablgtk/gDraw.mli
-lib/ocaml/lablgtk/gEdit.cmi
-lib/ocaml/lablgtk/gEdit.cmx
-lib/ocaml/lablgtk/gEdit.ml
-lib/ocaml/lablgtk/gEdit.mli
-%%GNOME%%lib/ocaml/lablgtk/gHtml.cmi
-%%GNOME%%lib/ocaml/lablgtk/gHtml.cmx
-%%GNOME%%lib/ocaml/lablgtk/gHtml.ml
-lib/ocaml/lablgtk/gList.cmi
-lib/ocaml/lablgtk/gList.cmx
-lib/ocaml/lablgtk/gList.ml
-lib/ocaml/lablgtk/gList.mli
-lib/ocaml/lablgtk/gMain.cmi
-lib/ocaml/lablgtk/gMain.cmx
-lib/ocaml/lablgtk/gMain.ml
-lib/ocaml/lablgtk/gMain.mli
-lib/ocaml/lablgtk/gMenu.cmi
-lib/ocaml/lablgtk/gMenu.cmx
-lib/ocaml/lablgtk/gMenu.ml
-lib/ocaml/lablgtk/gMenu.mli
-lib/ocaml/lablgtk/gMisc.cmi
-lib/ocaml/lablgtk/gMisc.cmx
-lib/ocaml/lablgtk/gMisc.ml
-lib/ocaml/lablgtk/gMisc.mli
-lib/ocaml/lablgtk/gObj.cmi
-lib/ocaml/lablgtk/gObj.cmx
-lib/ocaml/lablgtk/gObj.ml
-lib/ocaml/lablgtk/gObj.mli
-lib/ocaml/lablgtk/gPack.cmi
-lib/ocaml/lablgtk/gPack.cmx
-lib/ocaml/lablgtk/gPack.ml
-lib/ocaml/lablgtk/gPack.mli
-lib/ocaml/lablgtk/gRange.cmi
-lib/ocaml/lablgtk/gRange.cmx
-lib/ocaml/lablgtk/gRange.ml
-lib/ocaml/lablgtk/gRange.mli
-lib/ocaml/lablgtk/gToolbox.cmi
-lib/ocaml/lablgtk/gToolbox.cmx
-lib/ocaml/lablgtk/gToolbox.ml
-lib/ocaml/lablgtk/gToolbox.mli
-lib/ocaml/lablgtk/gTree.cmi
-lib/ocaml/lablgtk/gTree.cmx
-lib/ocaml/lablgtk/gTree.ml
-lib/ocaml/lablgtk/gTree.mli
-lib/ocaml/lablgtk/gUtil.cmi
-lib/ocaml/lablgtk/gUtil.cmx
-lib/ocaml/lablgtk/gUtil.ml
-lib/ocaml/lablgtk/gUtil.mli
-lib/ocaml/lablgtk/gWindow.cmi
-lib/ocaml/lablgtk/gWindow.cmx
-lib/ocaml/lablgtk/gWindow.ml
-lib/ocaml/lablgtk/gWindow.mli
-lib/ocaml/lablgtk/gaux.cmi
-lib/ocaml/lablgtk/gaux.cmx
-lib/ocaml/lablgtk/gaux.ml
-lib/ocaml/lablgtk/gdk.cmi
-lib/ocaml/lablgtk/gdk.cmx
-lib/ocaml/lablgtk/gdk.ml
-lib/ocaml/lablgtk/gdk.mli
-lib/ocaml/lablgtk/gdkEvent.cmi
-lib/ocaml/lablgtk/gdkEvent.cmx
-lib/ocaml/lablgtk/gdkEvent.ml
-lib/ocaml/lablgtk/gdkKeysyms.cmi
-lib/ocaml/lablgtk/gdkKeysyms.cmx
-lib/ocaml/lablgtk/gdkKeysyms.ml
-%%GNOME%%lib/ocaml/lablgtk/gdkPixbuf.cmi
-%%GNOME%%lib/ocaml/lablgtk/gdkPixbuf.cmx
-%%GNOME%%lib/ocaml/lablgtk/gdkPixbuf.ml
-lib/ocaml/lablgtk/gdkPixbuf.mli
-lib/ocaml/lablgtk/gdk_tags.h
-%%GNOME%%lib/ocaml/lablgtk/gdkpixbuf_tags.h
-lib/ocaml/lablgtk/gdkprivate-win32.h
-%%GL%%lib/ocaml/lablgtk/glGtk.cmi
-%%GL%%lib/ocaml/lablgtk/glGtk.cmx
-%%GL%%lib/ocaml/lablgtk/glGtk.ml
-lib/ocaml/lablgtk/glGtk.mli
-%%GLADE%%lib/ocaml/lablgtk/glade.cmi
-%%GLADE%%lib/ocaml/lablgtk/glade.cmx
-%%GLADE%%lib/ocaml/lablgtk/glade.ml
-lib/ocaml/lablgtk/glade.mli
-lib/ocaml/lablgtk/glib.cmi
-lib/ocaml/lablgtk/glib.cmx
-lib/ocaml/lablgtk/glib.ml
-lib/ocaml/lablgtk/glib_tags.h
-lib/ocaml/lablgtk/gpointer.cmi
-lib/ocaml/lablgtk/gpointer.cmx
-lib/ocaml/lablgtk/gpointer.ml
-lib/ocaml/lablgtk/gpointer.mli
-lib/ocaml/lablgtk/gtk.cmi
-lib/ocaml/lablgtk/gtk.cmx
-lib/ocaml/lablgtk/gtk.ml
-lib/ocaml/lablgtk/gtkArgv.cmi
-lib/ocaml/lablgtk/gtkArgv.cmx
-lib/ocaml/lablgtk/gtkArgv.ml
-lib/ocaml/lablgtk/gtkBase.cmi
-lib/ocaml/lablgtk/gtkBase.cmx
-lib/ocaml/lablgtk/gtkBase.ml
-lib/ocaml/lablgtk/gtkBin.cmi
-lib/ocaml/lablgtk/gtkBin.cmx
-lib/ocaml/lablgtk/gtkBin.ml
-lib/ocaml/lablgtk/gtkButton.cmi
-lib/ocaml/lablgtk/gtkButton.cmx
-lib/ocaml/lablgtk/gtkButton.ml
-lib/ocaml/lablgtk/gtkData.cmi
-lib/ocaml/lablgtk/gtkData.cmx
-lib/ocaml/lablgtk/gtkData.ml
-lib/ocaml/lablgtk/gtkEdit.cmi
-lib/ocaml/lablgtk/gtkEdit.cmx
-lib/ocaml/lablgtk/gtkEdit.ml
-lib/ocaml/lablgtk/gtkInit.cmi
-lib/ocaml/lablgtk/gtkInit.cmo
-lib/ocaml/lablgtk/gtkInit.cmx
-lib/ocaml/lablgtk/gtkInit.ml
-lib/ocaml/lablgtk/gtkInit.o
-lib/ocaml/lablgtk/gtkList.cmi
-lib/ocaml/lablgtk/gtkList.cmx
-lib/ocaml/lablgtk/gtkList.ml
-lib/ocaml/lablgtk/gtkMain.cmi
-lib/ocaml/lablgtk/gtkMain.cmx
-lib/ocaml/lablgtk/gtkMain.ml
-lib/ocaml/lablgtk/gtkMenu.cmi
-lib/ocaml/lablgtk/gtkMenu.cmx
-lib/ocaml/lablgtk/gtkMenu.ml
-lib/ocaml/lablgtk/gtkMisc.cmi
-lib/ocaml/lablgtk/gtkMisc.cmx
-lib/ocaml/lablgtk/gtkMisc.ml
-lib/ocaml/lablgtk/gtkNew.cmi
-lib/ocaml/lablgtk/gtkNew.cmx
-lib/ocaml/lablgtk/gtkNew.ml
-lib/ocaml/lablgtk/gtkPack.cmi
-lib/ocaml/lablgtk/gtkPack.cmx
-lib/ocaml/lablgtk/gtkPack.ml
-lib/ocaml/lablgtk/gtkRange.cmi
-lib/ocaml/lablgtk/gtkRange.cmx
-lib/ocaml/lablgtk/gtkRange.ml
-lib/ocaml/lablgtk/gtkSignal.cmi
-lib/ocaml/lablgtk/gtkSignal.cmx
-lib/ocaml/lablgtk/gtkSignal.ml
-lib/ocaml/lablgtk/gtkSignal.mli
-lib/ocaml/lablgtk/gtkThInit.cmo
-lib/ocaml/lablgtk/gtkThInit.ml
-lib/ocaml/lablgtk/gtkThread.cmi
-lib/ocaml/lablgtk/gtkThread.cmo
-lib/ocaml/lablgtk/gtkThread.cmx
-lib/ocaml/lablgtk/gtkThread.ml
-lib/ocaml/lablgtk/gtkThread.mli
-lib/ocaml/lablgtk/gtkThread.o
-lib/ocaml/lablgtk/gtkTree.cmi
-lib/ocaml/lablgtk/gtkTree.cmx
-lib/ocaml/lablgtk/gtkTree.ml
-lib/ocaml/lablgtk/gtkWindow.cmi
-lib/ocaml/lablgtk/gtkWindow.cmx
-lib/ocaml/lablgtk/gtkWindow.ml
-%%GNOME%%lib/ocaml/lablgtk/gtkXmHTML.cmi
-%%GNOME%%lib/ocaml/lablgtk/gtkXmHTML.cmx
-%%GNOME%%lib/ocaml/lablgtk/gtkXmHTML.ml
-lib/ocaml/lablgtk/gtk_tags.h
-%%GL%%lib/ocaml/lablgtk/gtkgl_tags.h
-%%GNOME%%lib/ocaml/lablgtk/gtkxmhtml_tags.h
-%%GLADE%%lib/ocaml/lablgtk/lablglade.a
-%%GLADE%%lib/ocaml/lablgtk/lablglade.cma
-%%GLADE%%lib/ocaml/lablgtk/lablglade.cmxa
-%%GNOME%%lib/ocaml/lablgtk/lablgnome.a
-%%GNOME%%lib/ocaml/lablgtk/lablgnome.cma
-%%GNOME%%lib/ocaml/lablgtk/lablgnome.cmxa
-lib/ocaml/lablgtk/lablgtk.a
-lib/ocaml/lablgtk/lablgtk.cma
-lib/ocaml/lablgtk/lablgtk.cmxa
-%%GL%%lib/ocaml/lablgtk/lablgtkgl.a
-%%GL%%lib/ocaml/lablgtk/lablgtkgl.cma
-%%GL%%lib/ocaml/lablgtk/lablgtkgl.cmxa
-lib/ocaml/lablgtk/lablgtktop
-lib/ocaml/lablgtk/lablgtktop_t
-%%GLADE%%lib/ocaml/lablgtk/liblablglade.a
-%%GNOME%%lib/ocaml/lablgtk/liblablgnome.a
-lib/ocaml/lablgtk/liblablgtk.a
-%%GL%%lib/ocaml/lablgtk/liblablgtkgl.a
-lib/ocaml/lablgtk/ml_gdk.h
-lib/ocaml/lablgtk/ml_glib.h
-lib/ocaml/lablgtk/ml_gpointer.h
-lib/ocaml/lablgtk/ml_gtk.h
-lib/ocaml/lablgtk/varcc
-lib/ocaml/lablgtk/wrappers.h
-lib/ocaml/lablgtk/xml_lexer.mli
-%%GL%%share/examples/ocaml/lablgtk/GL/gears.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/morph3d.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/planet.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/scene.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/simple.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/tutorial-2.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/tutorial-3.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/tutorial-4.ml
-%%GL%%share/examples/ocaml/lablgtk/GL/tutorial-5.ml
-%%GLADE%%share/examples/ocaml/lablgtk/glade/glade_demo.ml
-%%GLADE%%share/examples/ocaml/lablgtk/glade/gladecalc.ml
-%%GLADE%%share/examples/ocaml/lablgtk/glade/project1.glade
-%%GLADE%%share/examples/ocaml/lablgtk/glade/project2.glade
-%%GNOME%%share/examples/ocaml/lablgtk/xmhtml/test.ml
-share/examples/ocaml/lablgtk/image256x256.rgb
-share/examples/ocaml/lablgtk/buttons.ml
-share/examples/ocaml/lablgtk/calc.ml
-share/examples/ocaml/lablgtk/calendar.ml
-share/examples/ocaml/lablgtk/clist.ml
-share/examples/ocaml/lablgtk/combo.ml
-share/examples/ocaml/lablgtk/counter.ml
-share/examples/ocaml/lablgtk/csview.ml
-share/examples/ocaml/lablgtk/dcalendar.ml
-share/examples/ocaml/lablgtk/drawing.ml
-share/examples/ocaml/lablgtk/editor.ml
-share/examples/ocaml/lablgtk/entry.ml
-share/examples/ocaml/lablgtk/events.ml
-share/examples/ocaml/lablgtk/fifteen.ml
-share/examples/ocaml/lablgtk/fixed_editor.ml
-share/examples/ocaml/lablgtk/fixpoint.ml
-share/examples/ocaml/lablgtk/giotest.ml
-share/examples/ocaml/lablgtk/hello.ml
-share/examples/ocaml/lablgtk/image.ml
-share/examples/ocaml/lablgtk/kaimono.ml
-share/examples/ocaml/lablgtk/label.ml
-share/examples/ocaml/lablgtk/lissajous.ml
-share/examples/ocaml/lablgtk/nihongo.ml
-share/examples/ocaml/lablgtk/pousse.ml
-share/examples/ocaml/lablgtk/progressbar.ml
-share/examples/ocaml/lablgtk/radiobuttons.ml
-share/examples/ocaml/lablgtk/rpn.ml
-share/examples/ocaml/lablgtk/scrolledwin.ml
-share/examples/ocaml/lablgtk/socket.ml
-share/examples/ocaml/lablgtk/testdnd.ml
-share/examples/ocaml/lablgtk/testgtk.ml
-share/examples/ocaml/lablgtk/testinput.ml
-share/examples/ocaml/lablgtk/tictactoe.ml
-share/examples/ocaml/lablgtk/tron.ml
-share/examples/ocaml/lablgtk/test.xpm
-%%PORTDOCS%%share/doc/ocaml/lablgtk/README
-@dirrm lib/ocaml/lablgtk
-%%GL%%@dirrm share/examples/ocaml/lablgtk/GL
-%%GNOME%%@dirrm share/examples/ocaml/lablgtk/xmhtml
-%%GLADE%%@dirrm share/examples/ocaml/lablgtk/glade
-@dirrm share/examples/ocaml/lablgtk
-%%PORTDOCS%%@dirrm share/doc/ocaml/lablgtk
diff --git a/x11-toolkits/ocaml-lablgtk/Makefile b/x11-toolkits/ocaml-lablgtk/Makefile
index 0b2072f5a78b..f6ab2722cf4e 100644
--- a/x11-toolkits/ocaml-lablgtk/Makefile
+++ b/x11-toolkits/ocaml-lablgtk/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.2.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
 		ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
+PKGNAMEPREFIX=	ocaml-
 PKGNAMESUFFIX=	${SFXGL}${SFXGNOME}${SFXGLADE}
 
 MAINTAINER=	rk@ronald.org