Updated lang/ocaml to newest version 4.02.2. Changes apart from bugfixes

include:
- #6583: add a new class of binary operators with the same syntactic
  precedence as method calls; these operators start with # followed
  by a non-empty sequence of operator symbols (for instance #+, #!?).
  It is also possible to use '#' as part of these extra symbols
  (for instance ##, or #+#); this is rejected by the type-checker,
  but can be used e.g. by ppx rewriters.
* #6016: add a "nonrec" keyword for type declarations
- #6600: make -short-paths faster by building the printing map
  incrementally
- #6642: replace $CAMLORIGIN in -ccopt with the path to cma or cmxa
  to output an object file with included runtime and autolink libraries
- #6845: -no-check-prims to tell ocamlc not to check primitives in runtime
- G#149: Attach documentation comments to parse tree
- G#159: Better locations for structure/signature items
- #5958: generalized polymorphic #install_printer
- #6237: explicit "infer" tag to control or disable menhir --infer
- #6625: pass -linkpkg to files built with -output-obj.
- #6712: Ignore common VCS directories
- #6720: pass -g to C compilers when tag 'debug' is set
- #6733: add .byte.so and .native.so targets to pass
  -output-obj -cclib -shared.
- #6733: "runtime_variant(X)" to pass -runtime-variant X option.
- #6774: new menhir-specific flags "only_tokens" and "external_tokens(Foo)"
- #6285: Add support for nanosecond precision in Unix.stat()
- #6781: Add higher baud rates to Unix termios
- #6834: Add Obj.{first,last}_non_constant_constructor_tag
- #6078: Release the runtime system when calling caml_dlopen
- #6675: GC hooks
- #5418 (comments) : generate dependencies with $(CC) instead of gcc
- #6266: Cross compilation for iOs, Android etc
- Update instructions for x86-64 PIC mode and POWER architecture builds
- #6452, G#140: add internal suport for custom printing formats
- #6641: add -g, -ocamlcflags, -ocamloptflags options to ocamlmklib
- #6693: also build libasmrun_shared.so and lib{asm,caml}run_pic.a
- #6842: export Typemod.modtype_of_package
- G#139: more versatile specification of locations of .annot
- G#157: store the path of cmos inside debug section at link time
- G#191: Making gc.h and some part of memory.h public

13 files changed, 107 insertions, 146 deletions

diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index d6228d90a4c..07ff4356999 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.4 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.5 2015/06/30 11:08:47 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
---- Makefile.orig	2014-08-06 11:58:44.000000000 +0000
+--- Makefile.orig	2015-06-10 09:27:36.000000000 +0000
 +++ Makefile
-@@ -184,8 +184,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c
+@@ -186,8 +186,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
-@@ -300,31 +302,31 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
+@@ -302,31 +304,31 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
  
  install:
  	if test -d $(INSTALL_BINDIR); then : ; \
@@ -43,10 +43,10 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
 +	$(BSD_INSTALL_SCRIPT) ocaml $(INSTALL_BINDIR)/ocaml$(EXE)
  	cd stdlib; $(MAKE) install
 -	cp lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE)
--	cp yacc/ocamlyacc$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
+-	cp $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
 -	cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
 +	$(BSD_INSTALL_SCRIPT) lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE)
-+	$(BSD_INSTALL_SCRIPT) yacc/ocamlyacc$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
++	$(BSD_INSTALL_SCRIPT) $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
 +	$(BSD_INSTALL_DATA) utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
  	   toplevel/*.cmi $(INSTALL_COMPLIBDIR)
 -	cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
@@ -60,7 +60,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cd tools; $(MAKE) install
  	-cd man; $(MAKE) install
  	for i in $(OTHERLIBRARIES); do \
-@@ -335,16 +337,16 @@ install:
+@@ -337,16 +339,16 @@ install:
  	   else :; fi
  	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \
  	   else :; fi
@@ -81,7 +81,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \
  		else :; fi
  	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \
-@@ -355,10 +357,10 @@ installopt:
+@@ -357,10 +359,10 @@ installopt:
  	cd tools; $(MAKE) installopt
  
  installoptopt:
diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile
index 8c6859eb6e7..afcdf8ed748 100644
--- a/lang/ocaml/patches/patch-asmrun_Makefile
+++ b/lang/ocaml/patches/patch-asmrun_Makefile
@@ -1,17 +1,18 @@
-$NetBSD: patch-asmrun_Makefile,v 1.3 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-asmrun_Makefile,v 1.4 2015/06/30 11:08:47 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- asmrun/Makefile.orig	2014-04-12 10:17:02.000000000 +0000
+--- asmrun/Makefile.orig	2015-05-19 09:48:34.000000000 +0000
 +++ asmrun/Makefile
-@@ -65,14 +65,14 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
- install: install-default install-$(RUNTIMED) install-$(PROFILING)
+@@ -79,7 +79,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
+ install: install-default install-$(RUNTIMED) install-$(PROFILING) install-$(SHARED)
  
  install-default:
 -	cp libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a
 +	$(BSD_INSTALL_DATA) libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a
  	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrun.a
+ .PHONY: install-default
  
- install-noruntimed:
+@@ -87,7 +87,7 @@ install-noruntimed:
  .PHONY: install-noruntimed
  
  install-runtimed:
@@ -20,12 +21,12 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrund.a
  .PHONY: install-runtimed
  
-@@ -81,7 +81,7 @@ install-noprof:
- 	ln -s libasmrun.a $(INSTALL_LIBDIR)/libasmrunp.a
+@@ -97,7 +97,7 @@ install-noprof:
+ .PHONY: install-noprof
  
  install-prof:
 -	cp libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a
 +	$(BSD_INSTALL_DATA) libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a
  	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrunp.a
+ .PHONY: install-prof
  
- power-bsd_elf.S: power-elf.S
diff --git a/lang/ocaml/patches/patch-asmrun_signals_osdep.h b/lang/ocaml/patches/patch-asmrun_signals_osdep.h
index 22624a88a7a..86550c800bf 100644
--- a/lang/ocaml/patches/patch-asmrun_signals_osdep.h
+++ b/lang/ocaml/patches/patch-asmrun_signals_osdep.h
@@ -1,14 +1,13 @@
-$NetBSD: patch-asmrun_signals_osdep.h,v 1.5 2015/04/17 09:12:12 jaapb Exp $
+$NetBSD: patch-asmrun_signals_osdep.h,v 1.6 2015/06/30 11:08:47 jaapb Exp $
 
 Use correct data structures for power architecture; also do signal
-handling correctly for i386/NetBSD.
-
+handling correctly for i386 and amd64/NetBSD.
+ 
 First hunk taken from upstream tracker at:
   http://caml.inria.fr/mantis/view.php?id=6772
-
---- asmrun/signals_osdep.h.orig	2014-09-28 19:46:24.000000000 +0000
+--- asmrun/signals_osdep.h.orig	2015-05-06 15:18:50.000000000 +0000
 +++ asmrun/signals_osdep.h
-@@ -146,6 +146,23 @@
+@@ -135,6 +135,23 @@
   #define CONTEXT_YOUNG_PTR (context->sc_r15)
   #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
  
@@ -32,35 +31,7 @@ First hunk taken from upstream tracker at:
  /****************** I386, Linux */
  
  #elif defined(TARGET_i386) && defined(SYS_linux_elf)
-@@ -163,14 +180,24 @@
- 
- #elif defined(TARGET_i386) && defined(SYS_bsd_elf)
- 
-- #define DECLARE_SIGNAL_HANDLER(name) \
-- static void name(int sig, siginfo_t * info, struct sigcontext * context)
-+ #if defined (__NetBSD__)
-+  #include <ucontext.h>
-+  #define DECLARE_SIGNAL_HANDLER(name) \
-+  static void name(int sig, siginfo_t * info, ucontext_t * context)
-+ #else
-+  #define DECLARE_SIGNAL_HANDLER(name) \
-+  static void name(int sig, siginfo_t * info, struct sigcontext * context)
-+ #endif
- 
-  #define SET_SIGACT(sigact,name) \
-  sigact.sa_sigaction = (void (*)(int,siginfo_t *,void *)) (name); \
-  sigact.sa_flags = SA_SIGINFO
- 
-- #define CONTEXT_PC (context->sc_eip)
-+ #if defined (__NetBSD__)
-+  #define CONTEXT_PC (_UC_MACHINE_PC(context))
-+ #else
-+  #define CONTEXT_PC (context->sc_eip)
-+ #endif
-  #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
- 
- /****************** I386, BSD */
-@@ -278,12 +305,21 @@
+@@ -277,12 +294,21 @@
       sigact.sa_handler = (void (*)(int)) (name); \
       sigact.sa_flags = 0
  
diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile
index 291ec3a3af2..5e36a973257 100644
--- a/lang/ocaml/patches/patch-byterun_Makefile
+++ b/lang/ocaml/patches/patch-byterun_Makefile
@@ -1,23 +1,23 @@
-$NetBSD: patch-byterun_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-byterun_Makefile,v 1.3 2015/06/30 11:08:47 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- byterun/Makefile.orig	2014-04-07 07:06:17.000000000 +0000
+--- byterun/Makefile.orig	2015-05-10 05:45:57.000000000 +0000
 +++ byterun/Makefile
 @@ -13,7 +13,7 @@
  
  include Makefile.common
  
--CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
-+CFLAGS+=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
+-CFLAGS=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
++CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
  DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR)
  
  OBJS=$(COMMONOBJS) $(UNIX_OR_WIN32).o main.o
-@@ -46,7 +46,7 @@ libcamlrun_shared.so: $(PICOBJS)
+@@ -57,7 +57,7 @@ install-noshared:
+ .PHONY: install-noshared
  
- install::
- 	if test -f libcamlrun_shared.so; then \
--	  cp libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so; fi
-+	  $(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so; fi
- 
- clean::
- 	rm -f libcamlrun_shared.so
+ install-shared:
+-	cp libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so
++	$(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so
+ 	cp libcamlrun_pic.a $(INSTALL_LIBDIR)/libcamlrun_pic.a
+ 	cd $(INSTALL_LIBDIR); $(RANLIB) libcamlrun_pic.a
+ .PHONY: install-shared
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 485a18d8951..9e21b0ca1a2 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,10 +1,9 @@
-$NetBSD: patch-configure,v 1.10 2015/03/17 14:14:43 jperkin Exp $
+$NetBSD: patch-configure,v 1.11 2015/06/30 11:08:47 jaapb Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
-
---- configure.orig	2014-10-03 19:25:46.000000000 +0000
+--- configure.orig	2015-05-12 14:46:37.000000000 +0000
 +++ configure
-@@ -318,11 +318,11 @@ TOOLCHAIN="cc"
+@@ -328,11 +328,11 @@ TOOLCHAIN="cc"
  case "$bytecc,$target" in
    cc,*-*-nextstep*)
      # GNU C extensions disabled, but __GNUC__ still defined!
@@ -18,7 +17,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      mathlib="";;
    *,*-*-darwin*)
      bytecccompopts="$gcc_warnings"
-@@ -334,15 +334,15 @@ case "$bytecc,$target" in
+@@ -344,15 +344,15 @@ case "$bytecc,$target" in
      echo "#  define ARCH_CODE32" >> m.h
      echo "#endif" >> m.h;;
    *,*-*-haiku*)
@@ -37,7 +36,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      if cc="$bytecc" sh ./hasgot -mieee; then
        bytecccompopts="-mieee $bytecccompopts";
      fi
-@@ -370,11 +370,11 @@ case "$bytecc,$target" in
+@@ -380,7 +380,7 @@ case "$bytecc,$target" in
      bytecccompopts="-DUMK";;
    *gcc*,powerpc-*-aix*)
      # Avoid name-space pollution by requiring Unix98-conformant includes
@@ -46,12 +45,16 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *,powerpc-*-aix*)
      bytecccompopts="-D_XOPEN_SOURCE=500";;
    *gcc*,*-*-cygwin*)
+@@ -389,7 +389,7 @@ case "$bytecc,$target" in
+       x86_64-*) flavor=cygwin64;;
+       *) err "unknown cygwin variant";;
+     esac
 -    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
 +    bytecccompopts="$gcc_warnings -U_WIN32"
      dllccompopts="-U_WIN32 -DCAML_DLL"
      if test $with_sharedlibs = yes; then
-       flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216"
-@@ -395,7 +395,7 @@ case "$bytecc,$target" in
+       flexlink="flexlink -chain $flavor -merge-manifest -stack 16777216"
+@@ -410,7 +410,7 @@ case "$bytecc,$target" in
      exe=".exe"
      ostype="Cygwin";;
    *gcc*,*-*-mingw*)
@@ -60,7 +63,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      dllccompopt="-DCAML_DLL"
      if test $with_sharedlibs = yes; then
        case "$target" in
-@@ -419,14 +419,14 @@ case "$bytecc,$target" in
+@@ -434,14 +434,14 @@ case "$bytecc,$target" in
      SO="dll"
      ;;
    *gcc*,x86_64-*-linux*)
@@ -77,7 +80,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
  esac
  
  # Configure compiler to use in further tests
-@@ -659,7 +659,7 @@ if test $with_sharedlibs = "yes"; then
+@@ -688,7 +688,7 @@ if test $with_sharedlibs = "yes"; then
        mksharedlib="$flexlink"
        mkmaindll="$flexlink -maindll"
        shared_libraries_supported=true;;
@@ -86,7 +89,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -756,7 +756,7 @@ if test $with_sharedlibs = "yes"; then
+@@ -785,7 +785,7 @@ if test $with_sharedlibs = "yes"; then
      x86_64-*-linux*)              natdynlink=true;;
      i[3456]86-*-darwin[89].*)     natdynlink=true;;
      i[3456]86-*-darwin*)
@@ -95,7 +98,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
          natdynlink=true
        fi;;
      x86_64-*-darwin*)             natdynlink=true;;
-@@ -770,6 +770,8 @@ if test $with_sharedlibs = "yes"; then
+@@ -799,6 +799,8 @@ if test $with_sharedlibs = "yes"; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[3456]86-*-netbsd*)          natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -104,7 +107,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      i386-*-gnu0.3)                natdynlink=true;;
      i[3456]86-*-haiku*)           natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
-@@ -798,6 +800,7 @@ case "$target" in
+@@ -827,6 +829,7 @@ case "$target" 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`;;
@@ -112,7 +115,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
-@@ -807,6 +810,7 @@ case "$target" in
+@@ -836,6 +839,7 @@ case "$target" in
    i[3456]86-*-haiku*)           arch=i386; system=beos;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
@@ -120,7 +123,7 @@ 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
-@@ -820,6 +824,7 @@ case "$target" in
+@@ -849,6 +853,7 @@ case "$target" in
    powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
    powerpc-*-darwin*)            arch=power; system=rhapsody
                                  if $arch64;then model=ppc64;else model=ppc;fi;;
@@ -128,7 +131,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    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;;
-@@ -835,6 +840,8 @@ case "$target" in
+@@ -864,6 +869,8 @@ case "$target" in
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
@@ -137,7 +140,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;;
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
-@@ -874,7 +881,7 @@ case "$arch,$nativecc,$system,$target" i
+@@ -903,7 +910,7 @@ case "$arch,$nativecc,$system,$target" i
                         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";;
@@ -146,7 +149,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
  esac
  
-@@ -891,7 +898,7 @@ case "$arch,$system" in
+@@ -920,7 +927,7 @@ case "$arch,$system" in
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
    i386,solaris)   as="${TOOLPREF}as"
@@ -155,7 +158,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    power,elf)      as="${TOOLPREF}as -u -m ppc"
                    aspp="${TOOLPREF}gcc -c";;
    power,rhapsody) as="${TOOLPREF}as -arch $model"
-@@ -930,6 +937,7 @@ case "$arch,$system" in
+@@ -961,6 +968,7 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
@@ -163,7 +166,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *) profiling='noprof';;
  esac
  
-@@ -1434,6 +1442,8 @@ fi
+@@ -1475,6 +1483,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -172,7 +175,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`
-@@ -1480,6 +1490,7 @@ if test "$x11_include" = "not found"; th
+@@ -1521,6 +1531,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -180,7 +183,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1537,6 +1548,7 @@ if test "$x11_include" = "not found"; th
+@@ -1578,6 +1589,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -188,7 +191,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1558,18 +1570,16 @@ if test "$x11_include" = "not found"; th
+@@ -1599,18 +1611,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-driver_main_args.ml b/lang/ocaml/patches/patch-driver_main_args.ml
index 6c12d62b279..b2f2a125dae 100644
--- a/lang/ocaml/patches/patch-driver_main_args.ml
+++ b/lang/ocaml/patches/patch-driver_main_args.ml
@@ -1,9 +1,9 @@
-$NetBSD: patch-driver_main_args.ml,v 1.1 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: patch-driver_main_args.ml,v 1.2 2015/06/30 11:08:47 jaapb Exp $
 
 pkgsrc_runtime flag
---- driver/main_args.ml.orig	2014-09-26 13:00:20.000000000 +0000
+--- driver/main_args.ml.orig	2015-05-12 15:31:26.000000000 +0000
 +++ driver/main_args.ml
-@@ -231,6 +231,10 @@ let mk_pack_opt f =
+@@ -244,6 +244,10 @@ let mk_pack_opt f =
    "-pack", Arg.Unit f, " Package the given .cmx files into one .cmx"
  ;;
  
@@ -14,24 +14,24 @@ pkgsrc_runtime flag
  let mk_pp f =
    "-pp", Arg.String f, "<command>  Pipe sources through preprocessor <command>"
  ;;
-@@ -522,6 +526,7 @@ module type Compiler_options = sig
-   val _o : string -> unit
+@@ -537,6 +541,7 @@ module type Compiler_options = sig
    val _output_obj : unit -> unit
+   val _output_complete_obj : unit -> unit
    val _pack : unit -> unit
 +  val _pkgsrc_runtime : unit -> unit
    val _pp : string -> unit
    val _principal : unit -> unit
    val _rectypes : unit -> unit
-@@ -669,6 +674,7 @@ struct
-     mk_open F._open;
+@@ -689,6 +694,7 @@ struct
      mk_output_obj F._output_obj;
+     mk_output_complete_obj F._output_complete_obj;
      mk_pack_byt F._pack;
 +    mk_pkgsrc_runtime F._pkgsrc_runtime;
      mk_pp F._pp;
      mk_ppx F._ppx;
      mk_principal F._principal;
-@@ -785,6 +791,7 @@ struct
-     mk_output_obj F._output_obj;
+@@ -807,6 +813,7 @@ struct
+     mk_output_complete_obj F._output_complete_obj;
      mk_p F._p;
      mk_pack_opt F._pack;
 +    mk_pkgsrc_runtime F._pkgsrc_runtime;
diff --git a/lang/ocaml/patches/patch-driver_main_args.mli b/lang/ocaml/patches/patch-driver_main_args.mli
index 5bdb417b21e..78ce04a12b9 100644
--- a/lang/ocaml/patches/patch-driver_main_args.mli
+++ b/lang/ocaml/patches/patch-driver_main_args.mli
@@ -1,13 +1,13 @@
-$NetBSD: patch-driver_main_args.mli,v 1.1 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: patch-driver_main_args.mli,v 1.2 2015/06/30 11:08:47 jaapb Exp $
 
 pkgsrc_runtime flag
---- driver/main_args.mli.orig	2014-09-26 13:00:20.000000000 +0000
+--- driver/main_args.mli.orig	2015-05-12 15:31:26.000000000 +0000
 +++ driver/main_args.mli
-@@ -68,6 +68,7 @@ module type Compiler_options =  sig
-   val _o : string -> unit
+@@ -70,6 +70,7 @@ module type Compiler_options =  sig
    val _output_obj : unit -> unit
+   val _output_complete_obj : unit -> unit
    val _pack : unit -> unit
-+	val _pkgsrc_runtime : unit -> unit
++  val _pkgsrc_runtime : unit -> unit
    val _pp : string -> unit
    val _principal : unit -> unit
    val _rectypes : unit -> unit
diff --git a/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml b/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml
index a38a2da6bc1..b5ec55cab20 100644
--- a/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml
+++ b/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml
@@ -1,5 +1,6 @@
-$NetBSD: patch-ocamldoc_odoc__messages.ml,v 1.1 2015/04/02 22:40:09 tnn Exp $
+$NetBSD: patch-ocamldoc_odoc__messages.ml,v 1.2 2015/06/30 11:08:47 jaapb Exp $
 
+Put man pages in section 3 rather than 3o
 --- ocamldoc/odoc_messages.ml.orig	2014-09-26 13:00:20.000000000 +0000
 +++ ocamldoc/odoc_messages.ml
 @@ -89,7 +89,7 @@ let default_man_section = "3"
diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile b/lang/ocaml/patches/patch-otherlibs_Makefile
deleted file mode 100644
index 84acd3b08eb..00000000000
--- a/lang/ocaml/patches/patch-otherlibs_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-otherlibs_Makefile,v 1.1 2014/10/13 13:24:45 jaapb Exp $
-
-Remove rule split to make x11/ocaml-graphics job easier
---- otherlibs/Makefile.orig	2014-04-12 10:17:02.000000000 +0000
-+++ otherlibs/Makefile
-@@ -14,8 +14,7 @@
- # Common Makefile for otherlibs on the Unix ports
- 
- CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib
--CAMLOPT=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlopt -nostdlib \
--        -I $(ROOTDIR)/stdlib
-+CAMLOPT=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
- CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
- 
- include ../Makefile.shared
diff --git a/lang/ocaml/patches/patch-stdlib_Makefile.shared b/lang/ocaml/patches/patch-stdlib_Makefile.shared
index b05c5b89a10..9408518d531 100644
--- a/lang/ocaml/patches/patch-stdlib_Makefile.shared
+++ b/lang/ocaml/patches/patch-stdlib_Makefile.shared
@@ -1,14 +1,14 @@
-$NetBSD: patch-stdlib_Makefile.shared,v 1.2 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-stdlib_Makefile.shared,v 1.3 2015/06/30 11:08:47 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- stdlib/Makefile.shared.orig	2014-05-12 15:37:29.000000000 +0000
+--- stdlib/Makefile.shared.orig	2015-05-12 14:46:37.000000000 +0000
 +++ stdlib/Makefile.shared
-@@ -42,7 +42,7 @@ all: stdlib.cma std_exit.cmo camlheader 
+@@ -45,7 +45,7 @@ all: stdlib.cma std_exit.cmo camlheader 
  INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
  
  install: install-$(RUNTIMED)
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-+	$(BSD_INSTALL_DATA) stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader_ur \
++	$(BSD_INSTALL_DATA) stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader_ur \
  	  $(INSTALL_LIBDIR)
+ 	cp target_camlheader $(INSTALL_LIBDIR)/camlheader
  
- install-noruntimed:
diff --git a/lang/ocaml/patches/patch-tools_ocamlmklib b/lang/ocaml/patches/patch-tools_ocamlmklib
index 6ef862dfd5e..e37f4ba5644 100644
--- a/lang/ocaml/patches/patch-tools_ocamlmklib
+++ b/lang/ocaml/patches/patch-tools_ocamlmklib
@@ -1,7 +1,7 @@
-$NetBSD: patch-tools_ocamlmklib,v 1.3 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-tools_ocamlmklib,v 1.4 2015/06/30 11:08:47 jaapb Exp $
 
-Add ELF mode support to ocamlmklib 
---- tools/ocamlmklib.ml.orig	2014-04-29 11:56:17.000000000 +0000
+Add ELF mode support to ocamlmklib
+--- tools/ocamlmklib.ml.orig	2014-12-27 08:44:24.000000000 +0000
 +++ tools/ocamlmklib.ml
 @@ -25,6 +25,7 @@ and c_objs = ref []         (* .o, .a, .
  and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
@@ -10,20 +10,20 @@ Add ELF mode support to ocamlmklib
 +and elfmode = ref false     (* do not add C link lib path to run-time path *)
  and failsafe = ref false    (* whether to fall back on static build only *)
  and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
- and c_Lopts = ref []      (* options to pass to mksharedlib and ocamlc -cclib *)
-@@ -94,8 +95,9 @@ let parse_arguments argv =
+ and c_Lopts = ref []        (* options to pass to mksharedlib and ocamlc -cclib *)
+@@ -99,8 +100,9 @@ let parse_arguments argv =
        c_libs := s :: !c_libs
      else if starts_with s "-L" then
       (c_Lopts := s :: !c_Lopts;
 -      let l = chop_prefix s "-L" in
 -      if not (Filename.is_relative l) then rpath := l :: !rpath)
-+      if not !elfmode then
-+      (let l = chop_prefix s "-L" in
-+       if not (Filename.is_relative l) then rpath := l :: !rpath))
++     if not !elfmode then
++     (let l = chop_prefix s "-L" in
++      if not (Filename.is_relative l) then rpath := l :: !rpath))
+     else if s = "-ocamlcflags" then
+       ocamlc_opts := next_arg () :: !ocamlc_opts
      else if s = "-ocamlc" then
-       ocamlc := next_arg ()
-     else if s = "-ocamlopt" then
-@@ -106,6 +108,8 @@ let parse_arguments argv =
+@@ -115,6 +117,8 @@ let parse_arguments argv =
        output_c := next_arg()
      else if s = "-dllpath" || s = "-R" || s = "-rpath" then
        rpath := next_arg() :: !rpath
@@ -32,9 +32,9 @@ Add ELF mode support to ocamlmklib
      else if starts_with s "-R" then
        rpath := chop_prefix s "-R" :: !rpath
      else if s = "-Wl,-rpath" then
-@@ -150,6 +154,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
- \n  -ccopt <opt>   C option passed to ocamlc -a or ocamlopt -a only\
- \n  -custom        disable dynamic loading\
+@@ -160,6 +164,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+ \n  -custom        Disable dynamic loading\
+ \n  -g             Build with debug information\
  \n  -dllpath <dir> Add <dir> to the run-time search path for DLLs\
 +\n  -elfmode       Do not add link-time search path to run-time path\
  \n  -F<dir>        Specify a framework directory (MacOSX)\
diff --git a/lang/ocaml/patches/patch-utils_clflags.ml b/lang/ocaml/patches/patch-utils_clflags.ml
index d617bae87c1..616bdbf8b4d 100644
--- a/lang/ocaml/patches/patch-utils_clflags.ml
+++ b/lang/ocaml/patches/patch-utils_clflags.ml
@@ -1,15 +1,15 @@
-$NetBSD: patch-utils_clflags.ml,v 1.1 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: patch-utils_clflags.ml,v 1.2 2015/06/30 11:08:47 jaapb Exp $
 
 pkgsrc_runtime flag
---- utils/clflags.ml.orig	2014-08-28 16:24:52.000000000 +0000
+--- utils/clflags.ml.orig	2015-05-12 15:31:26.000000000 +0000
 +++ utils/clflags.ml
-@@ -106,7 +106,8 @@ let std_include_dir () =
+@@ -108,7 +108,8 @@ let std_include_dir () =
  let shared = ref false (* -shared *)
  let dlcode = ref true (* not -nodynlink *)
  
 -let runtime_variant = ref "";;      (* -runtime-variant *)
-+let runtime_variant = ref ""           (* -runtime-variant *)
-+let pkgsrc_runtime = ref false;;       (* -pkgsrc-runtime *)      
++let runtime_variant = ref ""        (* -runtime-variant *)
++let pkgsrc_runtime = ref false;;     (* -pkgsrc-runtime *)
  
+ let keep_docs = ref false              (* -keep-docs *)
  let keep_locs = ref false              (* -keep-locs *)
- let unsafe_string = ref true;;         (* -safe-string / -unsafe-string *)
diff --git a/lang/ocaml/patches/patch-utils_clflags.mli b/lang/ocaml/patches/patch-utils_clflags.mli
index 4c97e3816b1..61607106401 100644
--- a/lang/ocaml/patches/patch-utils_clflags.mli
+++ b/lang/ocaml/patches/patch-utils_clflags.mli
@@ -1,13 +1,13 @@
-$NetBSD: patch-utils_clflags.mli,v 1.1 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: patch-utils_clflags.mli,v 1.2 2015/06/30 11:08:47 jaapb Exp $
 
 pkgsrc_runtime flag
---- utils/clflags.mli.orig	2014-08-28 16:24:52.000000000 +0000
+--- utils/clflags.mli.orig	2015-05-12 15:31:26.000000000 +0000
 +++ utils/clflags.mli
-@@ -90,6 +90,7 @@ val std_include_dir : unit -> string lis
+@@ -92,6 +92,7 @@ val std_include_dir : unit -> string lis
  val shared : bool ref
  val dlcode : bool ref
  val runtime_variant : string ref
 +val pkgsrc_runtime : bool ref
  val force_slash : bool ref
+ val keep_docs : bool ref
  val keep_locs : bool ref
- val unsafe_string : bool ref