5 files changed, 12 insertions, 69 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index e6df93648898..d4e3143db845 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.05
+PORTVERSION=	3.06
 CATEGORIES=	lang
-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/
+MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME}/ \
+		ftp://ftp.inria.fr/lang/caml-light/${DISTNAME}/ \
+		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME}/
 PKGNAMESUFFIX=	${TKSFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index bcb047ec2abd..26d01b501027 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-MD5 (ocaml-3.05.tar.gz) = 20afd1cd0e958968b463e69c2f120493
-MD5 (ocaml-3.05-refman.html.tar.gz) = dd5d79888ef268b8e0473e36be0912dc
-MD5 (ocaml-3.05-refman.ps.gz) = 587beb0670013d12b5816483d635520a
-MD5 (ocaml-3.05-refman.pdf) = 9a74ebf2d5a3beb04076a3d2006336bd
+MD5 (ocaml-3.06.tar.gz) = 51530ed183b511ce19fed325c8ab1b43
+MD5 (ocaml-3.06-refman.html.tar.gz) = 2b555271d2630698fcd3a9b9acfd1440
+MD5 (ocaml-3.06-refman.ps.gz) = 7a23eb2287e04d359500dcaa8a8b504c
+MD5 (ocaml-3.06-refman.pdf) = ac949c5843b41af5fceed862319b9e9b
diff --git a/lang/ocaml/files/patch-byterun::major_gc.c b/lang/ocaml/files/patch-byterun::major_gc.c
deleted file mode 100644
index f438c7ab265d..000000000000
--- a/lang/ocaml/files/patch-byterun::major_gc.c
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: byterun/major_gc.c
-===================================================================
-RCS file: /net/pauillac/caml/repository/csl/byterun/major_gc.c,v
-retrieving revision 1.37
-retrieving revision 1.39
-diff -u -r1.37 -r1.39
---- major_gc.c	2002/06/05 12:11:15	1.37
-+++ major_gc.c	2002/07/30 13:48:52	1.39
-@@ -11,7 +11,7 @@
- /*                                                                     */
- /***********************************************************************/
- 
--/* $Id: major_gc.c,v 1.37 2002/06/05 12:11:15 doligez Exp $ */
-+/* $Id: major_gc.c,v 1.39 2002/07/30 13:48:52 xleroy Exp $ */
- 
- #include <limits.h>
- 
-@@ -126,15 +126,12 @@
-       if (Tag_hd (hd) < No_scan_tag){
-         for (i = 0; i < size; i++){
-           child = Field (v, i);
--        mark_again:
-           if (Is_block (child) && Is_in_heap (child)) {
-             hd = Hd_val(child);
-             if (Tag_hd (hd) == Forward_tag){
--              child = Forward_val (child);
--              Field (v, i) = child;
--              goto mark_again;
-+              Field (v, i) = Forward_val (child);
-             }
--            if (Tag_hd(hd) == Infix_tag) {
-+            else if (Tag_hd(hd) == Infix_tag) {
-               child -= Infix_offset_val(child);
-               hd = Hd_val(child);
-             }@@ -192,15 +189,13 @@
-           sz = Wosize_hd (hd);
-           for (i = 1; i < sz; i++){
-             curfield = Field (cur, i);
--          weak_again:
--            if (curfield != 0 && Is_block (curfield) && Is_in_heap (curfield)
--                && Is_white_val (curfield)){
-+            if (curfield != 0 && Is_block (curfield) && Is_in_heap (curfield)){
-               if (Tag_val (curfield) == Forward_tag){
--                curfield = Forward_val (curfield);
--                Field (cur, i) = curfield;
--                goto weak_again;
-+                Field (cur, i) = Forward_val (curfield);
-               }
--              Field (cur, i) = 0;
-+              else if (Is_white_val (curfield)){
-+                Field (cur, i) = 0;
-+              }
-             }
-           }
-           weak_prev = &Field (cur, 0);
-
diff --git a/lang/ocaml/files/patch-camlp4-man::Makefile b/lang/ocaml/files/patch-camlp4-man::Makefile
index 370f0ef7af80..f76e5f3ec611 100644
--- a/lang/ocaml/files/patch-camlp4-man::Makefile
+++ b/lang/ocaml/files/patch-camlp4-man::Makefile
@@ -12,8 +12,8 @@
 -	-cd $(MANDIR)/man1; rm -f ocpp.1; ln -s $(TARGET) ocpp.1
 -	-cd $(MANDIR)/man1; rm -f camlp4o.opt.1; ln -s $(TARGET) camlp4o.opt.1
 -	-cd $(MANDIR)/man1; rm -f camlp4r.opt.1; ln -s $(TARGET) camlp4r.opt.1
-+	-$(MKDIR) $(MANDIR)
-+	-cp $(TARGET) $(MANDIR)/.
++	-$(MKDIR) $(MANDIR)/man1
++	-cp $(TARGET) $(MANDIR)/man1/.
  
  camlp4.1: camlp4.1.tpl
  	sed -e "s'LIBDIR'$(LIBDIR)'g" camlp4.1.tpl > camlp4.1
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 69057b7e09c8..b9be3c724dd1 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -611,7 +611,6 @@ lib/ocaml/ocamldoc/odoc_analyse.cmi
 lib/ocaml/ocamldoc/odoc.cmi
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc_info.cma
-lib/ocaml/ocamldoc/odoc_args.mli
 lib/ocaml/ocamldoc/odoc_info.mli
 lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_info.a
@@ -1096,8 +1095,8 @@ share/doc/ocaml/LICENSE
 %%PORTDOCS%%share/doc/ocaml/html/next_motif.gif
 %%PORTDOCS%%share/doc/ocaml/html/previous_motif.gif
 %%PORTDOCS%%share/doc/ocaml/html/libgraph.gif
-%%PORTDOCS%%share/doc/ocaml/ocaml-3.05-refman.ps.gz
-%%PORTDOCS%%share/doc/ocaml/ocaml-3.05-refman.pdf
+%%PORTDOCS%%share/doc/ocaml/ocaml-3.06-refman.ps.gz
+%%PORTDOCS%%share/doc/ocaml/ocaml-3.06-refman.pdf
 @dirrm lib/ocaml/stublibs
 @dirrm lib/ocaml/caml
 @dirrm lib/ocaml/threads