[pkgsrc/trunk]: pkgsrc/lang/ocaml - Update from 3.06 to 3.08.2

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/142eb7a81298
branches:  trunk
changeset: 488590:142eb7a81298
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Fri Feb 04 21:35:51 2005 +0000

description:
- Update from 3.06 to 3.08.2
- Lots of changes/bugfixes - see Changes for all the details

diffstat:

 lang/ocaml/Makefile         |    8 +-
 lang/ocaml/Makefile.common  |   16 ++-
 lang/ocaml/PLIST            |  207 +++++++++++++++++++++++--------------------
 lang/ocaml/PLIST.opt        |   67 +++++++++++++-
 lang/ocaml/PLIST.prof       |    8 +-
 lang/ocaml/PLIST.stub       |   10 ++
 lang/ocaml/buildlink3.mk    |    4 +-
 lang/ocaml/distinfo         |   66 ++++++-------
 lang/ocaml/files/wrapper.sh |    2 +
 lang/ocaml/patches/patch-aa |    8 +-
 lang/ocaml/patches/patch-ac |  125 ++++----------------------
 lang/ocaml/patches/patch-ah |   79 +++++++++++-----
 lang/ocaml/patches/patch-aj |   13 +-
 lang/ocaml/patches/patch-ak |   49 +++++----
 lang/ocaml/patches/patch-al |   35 ++++--
 lang/ocaml/patches/patch-am |   40 ++++---
 lang/ocaml/patches/patch-an |   24 ++--
 lang/ocaml/patches/patch-ao |   38 ++++---
 lang/ocaml/patches/patch-ap |   24 ++--
 lang/ocaml/patches/patch-aq |   31 ++++--
 lang/ocaml/patches/patch-ar |   18 +--
 lang/ocaml/patches/patch-at |   41 ++-----
 lang/ocaml/patches/patch-au |   12 +-
 lang/ocaml/patches/patch-av |    6 +-
 lang/ocaml/patches/patch-aw |   31 +++---
 lang/ocaml/patches/patch-ba |   18 +-
 lang/ocaml/patches/patch-be |   14 +-
 lang/ocaml/patches/patch-bf |   14 +-
 lang/ocaml/patches/patch-bk |   13 +-
 lang/ocaml/patches/patch-bn |   10 +-
 lang/ocaml/patches/patch-bo |   17 ++-
 lang/ocaml/patches/patch-bp |   28 ++--
 lang/ocaml/patches/patch-br |   26 ++++-
 lang/ocaml/patches/patch-bs |   62 ++++++++++++-
 lang/ocaml/patches/patch-bt |   63 +++++++++++++
 lang/ocaml/patches/patch-bu |   21 ++++
 lang/ocaml/patches/patch-bv |   15 +++
 37 files changed, 753 insertions(+), 510 deletions(-)

diffs (truncated from 1884 to 300 lines):

diff -r f665b044141c -r 142eb7a81298 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Fri Feb 04 21:06:38 2005 +0000
+++ b/lang/ocaml/Makefile       Fri Feb 04 21:35:51 2005 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2004/12/24 17:16:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2005/02/04 21:35:51 adrianp Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   8
-
 CONFIGURE_ARGS+=       -no-tk
 CONFIGURE_ENV+=                disable_x11=yes
 
@@ -18,4 +16,8 @@
 PLIST_SRC+=    ${PKGDIR}/PLIST
 .endif
 
+.if ${OPSYS} == "Darwin"
+PLIST_SRC+=    ${PKGDIR}/PLIST.stub
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r f665b044141c -r 142eb7a81298 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Fri Feb 04 21:06:38 2005 +0000
+++ b/lang/ocaml/Makefile.common        Fri Feb 04 21:35:51 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2005/01/19 17:43:59 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/02/04 21:35:51 adrianp Exp $
 
-DISTNAME=      ocaml-3.06
+DISTNAME=      ocaml-3.08.2
 CATEGORIES=    lang
-MASTER_SITES=  ftp://ftp.inria.fr/INRIA/cristal/ocaml/${DISTNAME}/
+MASTER_SITES=  ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-3.08/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://caml.inria.fr/ocaml/
@@ -22,15 +22,19 @@
 
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes
+# See PR# 28772 as the above should work but it appears to be ignored
+# so we set it explicitly below not to stip installed binaries.
+_STRIPFLAG_CC=
+_STRIPFLAG_INSTALL=
 .endif
 
 post-extract: cp-power-bsd cp-gnu-config
 
 cp-power-bsd:
-       ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
+       @${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 
 cp-gnu-config:
-       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
-       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
+       @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
+       @${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
 
 .include "../../mk/pthread.buildlink3.mk"
diff -r f665b044141c -r 142eb7a81298 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Fri Feb 04 21:06:38 2005 +0000
+++ b/lang/ocaml/PLIST  Fri Feb 04 21:35:51 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/12/24 17:16:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/02/04 21:35:51 adrianp Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -43,12 +43,15 @@
 lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
 lib/ocaml/caml/config.h
+lib/ocaml/caml/compatibility.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/caml/printexc.h
+lib/ocaml/caml/signals.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalOO.cmi
@@ -60,7 +63,6 @@
 lib/ocaml/camlp4/camlp4_top.cma
 lib/ocaml/camlp4/camlp4o.cma
 lib/ocaml/camlp4/camlp4r.cma
-lib/ocaml/camlp4/crc.cmo
 lib/ocaml/camlp4/extfold.cmi
 lib/ocaml/camlp4/extfold.mli
 lib/ocaml/camlp4/extfun.cmi
@@ -72,33 +74,28 @@
 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/odyl_main.cmi
 lib/ocaml/camlp4/pa_extend.cmi
 lib/ocaml/camlp4/pa_extend.cmo
 lib/ocaml/camlp4/pa_extend_m.cmo
 lib/ocaml/camlp4/pa_extfold.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_lefteval.cmo
-lib/ocaml/camlp4/pa_lisp.cmo
+lib/ocaml/camlp4/pa_macro.cmi
+lib/ocaml/camlp4/pa_macro.cmo
 lib/ocaml/camlp4/pa_o.cmi
 lib/ocaml/camlp4/pa_o.cmo
-lib/ocaml/camlp4/pa_ocamllex.cma
-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
@@ -175,6 +172,7 @@
 lib/ocaml/libnums.a
 lib/ocaml/libstr.a
 lib/ocaml/libthreads.a
+lib/ocaml/libthreadsnat.a
 lib/ocaml/libunix.a
 lib/ocaml/list.cmi
 lib/ocaml/list.ml
@@ -204,7 +202,6 @@
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
 lib/ocaml/ocamldoc/ocamldoc.hva
-lib/ocaml/ocamldoc/ocamldoc.sty
 lib/ocaml/ocamldoc/odoc.cmi
 lib/ocaml/ocamldoc/odoc_analyse.cmi
 lib/ocaml/ocamldoc/odoc_args.cmi
@@ -212,8 +209,8 @@
 lib/ocaml/ocamldoc/odoc_class.cmi
 lib/ocaml/ocamldoc/odoc_comments.cmi
 lib/ocaml/ocamldoc/odoc_comments_global.cmi
+lib/ocaml/ocamldoc/odoc_config.cmi
 lib/ocaml/ocamldoc/odoc_control.cmi
-lib/ocaml/ocamldoc/odoc_crc.cmi
 lib/ocaml/ocamldoc/odoc_cross.cmi
 lib/ocaml/ocamldoc/odoc_dag2html.cmi
 lib/ocaml/ocamldoc/odoc_dep.cmi
@@ -227,6 +224,7 @@
 lib/ocaml/ocamldoc/odoc_info.mli
 lib/ocaml/ocamldoc/odoc_inherit.cmi
 lib/ocaml/ocamldoc/odoc_latex.cmi
+lib/ocaml/ocamldoc/odoc_latex_style.cmi
 lib/ocaml/ocamldoc/odoc_lexer.cmi
 lib/ocaml/ocamldoc/odoc_man.cmi
 lib/ocaml/ocamldoc/odoc_merge.cmi
@@ -237,11 +235,13 @@
 lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
 lib/ocaml/ocamldoc/odoc_parameter.cmi
 lib/ocaml/ocamldoc/odoc_parser.cmi
+lib/ocaml/ocamldoc/odoc_print.cmi
 lib/ocaml/ocamldoc/odoc_scan.cmi
 lib/ocaml/ocamldoc/odoc_search.cmi
 lib/ocaml/ocamldoc/odoc_see_lexer.cmi
 lib/ocaml/ocamldoc/odoc_sig.cmi
 lib/ocaml/ocamldoc/odoc_str.cmi
+lib/ocaml/ocamldoc/odoc_test.cmi
 lib/ocaml/ocamldoc/odoc_texi.cmi
 lib/ocaml/ocamldoc/odoc_text.cmi
 lib/ocaml/ocamldoc/odoc_text_lexer.cmi
@@ -319,6 +319,7 @@
 lib/ocaml/threads/mutex.cmi
 lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/threadUnix.cmi
+lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cma
 lib/ocaml/topdirs.cmi
 lib/ocaml/toplevellib.cma
@@ -330,6 +331,20 @@
 lib/ocaml/unix.mli
 lib/ocaml/unixLabels.cmi
 lib/ocaml/unixLabels.mli
+lib/ocaml/vmthreads/condition.cmi
+lib/ocaml/vmthreads/condition.mli
+lib/ocaml/vmthreads/event.cmi
+lib/ocaml/vmthreads/event.mli
+lib/ocaml/vmthreads/libvmthreads.a
+lib/ocaml/vmthreads/mutex.cmi
+lib/ocaml/vmthreads/mutex.mli
+lib/ocaml/vmthreads/stdlib.cma
+lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.mli
+lib/ocaml/vmthreads/threads.cma
+lib/ocaml/vmthreads/threadUnix.cmi
+lib/ocaml/vmthreads/threadUnix.mli
+lib/ocaml/vmthreads/unix.cma
 lib/ocaml/weak.cmi
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
@@ -345,6 +360,7 @@
 man/man1/ocamlcp.1
 man/man1/ocamldebug.1
 man/man1/ocamldep.1
+man/man1/ocamldoc.1
 man/man1/ocamllex.1
 man/man1/ocamlmktop.1
 man/man1/ocamlopt.1
@@ -353,90 +369,91 @@
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1
 man/man1/ocpp.1
-man/mano/Arg.o
-man/mano/Array.o
-man/mano/ArrayLabels.o
-man/mano/Bigarray.Array1.o
-man/mano/Bigarray.Array2.o
-man/mano/Bigarray.Array3.o
-man/mano/Bigarray.Genarray.o
-man/mano/Bigarray.o
-man/mano/Buffer.o
-man/mano/Callback.o
-man/mano/CamlinternalOO.o
-man/mano/Char.o
-man/mano/Complex.o
-man/mano/Digest.o
-man/mano/Filename.o
-man/mano/Format.o
-man/mano/Gc.o
-man/mano/Genlex.o
-man/mano/Hashtbl.HashedType.o
-man/mano/Hashtbl.Make.o
-man/mano/Hashtbl.S.o
-man/mano/Hashtbl.o
-man/mano/Int32.o
-man/mano/Int64.o
-man/mano/Lazy.o
-man/mano/Lexing.o
-man/mano/List.o
-man/mano/ListLabels.o
-man/mano/Map.Make.o
-man/mano/Map.OrderedType.o
-man/mano/Map.S.o
-man/mano/Map.o
-man/mano/Marshal.o
-man/mano/MoreLabels.Hashtbl.HashedType.o
-man/mano/MoreLabels.Hashtbl.Make.o
-man/mano/MoreLabels.Hashtbl.S.o
-man/mano/MoreLabels.Hashtbl.o
-man/mano/MoreLabels.Map.Make.o
-man/mano/MoreLabels.Map.OrderedType.o
-man/mano/MoreLabels.Map.S.o
-man/mano/MoreLabels.Map.o
-man/mano/MoreLabels.Set.Make.o
-man/mano/MoreLabels.Set.OrderedType.o
-man/mano/MoreLabels.Set.S.o
-man/mano/MoreLabels.Set.o
-man/mano/MoreLabels.o
-man/mano/Nativeint.o
-man/mano/Num.o
-man/mano/Obj.o
-man/mano/Oo.o
-man/mano/Parsing.o
-man/mano/Pervasives.LargeFile.o
-man/mano/Pervasives.o
-man/mano/Printexc.o
-man/mano/Printf.o
-man/mano/Queue.o
-man/mano/Random.o
-man/mano/Scanf.Scanning.o
-man/mano/Scanf.o
-man/mano/Set.Make.o
-man/mano/Set.OrderedType.o
-man/mano/Set.S.o
-man/mano/Set.o
-man/mano/Sort.o
-man/mano/Stack.o
-man/mano/StdLabels.Array.o
-man/mano/StdLabels.List.o
-man/mano/StdLabels.String.o
-man/mano/StdLabels.o
-man/mano/Str.o
-man/mano/Stream.o
-man/mano/String.o
-man/mano/StringLabels.o
-man/mano/Sys.o
-man/mano/Unix.LargeFile.o
-man/mano/Unix.o
-man/mano/Weak.Make.o
-man/mano/Weak.S.o
-man/mano/Weak.o
-@dirrm man/mano