Update to new Version 3.01

Patch diddn't apply cleanly, not reflecting the current version.
Merged the changes.
Tested both standard package and "WITH_TK=yes"

PR:		25816
Submitted by:	patrick@watson.org

3 files changed, 113 insertions, 73 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 65e8ff13a129..157ce603f184 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.00
-PORTREVISION=	1
+PORTVERSION=	3.01
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
+MASTER_SITES=	http://caml.inria.fr/distrib/ \
+		ftp://ftp.inria.fr/lang/caml-light/ \
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-refman.html${EXTRACT_SUFX}
@@ -25,7 +25,7 @@ PLIST_SUB+=	LABLTK:="@comment "
 
 USE_XLIB=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	world bootstrap opt ocamlc.opt ocamlopt.opt
+ALL_TARGET=	world bootstrap opt opt.opt
 
 .if ${MACHINE_ARCH} != "i386"
 PLIST_SUB+=	PROF:="@comment "
@@ -33,9 +33,9 @@ PLIST_SUB+=	PROF:="@comment "
 PLIST_SUB+=	PROF:=""
 .endif
 
-MAN1=		ocaml.1 ocamlc.1 ocamlcp.1 ocamldep.1 ocamllex.1 \
-		ocamlopt.1 ocamlprof.1 ocamlrun.1 ocamlyacc.1 ocamlmktop.1 \
-		ocamlc.opt.1 ocamlopt.opt.1
+MAN1=		ocamlcp.1 ocamldep.1 ocamldebug.1 ocamlopt.1 ocamlc.opt.1 \
+		ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocamlopt.opt.1 \
+		ocaml.1 ocamlc.1 ocamllex.1 ocamlprof.1
 
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-x11include ${X11BASE}/include \
@@ -56,7 +56,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ocaml/html
 	@cd ${WRKDIR}/htmlman; ${INSTALL_DATA} * ${PREFIX}/share/doc/ocaml/html
-	@${RM} ${PREFIX}/share/doc/ocaml/html/*~
 	@${CP} ${DISTDIR}/${DISTNAME}-refman.ps.gz ${PREFIX}/share/doc/ocaml
 .endif
 	@strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 21d6180251bd..f13a96235af7 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocaml-3.00.tar.gz) = 7156d619d8e2aea430e0df9b1bab1b52
-MD5 (ocaml-3.00-refman.html.tar.gz) = 785ac165cc61ee8413a67399a3a2002e
-MD5 (ocaml-3.00-refman.ps.gz) = 3857d22c9b14d9ef2ef4ed41a9f0f02d
+MD5 (ocaml-3.01.tar.gz) = 9359b1d827dcbd40a9321ed389d6a54b
+MD5 (ocaml-3.01-refman.html.tar.gz) = ae2e0e385600a6987ecdf1a50dafab53
+MD5 (ocaml-3.01-refman.ps.gz) = f8a0b2892f66884480a4a393a1ca241d
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 3d6e87674dfb..1f9baeb0c78e 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -7,13 +7,13 @@ bin/ocamldep
 bin/ocamlprof
 bin/ocamlcp
 bin/ocamlmktop
-bin/ocaml299to3
-%%LABLTK:%%bin/labltk
-%%LABLTK:%%bin/ocamlbrowser
 bin/ocamlopt
 bin/ocamlc.opt
 bin/ocamlopt.opt
+bin/ocamllex.opt
 bin/ocamldebug
+%%LABLTK:%%bin/labltk
+%%LABLTK:%%bin/ocamlbrowser
 lib/ocaml/libcamlrun.a
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
@@ -195,62 +195,6 @@ lib/ocaml/libmldbm.a
 lib/ocaml/dbm.mli
 lib/ocaml/dbm.cmi
 lib/ocaml/dbm.cma
-%%LABLTK:%%lib/ocaml/labltk/bell.cmi
-%%LABLTK:%%lib/ocaml/labltk/labltk.cma
-%%LABLTK:%%lib/ocaml/labltk/wm.cmi
-%%LABLTK:%%lib/ocaml/labltk/winfo.cmi
-%%LABLTK:%%lib/ocaml/labltk/toplevel.cmi
-%%LABLTK:%%lib/ocaml/labltk/tkwait.cmi
-%%LABLTK:%%lib/ocaml/labltk/tk.cmi
-%%LABLTK:%%lib/ocaml/labltk/text.cmi
-%%LABLTK:%%lib/ocaml/labltk/selection.cmi
-%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmi
-%%LABLTK:%%lib/ocaml/labltk/scale.cmi
-%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/place.cmi
-%%LABLTK:%%lib/ocaml/labltk/palette.cmi
-%%LABLTK:%%lib/ocaml/labltk/pack.cmi
-%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmi
-%%LABLTK:%%lib/ocaml/labltk/option.cmi
-%%LABLTK:%%lib/ocaml/labltk/message.cmi
-%%LABLTK:%%lib/ocaml/labltk/menubutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/menu.cmi
-%%LABLTK:%%lib/ocaml/labltk/listbox.cmi
-%%LABLTK:%%lib/ocaml/labltk/label.cmi
-%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmi
-%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmi
-%%LABLTK:%%lib/ocaml/labltk/grid.cmi
-%%LABLTK:%%lib/ocaml/labltk/grab.cmi
-%%LABLTK:%%lib/ocaml/labltk/frame.cmi
-%%LABLTK:%%lib/ocaml/labltk/focus.cmi
-%%LABLTK:%%lib/ocaml/labltk/entry.cmi
-%%LABLTK:%%lib/ocaml/labltk/dialog.cmi
-%%LABLTK:%%lib/ocaml/labltk/clipboard.cmi
-%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/canvas.cmi
-%%LABLTK:%%lib/ocaml/labltk/button.cmi
-%%LABLTK:%%lib/ocaml/labltk/labltktop
-%%LABLTK:%%lib/ocaml/labltk/fileevent.cmi
-%%LABLTK:%%lib/ocaml/labltk/widget.mli
-%%LABLTK:%%lib/ocaml/labltk/widget.cmi
-%%LABLTK:%%lib/ocaml/labltk/timer.mli
-%%LABLTK:%%lib/ocaml/labltk/timer.cmi
-%%LABLTK:%%lib/ocaml/labltk/textvariable.mli
-%%LABLTK:%%lib/ocaml/labltk/textvariable.cmi
-%%LABLTK:%%lib/ocaml/labltk/protocol.mli
-%%LABLTK:%%lib/ocaml/labltk/protocol.cmi
-%%LABLTK:%%lib/ocaml/labltk/fileevent.mli
-%%LABLTK:%%lib/ocaml/labltk/liblabltk41.a
-%%LABLTK:%%lib/ocaml/labltk/tkcompiler
-%%LABLTK:%%lib/ocaml/labltk/libjpf.cma
-%%LABLTK:%%lib/ocaml/labltk/balloon.mli
-%%LABLTK:%%lib/ocaml/labltk/fileselect.mli
-%%LABLTK:%%lib/ocaml/labltk/balloon.cmi
-%%LABLTK:%%lib/ocaml/labltk/fileselect.cmi
-%%LABLTK:%%lib/ocaml/labltk/labltk.a
-%%LABLTK:%%lib/ocaml/labltk/labltk.cmxa
-%%LABLTK:%%lib/ocaml/labltk/libjpf.a
-%%LABLTK:%%lib/ocaml/labltk/libjpf.cmxa
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/stdlib.cmxa
@@ -265,10 +209,10 @@ lib/ocaml/stream.cmx
 lib/ocaml/std_exit.cmx
 %%PROF:%%lib/ocaml/stack.p.cmx
 lib/ocaml/stack.cmx
-lib/ocaml/set.cmx
 %%PROF:%%lib/ocaml/sort.p.cmx
 lib/ocaml/sort.cmx
 %%PROF:%%lib/ocaml/set.p.cmx
+lib/ocaml/set.cmx
 %%PROF:%%lib/ocaml/random.p.cmx
 lib/ocaml/random.cmx
 %%PROF:%%lib/ocaml/queue.p.cmx
@@ -289,8 +233,8 @@ lib/ocaml/obj.cmx
 lib/ocaml/nativeint.cmx
 %%PROF:%%lib/ocaml/marshal.p.cmx
 lib/ocaml/marshal.cmx
-lib/ocaml/map.cmx
 %%PROF:%%lib/ocaml/map.p.cmx
+lib/ocaml/map.cmx
 %%PROF:%%lib/ocaml/list.p.cmx
 lib/ocaml/list.cmx
 %%PROF:%%lib/ocaml/lexing.p.cmx
@@ -353,6 +297,103 @@ lib/ocaml/graphics.cmxa
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cmxa
 lib/ocaml/dbm.cmx
+%%LABLTK:%%lib/ocaml/labltk/scale.cmi
+%%LABLTK:%%lib/ocaml/labltk/menu.cmi
+%%LABLTK:%%lib/ocaml/labltk/place.cmi
+%%LABLTK:%%lib/ocaml/labltk/label.cmi
+%%LABLTK:%%lib/ocaml/labltk/menubutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/clipboard.cmi
+%%LABLTK:%%lib/ocaml/labltk/option.cmi
+%%LABLTK:%%lib/ocaml/labltk/message.cmi
+%%LABLTK:%%lib/ocaml/labltk/text.cmi
+%%LABLTK:%%lib/ocaml/labltk/entry.cmi
+%%LABLTK:%%lib/ocaml/labltk/wm.cmi
+%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmi
+%%LABLTK:%%lib/ocaml/labltk/focus.cmi
+%%LABLTK:%%lib/ocaml/labltk/palette.cmi
+%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmi
+%%LABLTK:%%lib/ocaml/labltk/tkwait.cmi
+%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmi
+%%LABLTK:%%lib/ocaml/labltk/winfo.cmi
+%%LABLTK:%%lib/ocaml/labltk/bell.cmi
+%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmi
+%%LABLTK:%%lib/ocaml/labltk/grid.cmi
+%%LABLTK:%%lib/ocaml/labltk/button.cmi
+%%LABLTK:%%lib/ocaml/labltk/grab.cmi
+%%LABLTK:%%lib/ocaml/labltk/listbox.cmi
+%%LABLTK:%%lib/ocaml/labltk/pack.cmi
+%%LABLTK:%%lib/ocaml/labltk/canvas.cmi
+%%LABLTK:%%lib/ocaml/labltk/frame.cmi
+%%LABLTK:%%lib/ocaml/labltk/toplevel.cmi
+%%LABLTK:%%lib/ocaml/labltk/selection.cmi
+%%LABLTK:%%lib/ocaml/labltk/dialog.cmi
+%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/tk.cmi
+%%LABLTK:%%lib/ocaml/labltk/labltktop
+%%LABLTK:%%lib/ocaml/labltk/labltk.cma
+%%LABLTK:%%lib/ocaml/labltk/fileevent.cmi
+%%LABLTK:%%lib/ocaml/labltk/widget.mli
+%%LABLTK:%%lib/ocaml/labltk/widget.cmi
+%%LABLTK:%%lib/ocaml/labltk/timer.mli
+%%LABLTK:%%lib/ocaml/labltk/timer.cmi
+%%LABLTK:%%lib/ocaml/labltk/textvariable.mli
+%%LABLTK:%%lib/ocaml/labltk/textvariable.cmi
+%%LABLTK:%%lib/ocaml/labltk/protocol.mli
+%%LABLTK:%%lib/ocaml/labltk/protocol.cmi
+%%LABLTK:%%lib/ocaml/labltk/fileevent.mli
+%%LABLTK:%%lib/ocaml/labltk/liblabltk41.a
+%%LABLTK:%%lib/ocaml/labltk/tkcompiler
+%%LABLTK:%%lib/ocaml/labltk/libjpf.cma
+%%LABLTK:%%lib/ocaml/labltk/balloon.mli
+%%LABLTK:%%lib/ocaml/labltk/fileselect.mli
+%%LABLTK:%%lib/ocaml/labltk/balloon.cmi
+%%LABLTK:%%lib/ocaml/labltk/fileselect.cmi
+%%LABLTK:%%lib/ocaml/labltk/support.cmx
+%%LABLTK:%%lib/ocaml/labltk/menu.cmx
+%%LABLTK:%%lib/ocaml/labltk/place.cmx
+%%LABLTK:%%lib/ocaml/labltk/label.cmx
+%%LABLTK:%%lib/ocaml/labltk/menubutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/clipboard.cmx
+%%LABLTK:%%lib/ocaml/labltk/option.cmx
+%%LABLTK:%%lib/ocaml/labltk/message.cmx
+%%LABLTK:%%lib/ocaml/labltk/text.cmx
+%%LABLTK:%%lib/ocaml/labltk/entry.cmx
+%%LABLTK:%%lib/ocaml/labltk/wm.cmx
+%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmx
+%%LABLTK:%%lib/ocaml/labltk/focus.cmx
+%%LABLTK:%%lib/ocaml/labltk/palette.cmx
+%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmx
+%%LABLTK:%%lib/ocaml/labltk/tkwait.cmx
+%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmx
+%%LABLTK:%%lib/ocaml/labltk/winfo.cmx
+%%LABLTK:%%lib/ocaml/labltk/bell.cmx
+%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmx
+%%LABLTK:%%lib/ocaml/labltk/grid.cmx
+%%LABLTK:%%lib/ocaml/labltk/button.cmx
+%%LABLTK:%%lib/ocaml/labltk/grab.cmx
+%%LABLTK:%%lib/ocaml/labltk/listbox.cmx
+%%LABLTK:%%lib/ocaml/labltk/pack.cmx
+%%LABLTK:%%lib/ocaml/labltk/canvas.cmx
+%%LABLTK:%%lib/ocaml/labltk/frame.cmx
+%%LABLTK:%%lib/ocaml/labltk/toplevel.cmx
+%%LABLTK:%%lib/ocaml/labltk/selection.cmx
+%%LABLTK:%%lib/ocaml/labltk/dialog.cmx
+%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/scale.cmx
+%%LABLTK:%%lib/ocaml/labltk/fileevent.cmx
+%%LABLTK:%%lib/ocaml/labltk/timer.cmx
+%%LABLTK:%%lib/ocaml/labltk/textvariable.cmx
+%%LABLTK:%%lib/ocaml/labltk/protocol.cmx
+%%LABLTK:%%lib/ocaml/labltk/widget.cmx
+%%LABLTK:%%lib/ocaml/labltk/tk.cmx
+%%LABLTK:%%lib/ocaml/labltk/labltk.a
+%%LABLTK:%%lib/ocaml/labltk/labltk.cmxa
+%%LABLTK:%%lib/ocaml/labltk/balloon.cmx
+%%LABLTK:%%lib/ocaml/labltk/fileselect.cmx
+%%LABLTK:%%lib/ocaml/labltk/libjpf.a
+%%LABLTK:%%lib/ocaml/labltk/libjpf.cmxa
 share/doc/ocaml/LICENSE
 share/doc/ocaml/html/contents_motif.gif
 share/doc/ocaml/html/index.html
@@ -437,7 +478,7 @@ 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
-share/doc/ocaml/ocaml-3.00-refman.ps.gz
+share/doc/ocaml/ocaml-3.01-refman.ps.gz
 @dirrm share/doc/ocaml/html
 @dirrm share/doc/ocaml
 @dirrm lib/ocaml/caml