Update lang/ocaml to 3.09.2.

Changes from 3.09.1:
----
Bug fixes:
- Makefile: problem with "make world.opt"
- compilers: problem compiling several modules with one command line
- compilers,ocamldoc: error message that Emacs cannot parse
- compilers: crash when printing type error
- compilers: -dtypes wrong for monomorphic type variables
- compilers: wrong warning on optional arguments
- compilers: crash when wrong use of type constructor in let rec
- compilers: better wording of "statement never returns" warning
- runtime: inefficiency of signal handling
- runtime: crashes with I/O in multithread programs
- camlp4: empty file name in error messages
- camlp4: stack overflow
- otherlibs/labltk: ocamlbrowser ignores its command line options
- otherlibs/unix: Unix.times wrong under Mac OS X
- otherlibs/unix: wrong doc for execvp and execvpe
- otherlibs/win32unix: random crash in Unix.stat
- stdlib: update_mod not found under Windows
- stdlib: Filename.dirname/basename wrong on Win32
- stdlib: incomplete documentation of Pervasives.abs
- stdlib: Printf bugs
- tools/checkstack.c missing include
- yacc: crash when given argument "-"

New features:
- ported to MacOS X on Intel
- configure: added support for GNU Hurd

4 files changed, 25 insertions, 37 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 9d4b2760a41..f3b74b669c7 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/04/04 14:33:27 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/25 04:58:32 hiramatsu Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		3
-
 CONFIGURE_ARGS+=	-no-tk
 CONFIGURE_ENV+=		disable_x11=yes
 
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 7131fca2928..82e1dcebef6 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.14 2006/02/02 20:47:26 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/04/25 04:58:32 hiramatsu Exp $
 
-DISTNAME=	ocaml-3.09.1
+DISTNAME=	ocaml-3.09.2
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-3.09/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 8c657808267..983c6fc415e 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2006/02/02 20:47:26 rillig Exp $
+$NetBSD: distinfo,v 1.35 2006/04/25 04:58:32 hiramatsu Exp $
 
-SHA1 (ocaml-3.09.1.tar.bz2) = e74ceeb623494bee08effac4a4cef301e71dd496
-RMD160 (ocaml-3.09.1.tar.bz2) = 1c8f2056a0e4356d9a99561c297eb867bf96ef4f
-Size (ocaml-3.09.1.tar.bz2) = 2035552 bytes
+SHA1 (ocaml-3.09.2.tar.bz2) = 578c66707532882782735352a3628b78193da5e7
+RMD160 (ocaml-3.09.2.tar.bz2) = 45edae84e5787775a5beed29a1ad2881f4df8505
+Size (ocaml-3.09.2.tar.bz2) = 2036341 bytes
 SHA1 (patch-aa) = d498460bda5de456f4ab15b9e5e29427d58d8424
 SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
@@ -19,7 +19,7 @@ SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = 02331822fe7d87975b14f8f2294059c6d031e457
+SHA1 (patch-at) = 94b71bf6c79a875a12985852362ae939d73ca6b3
 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 75e33b8291e..5cf49bfc5cf 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,18 +1,16 @@
-$NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
-
---- configure.orig	2006-01-04 10:26:42.000000000 +0100
-+++ configure
-@@ -483,7 +483,7 @@ mksharedlibrpath=''
+--- configure.orig	2006-04-21 09:38:39.000000000 +0900
++++ configure	2006-04-21 09:49:07.000000000 +0900
+@@ -483,7 +483,7 @@
  
  if test $withsharedlibs = "yes"; then
    case "$host" in
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*)
-+    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-dragonfly*)
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*)
++    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*|*-*-netbsd*|*-*-dragonfly*)
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared -o"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -571,10 +571,12 @@ case "$host" in
-   sparc*-*-linux*)              arch=sparc; system=linux;;
+@@ -573,10 +573,12 @@
+   sparc*-*-gnu*)                arch=sparc; system=gnu;;
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
 +  i[3456]86-*-dragonfly*)       arch=i386; system=bsd_`sh ./runtest elf.c`;;
@@ -21,26 +19,18 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
 +  i[3456]86-*-interix3*)        arch=i386; system=interix3;;
+   i[3456]86-*-darwin*)          arch=i386; system=macosx;;
+   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
    mips-*-irix6*)                arch=mips; system=irix;;
-   hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
-   hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-@@ -659,6 +661,7 @@ case "$arch,$model,$system" in
-     profiling='prof'
+@@ -672,6 +674,7 @@
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
+   amd64,*,gnu) profiling='prof';;
 +  power,*,bsd) profiling='prof';;
    *) profiling='noprof';;
  esac
  
-@@ -1047,6 +1050,7 @@ if test "$pthread_wanted" = "yes"; then
-   case "$host" in
-     *-*-solaris*)  pthread_link="-lpthread -lposix4";;
-     *-*-freebsd*)  pthread_link="-pthread";;
-+    *-*-dragonfly*)  pthread_link="-pthread";;
-     *-*-openbsd*)  pthread_link="-pthread";;
-     *)             pthread_link="-lpthread";;
-   esac
-@@ -1094,6 +1098,7 @@ fi
+@@ -1107,6 +1110,7 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -48,7 +38,7 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1140,6 +1145,7 @@ do
+@@ -1153,6 +1157,7 @@
      break
    fi
  done
@@ -56,7 +46,7 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1229,31 +1235,8 @@ dbm_include="not found"
+@@ -1242,31 +1247,8 @@
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -72,7 +62,7 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
 -    elif sh ./hasgot -lgdbm dbm_open; then
 -      dbm_link="-lgdbm"
 -    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
--      dbm_link="-lgdbm_compat -lgdbm" 
+-      dbm_link="-lgdbm_compat -lgdbm"
 -    fi
 -    break
 -  fi
@@ -82,7 +72,7 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
 -    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
 -      dbm_link="-lgdbm_compat -lgdbm"
 -    fi
--    break   
+-    break
 -  fi
 -done
 +dbm_include=/usr/include
@@ -90,7 +80,7 @@ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1265,8 +1248,8 @@ else
+@@ -1278,8 +1260,8 @@
    fi
    echo "DBM_INCLUDES=$dbm_include" >> Makefile
    echo "DBM_LINK=$dbm_link" >> Makefile