Actually doing the commit:

> Update to version 3.04 based on patches submitted in PR#16896 by
> Marko Schuetz (MarcoSchuetz at web dot de) with minor modification by
> me, closing that PR.

(Pointed out by Takahiro Kambe)

4 files changed, 143 insertions, 14 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 034c01d2f8f..6450e5bf30a 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2002/01/14 18:10:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/06/19 02:23:41 jschauma Exp $
 #
 
-DISTNAME=		ocaml-3.01
+DISTNAME=		ocaml-3.04
 CATEGORIES=		lang
-MASTER_SITES=		ftp://ftp.inria.fr/lang/caml-light/ocaml-3.01/
+MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/
 
-MAINTAINER=		groo@netbsd.org
+MAINTAINER=		jschauma@netbsd.org
 HOMEPAGE=		http://caml.inria.fr/ocaml/
 COMMENT=		the latest implementation of the Caml dialect of ML
 
@@ -13,7 +13,10 @@ DEPENDS+=		tk>=8.3.2:../../x11/tk
 
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	-prefix ${LOCALBASE} -tklibs -L${LOCALBASE}/lib -tkdefs "-I${LOCALBASE}/include " -libs "-Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	-prefix ${LOCALBASE}
+CONFIGURE_ARGS+=	-tklibs -L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	-tkdefs "-I${LOCALBASE}/include "
+CONFIGURE_ARGS+=	-libs "-Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib"
 
 ALL_TARGET=		world
 
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index b7023d85c2c..0cf56f84c74 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/14 18:10:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/19 02:23:42 jschauma Exp $
+bin/camlp4
+bin/camlp4o
+bin/camlp4r
 bin/labltk
+bin/mkcamlp4
 bin/ocaml
 bin/ocamlbrowser
 bin/ocamlc
@@ -7,10 +11,14 @@ bin/ocamlcp
 bin/ocamldebug
 bin/ocamldep
 bin/ocamllex
+bin/ocamlmklib
 bin/ocamlmktop
 bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
+bin/ocpp
+bin/odyl
+lib/ocaml/addlabels
 lib/ocaml/arg.cmi
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
@@ -19,6 +27,9 @@ lib/ocaml/arith_status.mli
 lib/ocaml/array.cmi
 lib/ocaml/array.ml
 lib/ocaml/array.mli
+lib/ocaml/arrayLabels.cmi
+lib/ocaml/arrayLabels.ml
+lib/ocaml/arrayLabels.mli
 lib/ocaml/big_int.cmi
 lib/ocaml/big_int.mli
 lib/ocaml/bigarray.cma
@@ -36,11 +47,73 @@ lib/ocaml/caml/callback.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
+lib/ocaml/caml/intext.h
 lib/ocaml/caml/memory.h
 lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlp4/ast2pt.cmi
+lib/ocaml/camlp4/camlp4.cma
+lib/ocaml/camlp4/camlp4_top.cma
+lib/ocaml/camlp4/camlp4o.cma
+lib/ocaml/camlp4/camlp4r.cma
+lib/ocaml/camlp4/crc.cmo
+lib/ocaml/camlp4/extfun.cmi
+lib/ocaml/camlp4/extfun.mli
+lib/ocaml/camlp4/fstream.cmi
+lib/ocaml/camlp4/fstream.mli
+lib/ocaml/camlp4/gramext.cmi
+lib/ocaml/camlp4/gramext.mli
+lib/ocaml/camlp4/gramlib.cma
+lib/ocaml/camlp4/grammar.cmi
+lib/ocaml/camlp4/grammar.mli
+lib/ocaml/camlp4/lib.sml
+lib/ocaml/camlp4/mLast.cmi
+lib/ocaml/camlp4/mLast.mli
+lib/ocaml/camlp4/ocpp.cmo
+lib/ocaml/camlp4/odyl.cma
+lib/ocaml/camlp4/odyl.cmo
+lib/ocaml/camlp4/pa_extend.cmo
+lib/ocaml/camlp4/pa_extend_m.cmo
+lib/ocaml/camlp4/pa_extfun.cmo
+lib/ocaml/camlp4/pa_format.cmo
+lib/ocaml/camlp4/pa_fstream.cmo
+lib/ocaml/camlp4/pa_ifdef.cmi
+lib/ocaml/camlp4/pa_ifdef.cmo
+lib/ocaml/camlp4/pa_lisp.cmo
+lib/ocaml/camlp4/pa_o.cmi
+lib/ocaml/camlp4/pa_o.cmo
+lib/ocaml/camlp4/pa_olabl.cmo
+lib/ocaml/camlp4/pa_oop.cmo
+lib/ocaml/camlp4/pa_op.cmo
+lib/ocaml/camlp4/pa_r.cmo
+lib/ocaml/camlp4/pa_rp.cmo
+lib/ocaml/camlp4/pa_ru.cmo
+lib/ocaml/camlp4/pa_sml.cmo
+lib/ocaml/camlp4/pcaml.cmi
+lib/ocaml/camlp4/pcaml.mli
+lib/ocaml/camlp4/plexer.cmi
+lib/ocaml/camlp4/plexer.mli
+lib/ocaml/camlp4/pr_depend.cmo
+lib/ocaml/camlp4/pr_dump.cmo
+lib/ocaml/camlp4/pr_extend.cmo
+lib/ocaml/camlp4/pr_extfun.cmo
+lib/ocaml/camlp4/pr_null.cmo
+lib/ocaml/camlp4/pr_o.cmo
+lib/ocaml/camlp4/pr_op.cmo
+lib/ocaml/camlp4/pr_r.cmo
+lib/ocaml/camlp4/pr_rp.cmo
+lib/ocaml/camlp4/q_MLast.cmo
+lib/ocaml/camlp4/q_phony.cmo
+lib/ocaml/camlp4/quotation.cmi
+lib/ocaml/camlp4/quotation.mli
+lib/ocaml/camlp4/spretty.cmi
+lib/ocaml/camlp4/spretty.mli
+lib/ocaml/camlp4/stdpp.cmi
+lib/ocaml/camlp4/stdpp.mli
+lib/ocaml/camlp4/token.cmi
+lib/ocaml/camlp4/token.mli
 lib/ocaml/char.cmi
 lib/ocaml/char.ml
 lib/ocaml/char.mli
@@ -72,6 +145,8 @@ lib/ocaml/genlex.mli
 lib/ocaml/graphics.cma
 lib/ocaml/graphics.cmi
 lib/ocaml/graphics.mli
+lib/ocaml/graphicsX11.cmi
+lib/ocaml/graphicsX11.mli
 lib/ocaml/hashtbl.cmi
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
@@ -136,6 +211,7 @@ lib/ocaml/labltk/wm.cmi
 lib/ocaml/lazy.cmi
 lib/ocaml/lazy.ml
 lib/ocaml/lazy.mli
+lib/ocaml/ld.conf
 lib/ocaml/lexing.cmi
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
@@ -150,12 +226,18 @@ lib/ocaml/libunix.a
 lib/ocaml/list.cmi
 lib/ocaml/list.ml
 lib/ocaml/list.mli
+lib/ocaml/listLabels.cmi
+lib/ocaml/listLabels.ml
+lib/ocaml/listLabels.mli
 lib/ocaml/map.cmi
 lib/ocaml/map.ml
 lib/ocaml/map.mli
 lib/ocaml/marshal.cmi
 lib/ocaml/marshal.ml
 lib/ocaml/marshal.mli
+lib/ocaml/moreLabels.cmi
+lib/ocaml/moreLabels.ml
+lib/ocaml/moreLabels.mli
 lib/ocaml/mutex.mli
 lib/ocaml/nat.cmi
 lib/ocaml/nat.mli
@@ -171,6 +253,8 @@ lib/ocaml/obj.mli
 lib/ocaml/oo.cmi
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
+lib/ocaml/outcometree.cmi
+lib/ocaml/outcometree.mli
 lib/ocaml/parsing.cmi
 lib/ocaml/parsing.ml
 lib/ocaml/parsing.mli
@@ -193,6 +277,7 @@ lib/ocaml/random.ml
 lib/ocaml/random.mli
 lib/ocaml/ratio.cmi
 lib/ocaml/ratio.mli
+lib/ocaml/scrapelabels
 lib/ocaml/set.cmi
 lib/ocaml/set.ml
 lib/ocaml/set.mli
@@ -202,6 +287,9 @@ lib/ocaml/sort.mli
 lib/ocaml/stack.cmi
 lib/ocaml/stack.ml
 lib/ocaml/stack.mli
+lib/ocaml/stdLabels.cmi
+lib/ocaml/stdLabels.ml
+lib/ocaml/stdLabels.mli
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
 lib/ocaml/std_exit.ml
@@ -215,6 +303,9 @@ lib/ocaml/stream.mli
 lib/ocaml/string.cmi
 lib/ocaml/string.ml
 lib/ocaml/string.mli
+lib/ocaml/stringLabels.cmi
+lib/ocaml/stringLabels.ml
+lib/ocaml/stringLabels.mli
 lib/ocaml/sys.cmi
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
@@ -227,6 +318,7 @@ lib/ocaml/threads/stdlib.cma
 lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/threadUnix.cmi
 lib/ocaml/threads/threads.cma
+lib/ocaml/threads/unix.cma
 lib/ocaml/topdirs.cmi
 lib/ocaml/toplevellib.cma
 lib/ocaml/toploop.cmi
@@ -234,9 +326,17 @@ lib/ocaml/topmain.cmo
 lib/ocaml/unix.cma
 lib/ocaml/unix.cmi
 lib/ocaml/unix.mli
+lib/ocaml/unixLabels.cmi
+lib/ocaml/unixLabels.mli
 lib/ocaml/weak.cmi
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
+man/man1/camlp4.1
+man/man1/camlp4o.1
+man/man1/camlp4o.opt.1
+man/man1/camlp4r.1
+man/man1/camlp4r.opt.1
+man/man1/mkcamlp4.1
 man/man1/ocaml.1
 man/man1/ocamlc.1
 man/man1/ocamlc.opt.1
@@ -250,7 +350,11 @@ man/man1/ocamlopt.opt.1
 man/man1/ocamlprof.1
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1
-@dirrm lib/ocaml/caml
-@dirrm lib/ocaml/labltk
+man/man1/ocpp.1
 @dirrm lib/ocaml/threads
+@exec ${MKDIR} %D/lib/ocaml/shlibs
+@dirrm lib/ocaml/shlibs
+@dirrm lib/ocaml/labltk
+@dirrm lib/ocaml/camlp4
+@dirrm lib/ocaml/caml
 @dirrm lib/ocaml
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 03002166fbf..28741666b4a 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.opt,v 1.1 2001/11/01 00:32:30 zuntum Exp $
-bin/ocamlopt
+@comment $NetBSD: PLIST.opt,v 1.2 2002/06/19 02:23:42 jschauma Exp $
 bin/ocamlc.opt
+bin/ocamlopt
 bin/ocamlopt.opt
 lib/ocaml/arg.cmx
 lib/ocaml/arg.p.cmx
@@ -8,6 +8,8 @@ lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmx
 lib/ocaml/array.cmx
 lib/ocaml/array.p.cmx
+lib/ocaml/arrayLabels.cmx
+lib/ocaml/arrayLabels.p.cmx
 lib/ocaml/big_int.cmx
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
@@ -16,6 +18,15 @@ lib/ocaml/buffer.cmx
 lib/ocaml/buffer.p.cmx
 lib/ocaml/callback.cmx
 lib/ocaml/callback.p.cmx
+lib/ocaml/camlp4/extfun.cmx
+lib/ocaml/camlp4/fstream.cmx
+lib/ocaml/camlp4/gramext.cmx
+lib/ocaml/camlp4/gramlib.a
+lib/ocaml/camlp4/gramlib.cmxa
+lib/ocaml/camlp4/grammar.cmx
+lib/ocaml/camlp4/plexer.cmx
+lib/ocaml/camlp4/stdpp.cmx
+lib/ocaml/camlp4/token.cmx
 lib/ocaml/char.cmx
 lib/ocaml/char.p.cmx
 lib/ocaml/dbm.a
@@ -40,6 +51,8 @@ lib/ocaml/int32.p.cmx
 lib/ocaml/int64.cmx
 lib/ocaml/int64.p.cmx
 lib/ocaml/int_misc.cmx
+lib/ocaml/labelled.cmx
+lib/ocaml/labelled.p.cmx
 lib/ocaml/labltk/balloon.cmx
 lib/ocaml/labltk/bell.cmx
 lib/ocaml/labltk/button.cmx
@@ -93,10 +106,14 @@ lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/list.cmx
 lib/ocaml/list.p.cmx
+lib/ocaml/listLabels.cmx
+lib/ocaml/listLabels.p.cmx
 lib/ocaml/map.cmx
 lib/ocaml/map.p.cmx
 lib/ocaml/marshal.cmx
 lib/ocaml/marshal.p.cmx
+lib/ocaml/moreLabels.cmx
+lib/ocaml/moreLabels.p.cmx
 lib/ocaml/nat.cmx
 lib/ocaml/nativeint.cmx
 lib/ocaml/nativeint.p.cmx
@@ -126,6 +143,8 @@ lib/ocaml/sort.cmx
 lib/ocaml/sort.p.cmx
 lib/ocaml/stack.cmx
 lib/ocaml/stack.p.cmx
+lib/ocaml/stdLabels.cmx
+lib/ocaml/stdLabels.p.cmx
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.o
 lib/ocaml/std_exit.p.cmx
@@ -141,11 +160,14 @@ lib/ocaml/stream.cmx
 lib/ocaml/stream.p.cmx
 lib/ocaml/string.cmx
 lib/ocaml/string.p.cmx
+lib/ocaml/stringLabels.cmx
+lib/ocaml/stringLabels.p.cmx
 lib/ocaml/string_misc.cmx
 lib/ocaml/sys.cmx
 lib/ocaml/sys.p.cmx
 lib/ocaml/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
+lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
 lib/ocaml/weak.p.cmx
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index a4102aff342..b4e3946979a 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/03/13 08:37:52 jmc Exp $
+$NetBSD: distinfo,v 1.5 2002/06/19 02:23:42 jschauma Exp $
 
-SHA1 (ocaml-3.01.tar.gz) = 55318320ffcb4c02baef86fe87085b2dca3dd614
-Size (ocaml-3.01.tar.gz) = 1589945 bytes
-SHA1 (patch-aa) = 576a7885d6ef9911db35c91ac51345f8c74420ac
+SHA1 (ocaml-3.04.tar.gz) = ebd84def03d78cfd3aa9b736b8780332a1173de0
+Size (ocaml-3.04.tar.gz) = 1968138 bytes
+SHA1 (patch-aa) = 9e3eedb855d3a3830f58979caee0af48b5b8e670