5 files changed, 102 insertions, 62 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 67d65c48db69..2217bd03e558 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -3,34 +3,39 @@
 # Date created:		24 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/02/21 15:46:28 steve Exp $
+# $Id: Makefile,v 1.4 1998/11/28 09:07:13 asami Exp $
 #
 
-DISTNAME=	ocaml-1.07
+DISTNAME=	ocaml-2.02
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/ \
-		ftp://ftp.inria.fr/lang/caml-light/
+MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
+		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/
 DISTFILES=	${DISTNAME}.tar.gz ${DOCFILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-refman.html${EXTRACT_SUFX}
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER=	ortmann@isl.net
 
 USE_XLIB=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	world bootstrap opt
+# targets not yet working (due to Elf) ==> ocamlc.opt ocamlopt.opt
+
 MAN1=		ocaml.1 ocamlc.1 ocamlcp.1 ocamldep.1 ocamllex.1 \
-		ocamlopt.1 ocamlprof.1 ocamlrun.1 ocamlyacc.1
+		ocamlopt.1 ocamlprof.1 ocamlrun.1 ocamlyacc.1 ocamlmktop.1
+# manpages not yet installing (due to Elf) ==> ocamlc.opt.1 ocamlopt.opt.1
 
 CONFIGURE_ENV=	PREFIX=${PREFIX} X11BASE=${X11BASE} BATCH=${BATCH}
 
 .if !defined(NOPORTDOCS)
-DOCFILES=	${DISTNAME}-refman.html.tar.gz
+DOCFILES=	${DISTNAME}-refman.html.tar.gz ${DISTNAME}-refman.ps.gz
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ocaml/html
 	@cd ${WRKDIR}/htmlman; ${INSTALL_DATA} * ${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 039b90d3c8da..10e712fcc6db 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,2 +1,3 @@
-MD5 (ocaml-1.07.tar.gz) = c5bf08086a866b80f55a91a4468f20b7
-MD5 (ocaml-1.07-refman.html.tar.gz) = 045be9ae7ca6c19a34bc1912b4d7f272
+MD5 (ocaml-2.02.tar.gz) = 164765dc8093727903f4111500fb30cc
+MD5 (ocaml-2.02-refman.ps.gz) = af6bae149d72674d50ab115e38dcf90c
+MD5 (ocaml-2.02-refman.html.tar.gz) = d8558bcf77a9c8600576d02846eaff5d
diff --git a/lang/ocaml/pkg-comment b/lang/ocaml/pkg-comment
index 5f266a73ed33..d8c81183e3cb 100644
--- a/lang/ocaml/pkg-comment
+++ b/lang/ocaml/pkg-comment
@@ -1 +1 @@
-A ML language based on complete class-based objective system
+An ML language based on a complete class-based objective system
diff --git a/lang/ocaml/pkg-descr b/lang/ocaml/pkg-descr
index acdabae43f8a..9852a27c1838 100644
--- a/lang/ocaml/pkg-descr
+++ b/lang/ocaml/pkg-descr
@@ -1,3 +1,5 @@
+OVERVIEW:
+
 Objective Caml is an implementation of the ML language, based on
 the Caml Light dialect extended with a complete class-based object system
 and a powerful module system in the style of Standard ML.
@@ -14,18 +16,34 @@ standalone programs, or as an interactive, toplevel-based system.
 The other compiler generates high-performance native code for a number
 of processors. Compilation takes longer and generates bigger code, but
 the generated programs deliver excellent performance (better than
-Standard ML of New Jersey 1.08 on our tests), while retaining the
+Standard ML of New Jersey 1.09 on our tests), while retaining the
 moderate memory requirements of the bytecode compiler. The native-code
 compiler currently runs on the following platforms:
 
-    Alpha processors: DecStation 3000 under OSF1
-    Sparc processors: Sun Sparcstation under SunOS 4.1 or Solaris 2
-    Intel 386 / 486 / Pentium processors: PCs under Linux, NextStep, FreeBSD,
-					Windows NT, Windows 95
-    Mips processors: DecStation 3100 and 5000 under Ultrix 4
-    HP PA-RISC processors: HP 9000/700 under NextStep (sorry, no HPUX yet)
-    PowerPC and IBM RS/6000 processors: IBM workstations under AIX 3.2
+    Alpha processors: all Digital Alpha machines under Digital Unix or Linux
+    Sparc processors: Sun Sparc under SunOS 4.1, Solaris 2, NetBSD, Linux
+    Intel Pentium processors: PCs under Linux, NextStep, FreeBSD, Solaris 2
+    Mips processors: SGI workstations and mainframes under IRIX 6
+    HP PA-RISC processors: HP 9000/700 under HPUX 9 and NextStep
+    PowerPC processors: IBM RS6000 and PowerPC workstations under AIX 3.2,
+                        PowerMacintosh under MkLinux, LinuxPPC, Rhapsody
+    Motorola 680x0 processors: Sun 3 under SunOS
+    Strong ARM processors: Corel Netwinder under Linux
+
+DOCUMENTATION:
+
+The Objective Caml manual is distributed in HTML, PDF, Postscript, and
+DVI. It can be obtained by anonymous FTP from ftp.inria.fr as
+described below. It is also available on the World Wide Web, at
+
+        http://caml.inria.fr/ocaml/
+
+AVAILABILITY:
+
+The complete Objective Caml distribution resides on ftp.inria.fr,
+and can be accessed by anonymous FTP:
 
-More information on Objective Caml is available on the World Wide Web:
+        host:       ftp.inria.fr (192.93.2.54)
+        directory:  lang/caml-light
 
-    http://pauillac.inria.fr/ocaml/
+or through a Web browser at ftp://ftp.inria.fr/lang/caml-light/
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index c9b6e0874dbd..fbd066f30b90 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -24,6 +24,10 @@ lib/ocaml/array.mli
 lib/ocaml/big_int.cmi
 lib/ocaml/big_int.cmx
 lib/ocaml/big_int.mli
+lib/ocaml/buffer.cmi
+lib/ocaml/buffer.cmx
+lib/ocaml/buffer.ml
+lib/ocaml/buffer.mli
 lib/ocaml/callback.cmi
 lib/ocaml/callback.cmx
 lib/ocaml/callback.ml
@@ -31,10 +35,12 @@ lib/ocaml/callback.mli
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/callback.h
 lib/ocaml/caml/config.h
+lib/ocaml/caml/fail.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/char.cmi
 lib/ocaml/char.cmx
 lib/ocaml/char.ml
@@ -90,6 +96,7 @@ lib/ocaml/lexing.cmx
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
 lib/ocaml/libasmrun.a
+lib/ocaml/libasmrunp.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libgraphics.a
 lib/ocaml/libmldbm.a
@@ -173,9 +180,13 @@ lib/ocaml/std_exit.cmo
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 lib/ocaml/std_exit.o
+lib/ocaml/std_exit.p.cmx
+lib/ocaml/std_exit.p.o
 lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmxa
+lib/ocaml/stdlib.p.a
+lib/ocaml/stdlib.p.cmxa
 lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
@@ -220,6 +231,7 @@ lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 share/doc/ocaml/html/contents_motif.gif
 share/doc/ocaml/html/index.html
+share/doc/ocaml/html/libgraph.gif
 share/doc/ocaml/html/next_motif.gif
 share/doc/ocaml/html/node1.html
 share/doc/ocaml/html/node10.html
@@ -229,36 +241,37 @@ share/doc/ocaml/html/node13.html
 share/doc/ocaml/html/node14.html
 share/doc/ocaml/html/node15.html
 share/doc/ocaml/html/node16.html
-share/doc/ocaml/html/node17.1.html
-share/doc/ocaml/html/node17.10.html
-share/doc/ocaml/html/node17.11.html
-share/doc/ocaml/html/node17.12.html
-share/doc/ocaml/html/node17.13.html
-share/doc/ocaml/html/node17.14.html
-share/doc/ocaml/html/node17.15.html
-share/doc/ocaml/html/node17.16.html
-share/doc/ocaml/html/node17.17.html
-share/doc/ocaml/html/node17.18.html
-share/doc/ocaml/html/node17.19.html
-share/doc/ocaml/html/node17.2.html
-share/doc/ocaml/html/node17.20.html
-share/doc/ocaml/html/node17.21.html
-share/doc/ocaml/html/node17.22.html
-share/doc/ocaml/html/node17.23.html
-share/doc/ocaml/html/node17.24.html
-share/doc/ocaml/html/node17.25.html
-share/doc/ocaml/html/node17.26.html
-share/doc/ocaml/html/node17.27.html
-share/doc/ocaml/html/node17.28.html
-share/doc/ocaml/html/node17.29.html
-share/doc/ocaml/html/node17.3.html
-share/doc/ocaml/html/node17.4.html
-share/doc/ocaml/html/node17.5.html
-share/doc/ocaml/html/node17.6.html
-share/doc/ocaml/html/node17.7.html
-share/doc/ocaml/html/node17.8.html
-share/doc/ocaml/html/node17.9.html
 share/doc/ocaml/html/node17.html
+share/doc/ocaml/html/node18.1.html
+share/doc/ocaml/html/node18.10.html
+share/doc/ocaml/html/node18.11.html
+share/doc/ocaml/html/node18.12.html
+share/doc/ocaml/html/node18.13.html
+share/doc/ocaml/html/node18.14.html
+share/doc/ocaml/html/node18.15.html
+share/doc/ocaml/html/node18.16.html
+share/doc/ocaml/html/node18.17.html
+share/doc/ocaml/html/node18.18.html
+share/doc/ocaml/html/node18.19.html
+share/doc/ocaml/html/node18.2.html
+share/doc/ocaml/html/node18.20.html
+share/doc/ocaml/html/node18.21.html
+share/doc/ocaml/html/node18.22.html
+share/doc/ocaml/html/node18.23.html
+share/doc/ocaml/html/node18.24.html
+share/doc/ocaml/html/node18.25.html
+share/doc/ocaml/html/node18.26.html
+share/doc/ocaml/html/node18.27.html
+share/doc/ocaml/html/node18.28.html
+share/doc/ocaml/html/node18.29.html
+share/doc/ocaml/html/node18.3.html
+share/doc/ocaml/html/node18.30.html
+share/doc/ocaml/html/node18.4.html
+share/doc/ocaml/html/node18.5.html
+share/doc/ocaml/html/node18.6.html
+share/doc/ocaml/html/node18.7.html
+share/doc/ocaml/html/node18.8.html
+share/doc/ocaml/html/node18.9.html
 share/doc/ocaml/html/node18.html
 share/doc/ocaml/html/node19.html
 share/doc/ocaml/html/node2.html
@@ -266,27 +279,30 @@ share/doc/ocaml/html/node20.html
 share/doc/ocaml/html/node21.html
 share/doc/ocaml/html/node22.html
 share/doc/ocaml/html/node23.html
+share/doc/ocaml/html/node24.html
+share/doc/ocaml/html/node25.html
 share/doc/ocaml/html/node3.html
 share/doc/ocaml/html/node4.html
-share/doc/ocaml/html/node5.1.html
-share/doc/ocaml/html/node5.10.html
-share/doc/ocaml/html/node5.11.html
-share/doc/ocaml/html/node5.12.html
-share/doc/ocaml/html/node5.13.html
-share/doc/ocaml/html/node5.2.html
-share/doc/ocaml/html/node5.3.html
-share/doc/ocaml/html/node5.4.html
-share/doc/ocaml/html/node5.5.html
-share/doc/ocaml/html/node5.6.html
-share/doc/ocaml/html/node5.7.html
-share/doc/ocaml/html/node5.8.html
-share/doc/ocaml/html/node5.9.html
 share/doc/ocaml/html/node5.html
+share/doc/ocaml/html/node6.1.html
+share/doc/ocaml/html/node6.10.html
+share/doc/ocaml/html/node6.11.html
+share/doc/ocaml/html/node6.12.html
+share/doc/ocaml/html/node6.13.html
+share/doc/ocaml/html/node6.2.html
+share/doc/ocaml/html/node6.3.html
+share/doc/ocaml/html/node6.4.html
+share/doc/ocaml/html/node6.5.html
+share/doc/ocaml/html/node6.6.html
+share/doc/ocaml/html/node6.7.html
+share/doc/ocaml/html/node6.8.html
+share/doc/ocaml/html/node6.9.html
 share/doc/ocaml/html/node6.html
 share/doc/ocaml/html/node7.html
 share/doc/ocaml/html/node8.html
 share/doc/ocaml/html/node9.html
 share/doc/ocaml/html/previous_motif.gif
+share/doc/ocaml/ocaml-2.02-refman.ps.gz
 @dirrm share/doc/ocaml/html
 @dirrm share/doc/ocaml
 @dirrm lib/ocaml/caml