Add correct incantations to grab tcl/tk and build labltk.

TODO: whack configure script until we can flavor it no_X11.

lang/ocaml/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/05/20 06:22:06 angelos Exp $
+# $OpenBSD: Makefile,v 1.11 2000/05/22 15:41:35 espie Exp $
 
 DISTNAME=	ocaml-3.00
 CATEGORIES=	lang
@@ -16,6 +16,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 FAKE=		Yes
 HAS_CONFIGURE=	Yes
+CONFIGURE_ARGS=--tkdefs '-I${PREFIX}/include/tk8.3 -I${PREFIX}/include/tcl8.3'
+LIB_DEPENDS=	tcl83.1.3::lang/tcl/8.3 \
+		tk83.1.3::x11/tk/8.3
 
 # ocaml's configure script is too smart for its own good
 

lang/ocaml/pkg/PLIST

@@ -1,4 +1,8 @@
+@comment $OpenBSD: PLIST,v 1.7 2000/05/22 15:41:35 espie Exp $
+bin/labltk
 bin/ocaml
+bin/ocaml299to3
+bin/ocamlbrowser
 bin/ocamlc
 bin/ocamlcp
 bin/ocamldebug
@@ -24,6 +28,12 @@ lib/ocaml/array.mli
 lib/ocaml/big_int.cmi
 lib/ocaml/big_int.cmx
 lib/ocaml/big_int.mli
+lib/ocaml/bigarray.a
+lib/ocaml/bigarray.cma
+lib/ocaml/bigarray.cmi
+lib/ocaml/bigarray.cmx
+lib/ocaml/bigarray.cmxa
+lib/ocaml/bigarray.mli
 lib/ocaml/buffer.cmi
 lib/ocaml/buffer.cmx
 lib/ocaml/buffer.ml
@@ -33,8 +43,10 @@ lib/ocaml/callback.cmx
 lib/ocaml/callback.ml
 lib/ocaml/callback.mli
 lib/ocaml/caml/alloc.h
+lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
 lib/ocaml/caml/config.h
+lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
 lib/ocaml/caml/memory.h
 lib/ocaml/caml/misc.h
@@ -58,6 +70,7 @@ lib/ocaml/digest.ml
 lib/ocaml/digest.mli
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
+lib/ocaml/dynlink.mli
 lib/ocaml/event.mli
 lib/ocaml/expunge
 lib/ocaml/extract_crc
@@ -86,7 +99,71 @@ lib/ocaml/hashtbl.cmi
 lib/ocaml/hashtbl.cmx
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
+lib/ocaml/int32.cmi
+lib/ocaml/int32.cmx
+lib/ocaml/int32.ml
+lib/ocaml/int32.mli
+lib/ocaml/int64.cmi
+lib/ocaml/int64.cmx
+lib/ocaml/int64.ml
+lib/ocaml/int64.mli
 lib/ocaml/int_misc.cmx
+lib/ocaml/labltk/balloon.cmi
+lib/ocaml/labltk/balloon.mli
+lib/ocaml/labltk/bell.cmi
+lib/ocaml/labltk/button.cmi
+lib/ocaml/labltk/canvas.cmi
+lib/ocaml/labltk/checkbutton.cmi
+lib/ocaml/labltk/clipboard.cmi
+lib/ocaml/labltk/dialog.cmi
+lib/ocaml/labltk/entry.cmi
+lib/ocaml/labltk/fileevent.cmi
+lib/ocaml/labltk/fileevent.mli
+lib/ocaml/labltk/fileselect.cmi
+lib/ocaml/labltk/fileselect.mli
+lib/ocaml/labltk/focus.cmi
+lib/ocaml/labltk/frame.cmi
+lib/ocaml/labltk/grab.cmi
+lib/ocaml/labltk/grid.cmi
+lib/ocaml/labltk/imagebitmap.cmi
+lib/ocaml/labltk/imagephoto.cmi
+lib/ocaml/labltk/label.cmi
+lib/ocaml/labltk/labltk.a
+lib/ocaml/labltk/labltk.cma
+lib/ocaml/labltk/labltk.cmxa
+lib/ocaml/labltk/labltktop
+lib/ocaml/labltk/libjpf.a
+lib/ocaml/labltk/libjpf.cma
+lib/ocaml/labltk/libjpf.cmxa
+lib/ocaml/labltk/liblabltk41.a
+lib/ocaml/labltk/listbox.cmi
+lib/ocaml/labltk/menu.cmi
+lib/ocaml/labltk/menubutton.cmi
+lib/ocaml/labltk/message.cmi
+lib/ocaml/labltk/option.cmi
+lib/ocaml/labltk/optionmenu.cmi
+lib/ocaml/labltk/pack.cmi
+lib/ocaml/labltk/palette.cmi
+lib/ocaml/labltk/place.cmi
+lib/ocaml/labltk/protocol.cmi
+lib/ocaml/labltk/protocol.mli
+lib/ocaml/labltk/radiobutton.cmi
+lib/ocaml/labltk/scale.cmi
+lib/ocaml/labltk/scrollbar.cmi
+lib/ocaml/labltk/selection.cmi
+lib/ocaml/labltk/text.cmi
+lib/ocaml/labltk/textvariable.cmi
+lib/ocaml/labltk/textvariable.mli
+lib/ocaml/labltk/timer.cmi
+lib/ocaml/labltk/timer.mli
+lib/ocaml/labltk/tk.cmi
+lib/ocaml/labltk/tkcompiler
+lib/ocaml/labltk/tkwait.cmi
+lib/ocaml/labltk/toplevel.cmi
+lib/ocaml/labltk/widget.cmi
+lib/ocaml/labltk/widget.mli
+lib/ocaml/labltk/winfo.cmi
+lib/ocaml/labltk/wm.cmi
 lib/ocaml/lazy.cmi
 lib/ocaml/lazy.cmx
 lib/ocaml/lazy.ml
@@ -97,6 +174,7 @@ lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
+lib/ocaml/libbigarray.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libgraphics.a
 lib/ocaml/libmldbm.a
@@ -120,6 +198,10 @@ lib/ocaml/mutex.mli
 lib/ocaml/nat.cmi
 lib/ocaml/nat.cmx
 lib/ocaml/nat.mli
+lib/ocaml/nativeint.cmi
+lib/ocaml/nativeint.cmx
+lib/ocaml/nativeint.ml
+lib/ocaml/nativeint.mli
 lib/ocaml/num.cmi
 lib/ocaml/num.cmx
 lib/ocaml/num.mli
@@ -231,20 +313,23 @@ lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 man/man1/ocaml.1
 man/man1/ocamlc.1
+man/man1/ocamlc.opt.1
 man/man1/ocamlcp.1
 man/man1/ocamldep.1
 man/man1/ocamllex.1
+man/man1/ocamlmktop.1
 man/man1/ocamlopt.1
+man/man1/ocamlopt.opt.1
 man/man1/ocamlprof.1
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1
-man/man1/ocamlc.opt.1
-man/man1/ocamlmktop.1
-man/man1/ocamlopt.opt.1
 share/doc/ocaml/LICENSE
 share/doc/ocaml/html/contents_motif.gif
 share/doc/ocaml/html/index.html
 share/doc/ocaml/html/libgraph.gif
+share/doc/ocaml/html/manual.haux
+share/doc/ocaml/html/manual.hmanual.hind
+share/doc/ocaml/html/manual.hmanual.kwd.hind
 share/doc/ocaml/html/manual001.html
 share/doc/ocaml/html/manual002.html
 share/doc/ocaml/html/manual003.html
@@ -313,10 +398,18 @@ share/doc/ocaml/html/manual065.html
 share/doc/ocaml/html/manual066.html
 share/doc/ocaml/html/manual067.html
 share/doc/ocaml/html/manual068.html
+share/doc/ocaml/html/manual069.html
+share/doc/ocaml/html/manual070.html
+share/doc/ocaml/html/manual071.html
+share/doc/ocaml/html/manual072.html
+share/doc/ocaml/html/manual073.html
+share/doc/ocaml/html/manual074.html
+share/doc/ocaml/html/manual075.html
 share/doc/ocaml/html/next_motif.gif
 share/doc/ocaml/html/previous_motif.gif
 @dirrm share/doc/ocaml/html
 @dirrm share/doc/ocaml
-@dirrm lib/ocaml/caml
 @dirrm lib/ocaml/threads
+@dirrm lib/ocaml/labltk
+@dirrm lib/ocaml/caml
 @dirrm lib/ocaml