5 files changed, 94 insertions, 74 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 40c771112bfd..acef2e89ef42 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Objective Caml
-# Version required:	1.07
+# Version required:	2.04
 # Date created:		24 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ocaml-2.02
+DISTNAME=	ocaml-2.04
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 10e712fcc6db..7a3ed73525b0 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocaml-2.02.tar.gz) = 164765dc8093727903f4111500fb30cc
-MD5 (ocaml-2.02-refman.ps.gz) = af6bae149d72674d50ab115e38dcf90c
-MD5 (ocaml-2.02-refman.html.tar.gz) = d8558bcf77a9c8600576d02846eaff5d
+MD5 (ocaml-2.04.tar.gz) = e7eb206d2f7ee6e1aca0ab07d1f4dc20
+MD5 (ocaml-2.04-refman.html.tar.gz) = b5f06bbf3f602fd9ea0cddf7a1f2cfe4
+MD5 (ocaml-2.04-refman.ps.gz) = 7e162fc434f1ab36fdbad896ce935779
diff --git a/lang/ocaml/files/patch-af b/lang/ocaml/files/patch-af
new file mode 100644
index 000000000000..80b281f790ea
--- /dev/null
+++ b/lang/ocaml/files/patch-af
@@ -0,0 +1,10 @@
+--- otherlibs/graph/open.c.orig	Fri Feb 11 18:00:12 2000
++++ otherlibs/graph/open.c	Fri Feb 11 17:59:18 2000
+@@ -13,6 +13,7 @@
+ /* $Id: open.c,v 1.12 1999/11/18 13:33:53 xleroy Exp $ */
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <signal.h>
+ #include "libgraph.h"
+ #include <alloc.h>
diff --git a/lang/ocaml/files/patch-ag b/lang/ocaml/files/patch-ag
new file mode 100644
index 000000000000..7862542d05c7
--- /dev/null
+++ b/lang/ocaml/files/patch-ag
@@ -0,0 +1,10 @@
+--- byterun/config.h.orig	Fri Feb 11 18:34:29 2000
++++ byterun/config.h	Fri Feb 11 18:34:06 2000
+@@ -27,6 +27,7 @@
+ 
+ #ifdef HAS_MEMMOVE
+ #undef bcopy
++#include <string.h>
+ #define bcopy(src,dst,len) memmove((dst), (src), (len))
+ #else
+ #ifdef HAS_BCOPY
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 36a3420f8b6b..cfb7d22c8f1f 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -265,77 +265,77 @@ lib/ocaml/weak.p.cmx
 share/doc/ocaml/html/contents_motif.gif
 share/doc/ocaml/html/index.html
 share/doc/ocaml/html/libgraph.gif
+share/doc/ocaml/html/manual001.html
+share/doc/ocaml/html/manual002.html
+share/doc/ocaml/html/manual003.html
+share/doc/ocaml/html/manual004.html
+share/doc/ocaml/html/manual005.html
+share/doc/ocaml/html/manual006.html
+share/doc/ocaml/html/manual007.html
+share/doc/ocaml/html/manual008.html
+share/doc/ocaml/html/manual009.html
+share/doc/ocaml/html/manual010.html
+share/doc/ocaml/html/manual011.html
+share/doc/ocaml/html/manual012.html
+share/doc/ocaml/html/manual013.html
+share/doc/ocaml/html/manual014.html
+share/doc/ocaml/html/manual015.html
+share/doc/ocaml/html/manual016.html
+share/doc/ocaml/html/manual017.html
+share/doc/ocaml/html/manual018.html
+share/doc/ocaml/html/manual019.html
+share/doc/ocaml/html/manual020.html
+share/doc/ocaml/html/manual021.html
+share/doc/ocaml/html/manual022.html
+share/doc/ocaml/html/manual023.html
+share/doc/ocaml/html/manual024.html
+share/doc/ocaml/html/manual025.html
+share/doc/ocaml/html/manual026.html
+share/doc/ocaml/html/manual027.html
+share/doc/ocaml/html/manual028.html
+share/doc/ocaml/html/manual029.html
+share/doc/ocaml/html/manual030.html
+share/doc/ocaml/html/manual031.html
+share/doc/ocaml/html/manual032.html
+share/doc/ocaml/html/manual033.html
+share/doc/ocaml/html/manual034.html
+share/doc/ocaml/html/manual035.html
+share/doc/ocaml/html/manual036.html
+share/doc/ocaml/html/manual037.html
+share/doc/ocaml/html/manual038.html
+share/doc/ocaml/html/manual039.html
+share/doc/ocaml/html/manual040.html
+share/doc/ocaml/html/manual041.html
+share/doc/ocaml/html/manual042.html
+share/doc/ocaml/html/manual043.html
+share/doc/ocaml/html/manual044.html
+share/doc/ocaml/html/manual045.html
+share/doc/ocaml/html/manual046.html
+share/doc/ocaml/html/manual047.html
+share/doc/ocaml/html/manual048.html
+share/doc/ocaml/html/manual049.html
+share/doc/ocaml/html/manual050.html
+share/doc/ocaml/html/manual051.html
+share/doc/ocaml/html/manual052.html
+share/doc/ocaml/html/manual053.html
+share/doc/ocaml/html/manual054.html
+share/doc/ocaml/html/manual055.html
+share/doc/ocaml/html/manual056.html
+share/doc/ocaml/html/manual057.html
+share/doc/ocaml/html/manual058.html
+share/doc/ocaml/html/manual059.html
+share/doc/ocaml/html/manual060.html
+share/doc/ocaml/html/manual061.html
+share/doc/ocaml/html/manual062.html
+share/doc/ocaml/html/manual063.html
+share/doc/ocaml/html/manual064.html
+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/next_motif.gif
-share/doc/ocaml/html/node1.html
-share/doc/ocaml/html/node10.html
-share/doc/ocaml/html/node11.html
-share/doc/ocaml/html/node12.html
-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.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
-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.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
+share/doc/ocaml/ocaml-2.04-refman.ps.gz
 @dirrm share/doc/ocaml/html
 @dirrm share/doc/ocaml
 @dirrm lib/ocaml/caml