Update of lang/ocaml to its newest version, 4.01. Changes, apart from

bugfixes, include:

- Labltk: updated to Tcl/Tk 8.6.
Type system:
- use well-disciplined type information propagation to
  disambiguate label and constructor names
* Propagate type information towards pattern-matching, even in the presence of
  polymorphic variants (discarding only information about possibly-present
  constructors). As a result, matching against absent constructors is no longer
  allowed for exact and fixed polymorphic variant types.
* Reject multiple declarations of the same method or instance variable
  in an object
- raise an error when multiple private keywords are used in type
  declarations
- parsetree rewriter (-ppx flag)
- ocamldep now supports -absname
- On "unbound identifier" errors, use spell-checking to suggest names
  present in the environment
- ocamlc has a new option -dsource to visualize the parsetree
- tools/eqparsetree compares two parsetree ignoring location
- ocamlopt now uses clang as assembler on OS X if available, which enables
  CFI support for OS X.
- Added a new -short-paths option, which attempts to use the shortest
  representation for type constructors inside types, taking open modules
  into account. This can make types much more readable if your code
  uses lots of functors.
- added flag -compat-32 to ocamlc, ensuring that the generated
  bytecode executable can be loaded on 32-bit hosts.
- warning on open statements which shadow an existing
  identifier (if it is actually used in the scope of the open); new
  open! syntax to silence it locally
* warning 3 is extended to warn about other deprecated features:
  - ISO-latin1 characters in identifiers
  - uses of the (&) and (or) operators instead of (&&) and (||)
- Experimental OCAMLPARAM for ocamlc and ocamlopt
- incorrect ordinal number in error message
- add signature to Tstr_include
- expose a way to inspect the current call stack,
  Printexc.get_callstack
- new flag Marshal.Compat_32 for the serialization functions
  (Marshal.to_*), forcing the output to be readable on 32-bit hosts.
- infix application operators |> and @@ in Pervasives
- add O_CLOEXEC flag to Unix.openfile, so that the returned
  file descriptor is created in close-on-exec mode
* more efficient implementation of caml_modify() and caml_initialize().
  The new implementations are less lenient than the old ones: now,
  the destination pointer of caml_modify() must point within the minor or
  major heaps, and the destination pointer of caml_initialize() must
  point within the major heap.
- Moved debugger/envaux.ml to typing/envaux.ml to publish env_of_only_summary
  as part of compilerlibs, to be used on bin-annot files.
- The test suite can now be run without installing OCaml first.

6 files changed, 65 insertions, 124 deletions

diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index 3312428669c..33e276a33bd 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2012/12/04 13:55:23 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.3 2013/11/01 10:47:50 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
---- Makefile.orig	2012-09-17 16:23:06.000000000 +0000
+--- Makefile.orig	2013-06-17 13:15:18.000000000 +0000
 +++ Makefile
-@@ -172,8 +172,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c
+@@ -174,8 +174,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c
  # Start up the system from the distribution compiler
  coldstart:
  	cd byterun; $(MAKE) all
@@ -14,7 +14,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cp yacc/ocamlyacc$(EXE) boot/ocamlyacc$(EXE)
  	cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all
  	cd stdlib; cp $(LIBFILES) ../boot
-@@ -263,26 +265,26 @@ base.opt: checkstack runtime core ocaml 
+@@ -265,29 +267,29 @@ base.opt: checkstack runtime core ocaml 
  COMPLIBDIR=$(LIBDIR)/compiler-libs
  
  install:
@@ -42,20 +42,23 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cd stdlib; $(MAKE) install
 -	cp lex/ocamllex $(BINDIR)/ocamllex$(EXE)
 -	cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
--	cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi toplevel/*.cmi $(COMPLIBDIR)
--	cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) $(COMPLIBDIR)
--	cp expunge $(LIBDIR)/expunge$(EXE)
--	cp toplevel/topdirs.cmi $(LIBDIR)
+-	cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
 +	$(BSD_INSTALL_SCRIPT) lex/ocamllex $(BINDIR)/ocamllex$(EXE)
 +	$(BSD_INSTALL_PROGRAM) yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
-+	$(BSD_INSTALL_DATA) utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi toplevel/*.cmi $(COMPLIBDIR)
-+	$(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) $(COMPLIBDIR)
++	$(BSD_INSTALL_DATA) utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
+ 	   toplevel/*.cmi $(COMPLIBDIR)
+-	cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
++	$(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
+ 	   compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
+ 	   $(COMPLIBDIR)
+-	cp expunge $(LIBDIR)/expunge$(EXE)
+-	cp toplevel/topdirs.cmi $(LIBDIR)
 +	$(BSD_INSTALL_SCRIPT) expunge $(LIBDIR)/expunge$(EXE)
 +	$(BSD_INSTALL_DATA) toplevel/topdirs.cmi $(LIBDIR)
  	cd tools; $(MAKE) install
  	-cd man; $(MAKE) install
  	for i in $(OTHERLIBRARIES); do \
-@@ -292,17 +294,17 @@ install:
+@@ -297,17 +299,17 @@ install:
  	if test -f ocamlopt; then $(MAKE) installopt; else :; fi
  	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
  	   else :; fi
@@ -77,7 +80,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cd ocamldoc; $(MAKE) installopt
  	for i in $(OTHERLIBRARIES); \
  	  do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
-@@ -310,10 +312,10 @@ installopt:
+@@ -315,10 +317,10 @@ installopt:
  	cd tools; $(MAKE) installopt
  
  installoptopt:
@@ -89,6 +92,6 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
 +	$(BSD_INSTALL_PROGRAM) ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
 +	$(BSD_INSTALL_PROGRAM) lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
 +	$(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
-            compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
-            compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
-            $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
+ 	   compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
+ 	   compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
+ 	   $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile
index fbe3d439247..06608d716a2 100644
--- a/lang/ocaml/patches/patch-asmrun_Makefile
+++ b/lang/ocaml/patches/patch-asmrun_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-asmrun_Makefile,v 1.1 2012/10/08 15:05:32 jaapb Exp $
+$NetBSD: patch-asmrun_Makefile,v 1.2 2013/11/01 10:47:50 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- asmrun/Makefile.orig	2012-05-24 16:17:19.000000000 +0000
+--- asmrun/Makefile.orig	2013-06-24 08:16:27.000000000 +0000
 +++ asmrun/Makefile
-@@ -65,14 +65,14 @@ libasmrunp.a: $(POBJS)
+@@ -63,14 +63,14 @@ libasmrunp.a: $(POBJS)
  install: install-default install-$(RUNTIMED) install-$(PROFILING)
  
  install-default:
@@ -20,7 +20,7 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	cd $(LIBDIR); $(RANLIB) libasmrund.a
  .PHONY: install-runtimed
  
-@@ -80,7 +80,7 @@ install-noprof:
+@@ -78,7 +78,7 @@ install-noprof:
  	rm -f $(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(LIBDIR)/libasmrunp.a
  
  install-prof:
@@ -28,4 +28,4 @@ Use BSD_INSTALL_* instead of mkdir and cp
 +	$(BSD_INSTALL_DATA) libasmrunp.a $(LIBDIR)/libasmrunp.a
  	cd $(LIBDIR); $(RANLIB) libasmrunp.a
  
- power.o: power-$(SYSTEM).o
+ power-bsd_elf.S: power-elf.S
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index fe313970a33..9e1d78e89e8 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,82 +1,18 @@
-$NetBSD: patch-configure,v 1.5 2013/10/27 20:34:00 joerg Exp $
+$NetBSD: patch-configure,v 1.6 2013/11/01 10:47:50 jaapb Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
-
---- configure.orig	2012-06-26 15:33:50.000000000 +0000
+--- configure.orig	2013-07-23 14:48:47.000000000 +0000
 +++ configure
-@@ -267,14 +267,14 @@ iflexdir=""
- case "$bytecc,$host" in
-   cc,*-*-nextstep*)
-     # GNU C extensions disabled, but __GNUC__ still defined!
--    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
-+    bytecccompopts="$gcc_warnings -U__GNUC__ -posix"
-     bytecclinkopts="-posix";;
-   *,*-*-rhapsody*)
-     # Almost the same as NeXTStep
--    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
-+    bytecccompopts="$gcc_warnings -DSHRINKED_GNUC"
-     mathlib="";;
-   *,*-*-darwin*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$gcc_warnings"
-     mathlib=""
-     # Tell gcc that we can use 32-bit code addresses for threaded code
-     # unless we are compiled for a shared library (-fPIC option)
-@@ -282,11 +282,11 @@ case "$bytecc,$host" in
-     echo "#  define ARCH_CODE32" >> m.h
-     echo "#endif" >> m.h;;
-   *,*-*-beos*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$gcc_warnings"
-     # No -lm library
-     mathlib="";;
-   gcc,alpha*-*-osf*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$gcc_warnings"
-     if cc="$bytecc" sh ./hasgot -mieee; then
-       bytecccompopts="-mieee $bytecccompopts";
-     fi
-@@ -314,11 +314,11 @@ case "$bytecc,$host" in
-     bytecccompopts="-DUMK";;
-   gcc*,powerpc-*-aix*)
-     # Avoid name-space pollution by requiring Unix98-conformant includes
--    bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
-+    bytecccompopts="$gcc_warnings -D_XOPEN_SOURCE=500";;
-   *,powerpc-*-aix*)
-     bytecccompopts="-D_XOPEN_SOURCE=500";;
-   gcc*,*-*-cygwin*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
-+    bytecccompopts="$gcc_warnings -U_WIN32"
-     dllccompopts="-U_WIN32 -DCAML_DLL"
-     if test $withsharedlibs = yes; then
-       flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216"
-@@ -335,14 +335,14 @@ case "$bytecc,$host" in
-     exe=".exe"
-     ostype="Cygwin";;
-   gcc*,x86_64-*-linux*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$gcc_warnings"
-     # Tell gcc that we can use 32-bit code addresses for threaded code
-     # unless we are compiled for a shared library (-fPIC option)
-     echo "#ifndef __PIC__" >> m.h
-     echo "#  define ARCH_CODE32" >> m.h
-     echo "#endif" >> m.h;;
-   gcc*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings";;
-+    bytecccompopts="$gcc_warnings";;
- esac
- 
- # Configure compiler to use in further tests
-@@ -537,7 +537,7 @@ if test $withsharedlibs = "yes"; then
+@@ -542,7 +542,7 @@ if test $withsharedlibs = "yes"; then
        mksharedlib="$flexlink"
        mkmaindll="$flexlink -maindll"
        shared_libraries_supported=true;;
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
-+    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly)
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
++    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly)
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -633,7 +633,7 @@ if test $withsharedlibs = "yes"; then
+@@ -638,7 +638,7 @@ if test $withsharedlibs = "yes"; then
      x86_64-*-linux*)              natdynlink=true;;
      i[3456]86-*-darwin[89].*)     natdynlink=true;;
      i[3456]86-*-darwin*)
@@ -85,7 +21,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
          natdynlink=true
        fi;;
      x86_64-*-darwin*)             natdynlink=true;;
-@@ -647,6 +647,8 @@ if test $withsharedlibs = "yes"; then
+@@ -652,6 +652,8 @@ if test $withsharedlibs = "yes"; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[345]86-*-netbsd*)           natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -94,7 +30,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      i386-*-gnu0.3)                natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
    esac
-@@ -672,6 +674,7 @@ case "$host" in
+@@ -677,6 +679,7 @@ case "$host" in
    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`;;
@@ -102,7 +38,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
-@@ -680,6 +683,7 @@ case "$host" in
+@@ -685,6 +688,7 @@ case "$host" in
                                  fi;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
@@ -110,15 +46,15 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -691,6 +695,7 @@ case "$host" in
+@@ -697,6 +701,7 @@ case "$host" in
    powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
    powerpc-*-darwin*)            arch=power; system=rhapsody
-                                 if $arch64; then model=ppc64; else model=ppc; fi;;
-+  arm*-*-netbsd*)               arch=arm; system=netbsd;;
+                                 if $arch64;then model=ppc64;else model=ppc;fi;;
++	arm*-*-netbsd)								arch=arm; system=netbsd;;
+   armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
    arm*-*-linux-gnueabihf)       arch=arm; system=linux_eabihf;;
    armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;
-   armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
-@@ -702,6 +707,8 @@ case "$host" in
+@@ -709,6 +714,8 @@ case "$host" in
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
@@ -127,7 +63,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
    x86_64-*-darwin*)             arch=amd64; system=macosx;;
  esac
-@@ -736,7 +743,7 @@ case "$arch,$nativecc,$system,$host_type
+@@ -745,7 +752,7 @@ case "$arch,$nativecc,$system,$host_type
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -136,7 +72,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
  esac
  
-@@ -751,8 +758,8 @@ case "$arch,$model,$system" in
+@@ -765,8 +772,8 @@ case "$arch,$model,$system" in
                      aspp='gcc -c';;
    arm,*,*)          as='as';
                      aspp='gcc -c';;
@@ -147,7 +83,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    i386,*,*)         as='as'
                      aspp='gcc -c';;
    power,*,elf)      as='as -u -m ppc'
-@@ -786,6 +793,8 @@ case "$arch,$model,$system" in
+@@ -800,6 +807,8 @@ case "$arch,$model,$system" in
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
    arm,*,linux*) profiling='prof';;
@@ -156,7 +92,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *) profiling='noprof';;
  esac
  
-@@ -1244,6 +1253,8 @@ fi
+@@ -1258,6 +1267,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -165,7 +101,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
  if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
    if pkg-config --exists x11 2>/dev/null; then
      x11_include=`pkg-config --cflags x11`
-@@ -1290,6 +1301,7 @@ if test "$x11_include" = "not found"; th
+@@ -1304,6 +1315,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -173,7 +109,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1347,6 +1359,7 @@ if test "$x11_include" = "not found"; th
+@@ -1361,6 +1373,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -181,7 +117,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1368,18 +1381,16 @@ if test "$x11_include" = "not found"; th
+@@ -1382,18 +1395,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else
diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile
index 7c685682267..48ec0ae28dd 100644
--- a/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile
@@ -1,16 +1,18 @@
-$NetBSD: patch-otherlibs_labltk_camltk_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $
+$NetBSD: patch-otherlibs_labltk_camltk_Makefile,v 1.2 2013/11/01 10:47:50 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- otherlibs/labltk/camltk/Makefile.orig	2011-07-27 14:17:02.000000000 +0000
+--- otherlibs/labltk/camltk/Makefile.orig	2013-03-19 17:49:49.000000000 +0000
 +++ otherlibs/labltk/camltk/Makefile
-@@ -35,13 +35,13 @@ clean:
- 	$(MAKE) -f Makefile.gen clean
+@@ -32,14 +32,14 @@ camltkobjs: $(CAMLTKOBJS)
+ camltkobjsx: $(CAMLTKOBJSX)
  
  install:
 -	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+-	cp $(CAMLTKOBJS:.cmo=.cmi) $(INSTALLDIR)
+-	cp $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
 +	if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi
-+	$(BSD_INSTALL_DATA) $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
++	$(BSD_INSTALL_DATA) $(CAMLTKOBJS:.cmo=.cmi) $(INSTALLDIR)
++	$(BSD_INSTALL_DATA) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
  	chmod 644 $(INSTALLDIR)/*.cmi
  
  installopt:
@@ -20,4 +22,4 @@ Use BSD_INSTALL_* instead of mkdir and cp
 +	$(BSD_INSTALL_DATA) $(CAMLTKOBJSX) $(INSTALLDIR)
  	chmod 644 $(INSTALLDIR)/*.cmx
  
- .SUFFIXES :
+ clean:
diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
index 2bf0b0cbd40..08564aca688 100644
--- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
@@ -1,23 +1,22 @@
-$NetBSD: patch-otherlibs_threads_Makefile,v 1.2 2013/02/18 16:29:28 jaapb Exp $
+$NetBSD: patch-otherlibs_threads_Makefile,v 1.3 2013/11/01 10:47:50 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- otherlibs/threads/Makefile.orig	2012-08-21 04:39:34.000000000 +0000
+--- otherlibs/threads/Makefile.orig	2013-07-23 14:48:47.000000000 +0000
 +++ otherlibs/threads/Makefile
-@@ -98,12 +98,12 @@ clean: partialclean
- 	rm -f pervasives.mli marshal.mli unix.mli
+@@ -97,12 +97,12 @@ clean: partialclean
  
  install:
--	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
+ 	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
 -	mkdir -p $(LIBDIR)/vmthreads
 -	cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
-+	if test -f dllvmthreads.so; then $(BSD_INSTALL_LIB) dllvmthreads.so $(STUBLIBDIR)/.; fi
 +	$(BSD_INSTALL_DATA_DIR) -p $(LIBDIR)/vmthreads
 +	$(BSD_INSTALL_DATA) libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
  	cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
--	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)/vmthreads
-+	$(BSD_INSTALL_DATA) thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
-+	$(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)/vmthreads
+-	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
++	$(BSD_INSTALL_DATA) thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
+ 	   threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
+-	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
++	$(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
+ 	   $(LIBDIR)/vmthreads
  
  installopt:
- 
diff --git a/lang/ocaml/patches/patch-tools_ocamlmklib b/lang/ocaml/patches/patch-tools_ocamlmklib
index e55a78405f3..df9a97fda46 100644
--- a/lang/ocaml/patches/patch-tools_ocamlmklib
+++ b/lang/ocaml/patches/patch-tools_ocamlmklib
@@ -1,5 +1,6 @@
-$NetBSD: patch-tools_ocamlmklib,v 1.1 2013/03/14 14:29:49 is Exp $
+$NetBSD: patch-tools_ocamlmklib,v 1.2 2013/11/01 10:47:50 jaapb Exp $
 
+Add elfmode parameter to ocamlmklib
 --- tools/ocamlmklib.mlp.orig	2012-07-17 18:25:54.000000000 +0000
 +++ tools/ocamlmklib.mlp
 @@ -26,6 +26,7 @@ and c_objs = ref []         (* .o, .a, .