Updated package lang/ocaml to version 4.06.

Changes are many and can be found at https://ocaml.org/releases/4.06.html One change that breaks a lot of packages is that the safe-string compiler option is now enabled by default, which means that all modules need to use immutable strings (or explicitly use the bytes type).
author: jaapb <jaapb@pkgsrc.org> 2018-01-10 14:30:34 +0000
committer: jaapb <jaapb@pkgsrc.org> 2018-01-10 14:30:34 +0000
commit: ed76d91cc15194db44286f7eec8d4c67155646d8 (patch)
tree: 521f4b6ec244beb413ce4fc71b4386fdfd075edd /lang/ocaml
parent: cfd1201ceb497da70f88090f5bb1ceaf30df355c (diff)
download: pkgsrc-ed76d91cc15194db44286f7eec8d4c67155646d8.tar.gz
16 files changed, 140 insertions, 293 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 41416d0bcf2..2d482c4a67d 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2017/11/15 12:52:15 gdt Exp $
+# $NetBSD: Makefile,v 1.117 2018/01/10 14:30:34 jaapb Exp $
 
+PKGREVISION= 1
 .include "Makefile.common"
 
-PKGREVISION=		2
-
 CONFIGURE_ENV+=		disable_x11=yes
 
 BUILD_TARGET=		world
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 72c93c05c83..264bb9cd36f 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.51 2017/09/08 09:12:44 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.52 2018/01/10 14:30:34 jaapb Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
-DISTNAME=	ocaml-4.05.0
+DISTNAME=	ocaml-4.06.0
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.05/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.06/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb@NetBSD.org
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 40b7dde2e09..ec9caf84217 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.44 2017/10/10 12:10:05 he Exp $
+@comment $NetBSD: PLIST,v 1.45 2018/01/10 14:30:34 jaapb Exp $
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
+bin/ocamlcmt
 bin/ocamlcp
 bin/ocamlcp.byte
 ${PLIST.ocaml-opt}bin/ocamlcp.opt
@@ -45,11 +46,6 @@ lib/ocaml/arg.ml
 lib/ocaml/arg.mli
 ${PLIST.ocaml-prof}lib/ocaml/arg.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/arg.p.cmx
-${PLIST.ocaml-opt}lib/ocaml/arith_flags.cmx
-lib/ocaml/arith_status.cmi
-lib/ocaml/arith_status.cmti
-${PLIST.ocaml-opt}lib/ocaml/arith_status.cmx
-lib/ocaml/arith_status.mli
 lib/ocaml/array.cmi
 lib/ocaml/array.cmt
 lib/ocaml/array.cmti
@@ -66,10 +62,6 @@ lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
 ${PLIST.ocaml-prof}lib/ocaml/arrayLabels.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/arrayLabels.p.cmx
-lib/ocaml/big_int.cmi
-lib/ocaml/big_int.cmti
-${PLIST.ocaml-opt}lib/ocaml/big_int.cmx
-lib/ocaml/big_int.mli
 ${PLIST.ocaml-opt}lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
@@ -142,6 +134,7 @@ lib/ocaml/caml/interp.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/io.h
 lib/ocaml/caml/jumptbl.h
+lib/ocaml/caml/m.h
 lib/ocaml/caml/major_gc.h
 lib/ocaml/caml/md5.h
 lib/ocaml/caml/memory.h
@@ -153,6 +146,7 @@ lib/ocaml/caml/prims.h
 lib/ocaml/caml/printexc.h
 lib/ocaml/caml/reverse.h
 lib/ocaml/caml/roots.h
+lib/ocaml/caml/s.h
 lib/ocaml/caml/signals.h
 lib/ocaml/caml/signals_machdep.h
 lib/ocaml/caml/socketaddr.h
@@ -169,6 +163,13 @@ lib/ocaml/caml/version.h
 lib/ocaml/caml/weak.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlinternalBigarray.cmi
+lib/ocaml/camlinternalBigarray.cmt
+${PLIST.ocaml-opt}lib/ocaml/camlinternalBigarray.cmx
+lib/ocaml/camlinternalBigarray.ml
+${PLIST.ocaml-prof}lib/ocaml/camlinternalBigarray.p.cmi
+${PLIST.ocaml-prof}lib/ocaml/camlinternalBigarray.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalBigarray.p.cmx
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
@@ -677,6 +678,11 @@ lib/ocaml/compiler-libs/interf.cmt
 lib/ocaml/compiler-libs/interf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmx
 lib/ocaml/compiler-libs/interf.mli
+lib/ocaml/compiler-libs/interval.cmi
+lib/ocaml/compiler-libs/interval.cmt
+lib/ocaml/compiler-libs/interval.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmx
+lib/ocaml/compiler-libs/interval.mli
 lib/ocaml/compiler-libs/invariant_params.cmi
 lib/ocaml/compiler-libs/invariant_params.cmt
 lib/ocaml/compiler-libs/invariant_params.cmti
@@ -712,6 +718,11 @@ lib/ocaml/compiler-libs/linkage_name.cmi
 lib/ocaml/compiler-libs/linkage_name.cmt
 lib/ocaml/compiler-libs/linkage_name.cmti
 lib/ocaml/compiler-libs/linkage_name.mli
+lib/ocaml/compiler-libs/linscan.cmi
+lib/ocaml/compiler-libs/linscan.cmt
+lib/ocaml/compiler-libs/linscan.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmx
+lib/ocaml/compiler-libs/linscan.mli
 lib/ocaml/compiler-libs/liveness.cmi
 lib/ocaml/compiler-libs/liveness.cmt
 lib/ocaml/compiler-libs/liveness.cmti
@@ -744,6 +755,11 @@ lib/ocaml/compiler-libs/main_args.cmt
 lib/ocaml/compiler-libs/main_args.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main_args.cmx
 lib/ocaml/compiler-libs/main_args.mli
+lib/ocaml/compiler-libs/makedepend.cmi
+lib/ocaml/compiler-libs/makedepend.cmt
+lib/ocaml/compiler-libs/makedepend.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/makedepend.cmx
+lib/ocaml/compiler-libs/makedepend.mli
 lib/ocaml/compiler-libs/matching.cmi
 lib/ocaml/compiler-libs/matching.cmt
 lib/ocaml/compiler-libs/matching.cmti
@@ -818,6 +834,10 @@ lib/ocaml/compiler-libs/opttopmain.mli
 lib/ocaml/compiler-libs/outcometree.cmi
 lib/ocaml/compiler-libs/outcometree.cmti
 lib/ocaml/compiler-libs/outcometree.mli
+lib/ocaml/compiler-libs/parameter.cmi
+lib/ocaml/compiler-libs/parameter.cmt
+lib/ocaml/compiler-libs/parameter.cmti
+lib/ocaml/compiler-libs/parameter.mli
 lib/ocaml/compiler-libs/parmatch.cmi
 lib/ocaml/compiler-libs/parmatch.cmt
 lib/ocaml/compiler-libs/parmatch.cmti
@@ -915,6 +935,11 @@ lib/ocaml/compiler-libs/proc.cmt
 lib/ocaml/compiler-libs/proc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmx
 lib/ocaml/compiler-libs/proc.mli
+lib/ocaml/compiler-libs/profile.cmi
+lib/ocaml/compiler-libs/profile.cmt
+lib/ocaml/compiler-libs/profile.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/profile.cmx
+lib/ocaml/compiler-libs/profile.mli
 lib/ocaml/compiler-libs/projection.cmi
 lib/ocaml/compiler-libs/projection.cmt
 lib/ocaml/compiler-libs/projection.cmti
@@ -1102,11 +1127,6 @@ lib/ocaml/compiler-libs/terminfo.cmt
 lib/ocaml/compiler-libs/terminfo.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/terminfo.cmx
 lib/ocaml/compiler-libs/terminfo.mli
-lib/ocaml/compiler-libs/timings.cmi
-lib/ocaml/compiler-libs/timings.cmt
-lib/ocaml/compiler-libs/timings.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/timings.cmx
-lib/ocaml/compiler-libs/timings.mli
 lib/ocaml/compiler-libs/topdirs.cmi
 lib/ocaml/compiler-libs/topdirs.cmt
 lib/ocaml/compiler-libs/topdirs.cmti
@@ -1350,7 +1370,6 @@ lib/ocaml/int64.ml
 lib/ocaml/int64.mli
 ${PLIST.ocaml-prof}lib/ocaml/int64.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/int64.p.cmx
-${PLIST.ocaml-opt}lib/ocaml/int_misc.cmx
 lib/ocaml/lazy.cmi
 lib/ocaml/lazy.cmt
 lib/ocaml/lazy.cmti
@@ -1377,7 +1396,6 @@ ${PLIST.ocaml-opt}lib/ocaml/libcamlrun.a
 ${PLIST.ocaml-opt}lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
 ${PLIST.ocaml-opt}lib/ocaml/libcamlstr.a
-${PLIST.ocaml-opt}lib/ocaml/libnums.a
 ${PLIST.ocaml-opt}lib/ocaml/libthreads.a
 ${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
 ${PLIST.ocaml-opt}lib/ocaml/libunix.a
@@ -1524,7 +1542,6 @@ lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.Make.3
 lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.OrderedType.3
 lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.S.3
 lib/ocaml/${PKGMANDIR}/man3/Nativeint.3
-lib/ocaml/${PKGMANDIR}/man3/Num.3
 lib/ocaml/${PKGMANDIR}/man3/Obj.3
 lib/ocaml/${PKGMANDIR}/man3/Obj.Ephemeron.3
 lib/ocaml/${PKGMANDIR}/man3/Oo.3
@@ -1595,10 +1612,6 @@ lib/ocaml/moreLabels.mli
 ${PLIST.ocaml-prof}lib/ocaml/moreLabels.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/moreLabels.p.cmx
 lib/ocaml/mutex.mli
-lib/ocaml/nat.cmi
-lib/ocaml/nat.cmti
-${PLIST.ocaml-opt}lib/ocaml/nat.cmx
-lib/ocaml/nat.mli
 lib/ocaml/nativeint.cmi
 lib/ocaml/nativeint.cmt
 lib/ocaml/nativeint.cmti
@@ -1607,14 +1620,6 @@ lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
 ${PLIST.ocaml-prof}lib/ocaml/nativeint.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/nativeint.p.cmx
-lib/ocaml/num.cmi
-lib/ocaml/num.cmti
-${PLIST.ocaml-opt}lib/ocaml/num.cmx
-lib/ocaml/num.mli
-${PLIST.ocaml-opt}lib/ocaml/nums.a
-lib/ocaml/nums.cma
-${PLIST.ocaml-opt}lib/ocaml/nums.cmxa
-${PLIST.ocaml-nat}lib/ocaml/nums.cmxs
 lib/ocaml/obj.cmi
 lib/ocaml/obj.cmt
 lib/ocaml/obj.cmti
@@ -1788,10 +1793,6 @@ lib/ocaml/random.ml
 lib/ocaml/random.mli
 ${PLIST.ocaml-prof}lib/ocaml/random.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/random.p.cmx
-lib/ocaml/ratio.cmi
-lib/ocaml/ratio.cmti
-${PLIST.ocaml-opt}lib/ocaml/ratio.cmx
-lib/ocaml/ratio.mli
 ${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.a
 ${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cma
 ${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmi
@@ -1895,7 +1896,6 @@ ${PLIST.ocaml-prof}lib/ocaml/stringLabels.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stringLabels.p.cmx
 ${PLIST.ocaml-stub}lib/ocaml/stublibs/dllbigarray.so
 ${PLIST.ocaml-stub}lib/ocaml/stublibs/dllcamlstr.so
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllnums.so
 ${PLIST.ocaml-stub}lib/ocaml/stublibs/dllthreads.so
 ${PLIST.ocaml-stub}lib/ocaml/stublibs/dllunix.so
 ${PLIST.ocaml-stub}lib/ocaml/stublibs/dllvmthreads.so
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index f7fc419280a..237df400488 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.42 2018/01/07 13:04:20 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2018/01/10 14:30:34 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.05.0
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.05.0
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.06.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.06.0nb1
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 13aa9099b8e..6e08180e422 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,34 +1,31 @@
-$NetBSD: distinfo,v 1.114 2017/11/15 12:52:15 gdt Exp $
+$NetBSD: distinfo,v 1.115 2018/01/10 14:30:34 jaapb Exp $
 
-SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb
-RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c
-SHA512 (ocaml-4.05.0.tar.gz) = 9ad68932d7ae9e33fa0f84da7288c47d518d1ef367204f6415caee000feeb8fae2ea079b1d9fa780e9470608df9e030632f4377d320236d0389991aceec94b69
-Size (ocaml-4.05.0.tar.gz) = 3913079 bytes
-SHA1 (patch-Makefile) = 557a2a34d09e7c063b34d9b97b4e3d1a8e4cd902
+SHA1 (ocaml-4.06.0.tar.gz) = bcfe5895acc88d63635d77bf0bdb8817a947a134
+RMD160 (ocaml-4.06.0.tar.gz) = fc284c392b1dd072f2c5bc7c73d0149e858ec405
+SHA512 (ocaml-4.06.0.tar.gz) = d6dc6f0fd5b0a0e6523f2b7a83efb67801bd41740a1b6c037038bcdb07c1eb2b4ac69205c17ec42524b911ea53136da82ee5bae79db6b40facd12f8f7880865d
+Size (ocaml-4.06.0.tar.gz) = 4041107 bytes
+SHA1 (patch-Makefile) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
-SHA1 (patch-asmrun_signals__osdep.h) = fa0c6981ca08d1114a377df1720ad866b94eff43
-SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab
-SHA1 (patch-configure) = c0612af8680c5b264fc38741d13704509e7181cf
+SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
+SHA1 (patch-configure) = c680a03e0914c7eb2bf1987226684463d75e0633
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
 SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
 SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
-SHA1 (patch-man_Makefile) = f4fcde662061e7e7e664ec42617f1e37f1fcf214
+SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 1da273d69cda171cba8f5d17a9ec37d67ab6634b
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile) = e7b777dd1c5723eb5950db38525fd9565258801f
-SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 39979990e3463c944598ac0d0bf8a2c4a3f0d558
+SHA1 (patch-otherlibs_Makefile) = 9f8b8ab3fcd72d77b750040d6484b0ad4fca7a61
 SHA1 (patch-otherlibs_dynlink_Makefile) = 9586542c6aa2f618a5d9df62bcb7bfac34ce1163
 SHA1 (patch-otherlibs_systhreads_Makefile) = edf1c481d57f42da9d0cb2699aa39c93eb46265e
-SHA1 (patch-otherlibs_threads_Makefile) = b25c0003a4e4304b6751ec90bdb99aae7a24cf70
+SHA1 (patch-otherlibs_threads_Makefile) = be27019e9349e3337eb24aa7ae3d117c5efbfabb
 SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988
-SHA1 (patch-testsuite_tests_lib-dynlink-native_Makefile) = aad24bed515295fe0262ab09d015f3afbe2f3bc4
 SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 670c9ecc83ae3b83c2232f9f182ccd21624bfed0
 SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
 SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
 SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
-SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69
+SHA1 (patch-utils_clflags.ml) = 1c8223caac3c81b134b470d9bb2fb5ce62576c53
 SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
-SHA1 (patch-yacc_Makefile) = 5a150661d2c3ebbee52131adbed1efbe69da90ef
+SHA1 (patch-yacc_Makefile) = e06c2598af621f50b9db2a511179e2b1cdbc4643
diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index dec98d8555a..f59e2c4921c 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,9 +1,10 @@
-$NetBSD: patch-Makefile,v 1.10 2017/09/08 09:12:44 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.11 2018/01/10 14:30:35 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- Makefile.orig	2017-06-28 14:09:39.000000000 +0000
+
+--- Makefile.orig	2017-10-03 08:35:24.000000000 +0000
 +++ Makefile
-@@ -593,29 +593,29 @@ endif
+@@ -608,29 +608,29 @@ endif
  # Installation
  .PHONY: install
  install:
@@ -46,7 +47,7 @@ Use BSD_INSTALL_* instead of mkdir and cp
             toplevel/topdirs.mli "$(INSTALL_LIBDIR)"
  	$(MAKE) -C tools install
  ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
-@@ -636,7 +636,7 @@ ifeq "$(UNIX_OR_WIN32)" "win32"
+@@ -655,7 +655,7 @@ ifeq "$(UNIX_OR_WIN32)" "win32"
  	  $(MAKE) install-flexdll; \
  	fi
  endif
@@ -55,7 +56,7 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	if test -f ocamlopt; then $(MAKE) installopt; else \
  	   cd "$(INSTALL_BINDIR)"; \
  	   $(LN) ocamlc.byte$(EXE) ocamlc$(EXE); \
-@@ -647,17 +647,17 @@ endif
+@@ -666,17 +666,17 @@ endif
  .PHONY: installopt
  installopt:
  	$(MAKE) -C asmrun install
@@ -78,16 +79,14 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	if test -n "$(WITH_OCAMLDOC)"; then \
  	  $(MAKE) -C ocamldoc installopt; \
  	fi
-@@ -672,32 +672,32 @@ installopt:
+@@ -691,30 +691,30 @@ installopt:
  	fi
  	$(MAKE) -C tools installopt
  	if test -f ocamlopt.opt -a -f flexdll/flexlink.opt ; then \
 -	  cp -f flexdll/flexlink.opt "$(INSTALL_BINDIR)/flexlink$(EXE)" ; \
-+	  $(BSD_INSTALL_PROGRAM) -f flexdll/flexlink.opt "$(INSTALL_BINDIR)/flexlink$(EXE)" ; \
++	  $(BSD_INSTALL_PROGRAM) flexdll/flexlink.opt "$(INSTALL_BINDIR)/flexlink$(EXE)" ; \
  	fi
  
- 
- 
  .PHONY: installoptopt
  installoptopt:
 -	cp ocamlc.opt "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)"
@@ -120,7 +119,7 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	     compilerlibs/ocamlopttoplevel.$(A) \
  	     $(OPTTOPLEVELSTART:.cmo=.cmx) $(OPTTOPLEVELSTART:.cmo=.$(O)) \
  	     "$(INSTALL_COMPLIBDIR)"; \
-@@ -708,7 +708,7 @@ installoptopt:
+@@ -725,7 +725,7 @@ installoptopt:
  # Installation of the *.ml sources of compiler-libs
  .PHONY: install-compiler-sources
  install-compiler-sources:
diff --git a/lang/ocaml/patches/patch-asmrun_signals__osdep.h b/lang/ocaml/patches/patch-asmrun_signals__osdep.h
deleted file mode 100644
index 4eb9f0830aa..00000000000
--- a/lang/ocaml/patches/patch-asmrun_signals__osdep.h
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-asmrun_signals__osdep.h,v 1.2 2017/10/10 12:10:05 he Exp $
-
-Provide necessary glue to do this on NetBSD/powerpc.
-
---- asmrun/signals_osdep.h.orig	2017-07-13 08:56:44.000000000 +0000
-+++ asmrun/signals_osdep.h
-@@ -303,27 +303,30 @@
-   #define CONTEXT_YOUNG_PTR (context->regs->gpr[31])
-   #define CONTEXT_SP (context->regs->gpr[1])
- 
--/****************** s390x, ELF (Linux) */
--#elif defined(TARGET_s390x) && defined(SYS_elf)
-+/****************** PowerPC, NetBSD */
- 
--  #define DECLARE_SIGNAL_HANDLER(name) \
--    static void name(int sig, struct sigcontext * context)
-+#elif defined(TARGET_power) && defined (SYS_netbsd)
- 
--  #define SET_SIGACT(sigact,name) \
--     sigact.sa_handler = (void (*)(int)) (name); \
--     sigact.sa_flags = 0
-+ #include <ucontext.h>
-+ #define DECLARE_SIGNAL_HANDLER(name) \
-+ static void name(int sig, siginfo_t * info, ucontext_t * context)
- 
--  typedef unsigned long context_reg;
--  #define CONTEXT_PC (context->sregs->regs.psw.addr)
--  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
--  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
--  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
--  #define CONTEXT_SP (context->sregs->regs.gprs[15])
-+ #define SET_SIGACT(sigact,name) \
-+ sigact.sa_sigaction = (void (*)(int,siginfo_t *,void *)) (name); \
-+ sigact.sa_flags = SA_SIGINFO
-+
-+ #define CONTEXT_PC (_UC_MACHINE_PC(context))
-+ #define CONTEXT_EXCEPTION_POINTER (context->uc_mcontext.__gregs[_REG_R29])
-+ #define CONTEXT_YOUNG_PTR (context->uc_mcontext.__gregs[_REG_R31])
-+ #define CONTEXT_SP (_UC_MACHINE_SP(context))
-+ #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
- 
--/****************** PowerPC, BSD */
-+/* #define CONTEXT_YOUNG_LIMIT (CONTEXT_STATE.CONTEXT_REG(r30)) */
-+
-+/****************** PowerPC, other BSDs */
- 
- #elif defined(TARGET_power) && \
--    (defined(SYS_bsd) || defined(SYS_bsd_elf) || defined(SYS_netbsd))
-+    (defined(SYS_bsd) || defined(SYS_bsd_elf))
- 
-   #define DECLARE_SIGNAL_HANDLER(name) \
-     static void name(int sig, int code, struct sigcontext * context)
-@@ -339,6 +342,23 @@
-   #define CONTEXT_YOUNG_PTR (context->sc_frame.fixreg[31])
-   #define CONTEXT_SP (context->sc_frame.fixreg[1])
- 
-+/****************** s390x, ELF (Linux) */
-+#elif defined(TARGET_s390x) && defined(SYS_elf)
-+
-+  #define DECLARE_SIGNAL_HANDLER(name) \
-+    static void name(int sig, struct sigcontext * context)
-+
-+  #define SET_SIGACT(sigact,name) \
-+     sigact.sa_handler = (void (*)(int)) (name); \
-+     sigact.sa_flags = 0
-+
-+  typedef unsigned long context_reg;
-+  #define CONTEXT_PC (context->sregs->regs.psw.addr)
-+  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
-+  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
-+  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
-+  #define CONTEXT_SP (context->sregs->regs.gprs[15])
-+
- /****************** SPARC, Solaris */
- 
- #elif defined(TARGET_sparc) && defined(SYS_solaris)
diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile
index 4079d799d89..b6e52f37488 100644
--- a/lang/ocaml/patches/patch-byterun_Makefile
+++ b/lang/ocaml/patches/patch-byterun_Makefile
@@ -1,18 +1,20 @@
-$NetBSD: patch-byterun_Makefile,v 1.6 2017/09/08 09:12:44 jaapb Exp $
+$NetBSD: patch-byterun_Makefile,v 1.7 2018/01/10 14:30:35 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- byterun/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
+--- byterun/Makefile.orig	2017-10-03 08:35:24.000000000 +0000
 +++ byterun/Makefile
-@@ -112,9 +112,9 @@ ld.conf: ../config/Makefile
+@@ -104,10 +104,10 @@ ld.conf: ../config/Makefile
  
  .PHONY: install
  install:
 -	cp $(PROGRAMS) "$(INSTALL_BINDIR)"
 -	cp $(LIBRARIES) "$(INSTALL_LIBDIR)"
--	mkdir -p "$(INSTALL_LIBDIR)/caml"
+-	mkdir -p "$(INSTALL_INCDIR)"
+-	cp caml/*.h "$(INSTALL_INCDIR)"
 +	$(BSD_INSTALL_PROGRAM) $(PROGRAMS) "$(INSTALL_BINDIR)"
 +	$(BSD_INSTALL_LIB) $(LIBRARIES) "$(INSTALL_LIBDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)/caml"
- 	for i in caml/*.h; do \
- 	  sed -f ../tools/cleanup-header $$i \
- 	      > "$(INSTALL_LIBDIR)/$$i"; \
++	$(BSD_INSTALL_DATA_DIR) -p "$(INSTALL_INCDIR)"
++	$(BSD_INSTALL_DATA) caml/*.h "$(INSTALL_INCDIR)"
+ 
+ # If primitives contain duplicated lines (e.g. because the code is defined
+ # like
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 4fdae863961..fead0f1a59c 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,31 +1,27 @@
-$NetBSD: patch-configure,v 1.27 2017/11/15 12:52:15 gdt Exp $
+$NetBSD: patch-configure,v 1.28 2018/01/10 14:30:35 jaapb Exp $
 
 All kinds of OS-specific changes to configure
-
---- configure.orig	2017-07-13 08:56:44.000000000 +0000
+--- configure.orig	2017-11-03 13:52:13.000000000 +0000
 +++ configure
-@@ -764,7 +764,10 @@ if test $with_sharedlibs = "yes"; then
-         *gcc*)
-           sharedcccompopts="-fPIC"
-           if sh ./solaris-ld; then
--            mksharedlib="ld -G"
-+            case "$target" in
-+            x86_64*) mksharedlib="$bytecc -shared" ;;
-+            *)       mksharedlib="$bytecc -G" ;;
-+            esac
-             byteccrpath="-R"
-             mksharedlibrpath="-R"
-           else
-@@ -791,7 +794,7 @@ if test $with_sharedlibs = "yes"; then
-       byteccrpath="-Wl,-rpath,"
+@@ -791,7 +791,7 @@ sharedcccompopts=''
+ mksharedlib='shared-libs-not-available'
+ rpath=''
+ mksharedlibrpath=''
+-natdynlinkopts=""
++natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
+ 
+ if $with_sharedlibs; then
+   case "$target" in
+@@ -850,7 +850,7 @@ if $with_sharedlibs; then
+       rpath="-Wl,-rpath,"
        mksharedlibrpath="-rpath "
        shared_libraries_supported=true;;
 -    i[3456]86-*-darwin[89].*)
-+    i[3456]86-*-darwin*)
-       mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
++    i[3456]86-*-darwin.*)
+       mksharedlib="$cc -shared -flat_namespace -undefined suppress \
                     -read_only_relocs suppress"
-       bytecccompopts="$dl_defs $bytecccompopts"
-@@ -830,11 +833,7 @@ if test $with_sharedlibs = "yes"; then
+       common_cflags="$dl_defs $common_cflags"
+@@ -899,11 +899,7 @@ if $with_sharedlibs; then
      i[3456]86-*-linux*)           natdynlink=true;;
      i[3456]86-*-gnu*)             natdynlink=true;;
      x86_64-*-linux*)              natdynlink=true;;
@@ -38,7 +34,7 @@ All kinds of OS-specific changes to configure
      x86_64-*-darwin*)             natdynlink=true;;
      s390x*-*-linux*)              natdynlink=true;;
      powerpc*-*-linux*)            natdynlink=true;;
-@@ -848,6 +847,9 @@ if test $with_sharedlibs = "yes"; then
+@@ -916,6 +912,9 @@ if $with_sharedlibs; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[3456]86-*-netbsd*)          natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -48,15 +44,15 @@ All kinds of OS-specific changes to configure
      i386-*-gnu0.3)                natdynlink=true;;
      i[3456]86-*-haiku*)           natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
-@@ -901,6 +903,7 @@ case "$target" in
-   sparc*-*-gnu*)                arch=sparc; system=gnu;;
+@@ -951,6 +950,7 @@ system=unknown
+ case "$target" in
    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`;;
-   i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
-@@ -910,6 +913,7 @@ case "$target" in
+                                 else
+@@ -959,6 +959,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;;
@@ -64,16 +60,7 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -921,7 +925,7 @@ case "$target" in
-   powerpc*-*-linux*)            arch=power;
-                                 if $arch64; then model=ppc64; else model=ppc; fi
-                                 system=elf;;
--  powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
-+  powerpc-*-netbsd*)            arch=power; model=ppc; system=netbsd;;
-   powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
-   s390x*-*-linux*)              arch=s390x; model=z10; system=elf;;
-   armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
-@@ -930,6 +934,8 @@ case "$target" in
+@@ -979,6 +980,8 @@ case "$target" in
    armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
    armv6*-*-linux-gnueabi)       arch=arm; model=armv6; system=linux_eabi;;
    armv6*-*-freebsd*)            arch=arm; model=armv6; system=freebsd;;
@@ -82,7 +69,7 @@ All kinds of OS-specific changes to configure
    earmv6*-*-netbsd*)            arch=arm; model=armv6; system=netbsd;;
    earmv7*-*-netbsd*)            arch=arm; model=armv7; system=netbsd;;
    armv5te*-*-linux-gnueabi)     arch=arm; model=armv5te; system=linux_eabi;;
-@@ -947,6 +953,7 @@ case "$target" in
+@@ -996,6 +999,7 @@ case "$target" in
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
    aarch64-*-linux*)             arch=arm64; system=linux;;
    x86_64-*-cygwin*)             arch=amd64; system=cygwin;;
@@ -90,15 +77,7 @@ All kinds of OS-specific changes to configure
  esac
  
  # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -983,7 +990,6 @@ case "$arch,$nativecc,$system,$model" in
-   *,*,nextstep,*)      nativecclinkopts="-posix";;
-   *,*,rhapsody,*)      if $arch64; then partialld="ld -r -arch ppc64"; fi;;
-   amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
--  amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
-   power,gcc*,elf,ppc)   partialld="ld -r -m elf32ppclinux";;
-   power,gcc*,elf,ppc64)   partialld="ld -r -m elf64ppc";;
-   power,gcc*,elf,ppc64le)   partialld="ld -r -m elf64lppc";;
-@@ -1001,8 +1007,8 @@ case "$arch,$system" in
+@@ -1037,8 +1041,8 @@ case "$arch,$system" in
                      fi;;
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
@@ -109,26 +88,15 @@ All kinds of OS-specific changes to configure
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -1023,7 +1029,7 @@ case "$arch,$system" in
-                   aspp="${TOOLPREF}cc -c";;
-   *,freebsd)      as="${TOOLPREF}as"
-                   aspp="${TOOLPREF}cc -c";;
--  amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
-+  amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd|sparc,*)
-                   as="${TOOLPREF}as"
-                   case "$ccfamily" in
-                       clang-*)
-@@ -1058,6 +1064,9 @@ case "$arch,$system" in
-   arm,linux*) profiling='true';;
+@@ -1086,6 +1090,7 @@ case "$arch,$system" in
    power,elf) profiling='true';;
    power,bsd*) profiling='true';;
-+  power,netbsd) profiling='true';;
-+	*,*,dragonfly) profiling='true';;
-+	amd64,solaris) profiling='true';;
+   power,netbsd) profiling='true';;
++  *,dragonfly) profiling='true';;
    *) profiling='false';;
  esac
  
-@@ -1652,6 +1661,8 @@ fi
+@@ -1669,6 +1674,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -137,7 +105,7 @@ All kinds of OS-specific changes to configure
  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`
-@@ -1698,6 +1709,7 @@ if test "$x11_include" = "not found"; th
+@@ -1715,6 +1722,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -145,7 +113,7 @@ All kinds of OS-specific changes to configure
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1755,6 +1767,7 @@ if test "$x11_include" = "not found"; th
+@@ -1772,6 +1780,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -153,7 +121,7 @@ All kinds of OS-specific changes to configure
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1776,19 +1789,16 @@ if test "$x11_include" = "not found"; th
+@@ -1793,19 +1802,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-man_Makefile b/lang/ocaml/patches/patch-man_Makefile
index a80ccbd8483..7124eb608ea 100644
--- a/lang/ocaml/patches/patch-man_Makefile
+++ b/lang/ocaml/patches/patch-man_Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-man_Makefile,v 1.3 2015/12/29 23:34:53 dholland Exp $
+$NetBSD: patch-man_Makefile,v 1.4 2018/01/10 14:30:35 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
 
---- man/Makefile.orig	2014-04-12 10:17:02.000000000 +0000
+--- man/Makefile.orig	2017-10-03 08:35:24.000000000 +0000
 +++ man/Makefile
-@@ -15,7 +15,7 @@ include ../config/Makefile
- INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(MANEXT)
+@@ -18,7 +18,7 @@ include ../config/Makefile
+ INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(PROGRAMS_MAN_SECTION)
  
  install:
--	for i in *.m; do cp $$i $(INSTALL_DIR)/`basename $$i .m`.$(MANEXT); done
-+	for i in *.m; do $(BSD_INSTALL_MAN) $$i $(INSTALL_DIR)/`basename $$i .m`.$(MANEXT); done
- 	echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' \
- 	     > $(INSTALL_DIR)/ocamlc.opt.$(MANEXT)
- 	echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' \
+-	for i in *.m; do cp \
++	for i in *.m; do $(BSD_INSTALL_MAN) \
+ 	  $$i $(INSTALL_DIR)/`basename $$i .m`.$(PROGRAMS_MAN_SECTION); done
+ 	echo '.so man$(PROGRAMS_MAN_SECTION)/ocamlc.$(PROGRAMS_MAN_SECTION)' \
+ 	     > $(INSTALL_DIR)/ocamlc.opt.$(PROGRAMS_MAN_SECTION)
diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile b/lang/ocaml/patches/patch-otherlibs_Makefile
index 5dd287314ec..1bfc9961aee 100644
--- a/lang/ocaml/patches/patch-otherlibs_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_Makefile
@@ -1,18 +1,9 @@
-$NetBSD: patch-otherlibs_Makefile,v 1.6 2017/07/17 23:26:23 wiz Exp $
+$NetBSD: patch-otherlibs_Makefile,v 1.7 2018/01/10 14:30:35 jaapb Exp $
 
 Honor LDFLAGS.
 
---- otherlibs/Makefile.orig	2017-06-23 15:13:40.000000000 +0000
+--- otherlibs/Makefile.orig	2017-10-03 08:35:24.000000000 +0000
 +++ otherlibs/Makefile
-@@ -32,7 +32,7 @@ CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt -
- CFLAGS=-I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
- 
- # Compilation options
--CC=$(BYTECC)
-+CC=$(BYTECC) $(BYTECCLINKOPTS)
- COMPFLAGS=-absname -w +a-4-9-41-42-44-45-48 -warn-error A -bin-annot -g \
-           -safe-string -strict-sequence -strict-formats $(EXTRACAMLFLAGS)
- ifeq "$(FLAMBDA)" "true"
 @@ -53,6 +53,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm
  #LINKOPTS=
  #LDOPTS=
diff --git a/lang/ocaml/patches/patch-otherlibs_bigarray_mmap__unix.c b/lang/ocaml/patches/patch-otherlibs_bigarray_mmap__unix.c
deleted file mode 100644
index 7c1c4b1ffa4..00000000000
--- a/lang/ocaml/patches/patch-otherlibs_bigarray_mmap__unix.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-otherlibs_bigarray_mmap__unix.c,v 1.2 2016/12/30 11:15:00 jaapb Exp $
-
-Avoid incompatible _XOPEN_SOURCE definition on SunOS.
-
---- otherlibs/bigarray/mmap_unix.c.orig	2016-09-05 13:19:52.000000000 +0000
-+++ otherlibs/bigarray/mmap_unix.c
-@@ -17,7 +17,9 @@
- 
- /* Needed (under Linux at least) to get pwrite's prototype in unistd.h.
-    Must be defined before the first system .h is included. */
-+#ifndef __sun
- #define _XOPEN_SOURCE 600
-+#endif
- 
- #include <stddef.h>
- #include <string.h>
diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
index 2f4b851a4b9..80704aef16e 100644
--- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-otherlibs_threads_Makefile,v 1.10 2017/09/10 08:56:47 wiz Exp $
+$NetBSD: patch-otherlibs_threads_Makefile,v 1.11 2018/01/10 14:30:35 jaapb Exp $
 
 Honor LDFLAGS.
 Use BSD_INSTALL_* instead of mkdir and cp
 
---- otherlibs/threads/Makefile.orig	2017-07-13 08:56:44.000000000 +0000
+--- otherlibs/threads/Makefile.orig	2017-10-03 08:35:24.000000000 +0000
 +++ otherlibs/threads/Makefile
 @@ -33,6 +33,8 @@ CAML_OBJS=thread.cmo mutex.cmo condition
  
@@ -38,16 +38,16 @@ Use BSD_INSTALL_* instead of mkdir and cp
  
  install:
  	if test -f dllvmthreads.so; then \
--	  cp dllvmthreads.so $(INSTALL_STUBLIBDIR)/.; \
-+	  $(BSD_INSTALL_LIB) dllvmthreads.so $(INSTALL_STUBLIBDIR)/.; \
+-	  cp dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
++	  $(BSD_INSTALL_LIB) dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
  	fi
--	mkdir -p $(INSTALL_LIBDIR)/vmthreads
--	cp libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a
-+	$(BSD_INSTALL_LIB_DIR) $(INSTALL_LIBDIR)/vmthreads
-+	$(BSD_INSTALL_DATA) libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a
- 	cd $(INSTALL_LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
+-	mkdir -p "$(INSTALL_LIBDIR)/vmthreads"
+-	cp libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
++	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)/vmthreads"
++	$(BSD_INSTALL_DATA) libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
+ 	cd "$(INSTALL_LIBDIR)/vmthreads"; $(RANLIB) libvmthreads.a
 -	cp $(CMIFILES) $(CMIFILES:.cmi=.mli) $(CMIFILES:.cmi=.cmti) \
 +	$(BSD_INSTALL_DATA) $(CMIFILES) $(CMIFILES:.cmi=.mli) $(CMIFILES:.cmi=.cmti) \
- 	   threads.cma stdlib.cma unix.cma $(INSTALL_LIBDIR)/vmthreads
+ 	   threads.cma stdlib.cma unix.cma "$(INSTALL_LIBDIR)/vmthreads"
  
  installopt:
diff --git a/lang/ocaml/patches/patch-testsuite_tests_lib-dynlink-native_Makefile b/lang/ocaml/patches/patch-testsuite_tests_lib-dynlink-native_Makefile
deleted file mode 100644
index 1291bb4ca98..00000000000
--- a/lang/ocaml/patches/patch-testsuite_tests_lib-dynlink-native_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-testsuite_tests_lib-dynlink-native_Makefile,v 1.1 2017/10/10 12:10:05 he Exp $
-
-Fix apparently erroneous feature test, this stuff depends
-on "native dynamic linking" support.
-
---- testsuite/tests/lib-dynlink-native/Makefile.orig	2017-07-13 08:56:45.000000000 +0000
-+++ testsuite/tests/lib-dynlink-native/Makefile
-@@ -23,7 +23,7 @@ LD_PATH = $(TOPDIR)/otherlibs/$(UNIXLIBV
- 
- .PHONY: default
- default:
--	@if ! $(SUPPORTS_SHARED_LIBRARIES) || $(BYTECODE_ONLY) ; then \
-+	@if ! $(NATDYNLINK) || $(BYTECODE_ONLY) ; then \
- 	  echo " ... testing 'main' => skipped"; \
- 	else \
- 	   $(SET_LD_PATH) $(MAKE) all; \
diff --git a/lang/ocaml/patches/patch-utils_clflags.ml b/lang/ocaml/patches/patch-utils_clflags.ml
index ae09ba3a2cf..bcf51c628a7 100644
--- a/lang/ocaml/patches/patch-utils_clflags.ml
+++ b/lang/ocaml/patches/patch-utils_clflags.ml
@@ -1,16 +1,16 @@
-$NetBSD: patch-utils_clflags.ml,v 1.4 2016/05/05 08:12:01 jaapb Exp $
+$NetBSD: patch-utils_clflags.ml,v 1.5 2018/01/10 14:30:35 jaapb Exp $
 
 pkgsrc_runtime flag
 
---- utils/clflags.ml.orig	2016-04-01 12:53:41.000000000 +0000
+--- utils/clflags.ml.orig	2017-10-03 08:35:25.000000000 +0000
 +++ utils/clflags.ml
-@@ -148,7 +148,8 @@ let pic_code = ref (match Config.archite
+@@ -154,7 +154,8 @@ let pic_code = ref (match Config.archite
                       | "amd64" -> true
                       | _       -> false)
  
 -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 keep_locs = ref true               (* -keep-locs *)
diff --git a/lang/ocaml/patches/patch-yacc_Makefile b/lang/ocaml/patches/patch-yacc_Makefile
index 6f5cbdba802..8d6b3bbd2c5 100644
--- a/lang/ocaml/patches/patch-yacc_Makefile
+++ b/lang/ocaml/patches/patch-yacc_Makefile
@@ -1,15 +1,14 @@
-$NetBSD: patch-yacc_Makefile,v 1.2 2017/10/27 23:30:07 khorben Exp $
+$NetBSD: patch-yacc_Makefile,v 1.3 2018/01/10 14:30:35 jaapb Exp $
 
 Honor LDFLAGS when building ocamlyacc.
-
---- yacc/Makefile.orig	2017-07-13 08:56:45.000000000 +0000
+--- yacc/Makefile.orig	2017-11-03 13:52:14.000000000 +0000
 +++ yacc/Makefile
-@@ -33,7 +33,7 @@ OBJS= closure.$(O) error.$(O) lalr.$(O) 
- all: ocamlyacc$(EXE)
+@@ -28,7 +28,7 @@ MKEXE_ANSI=$(MKEXE)
+ endif
  
  ocamlyacc$(EXE): $(OBJS)
--	$(MKEXE) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
-+	$(MKEXE) $(BYTECCLIBS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
+-	$(MKEXE_ANSI) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
++	$(MKEXE_ANSI) $(BYTECCLIBS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
  
  version.h : ../VERSION
  	echo "#define OCAML_VERSION \"`sed -e 1q $^ | tr -d '\r'`\"" > $@
author	jaapb <jaapb@pkgsrc.org>	2018-01-10 14:30:34 +0000
committer	jaapb <jaapb@pkgsrc.org>	2018-01-10 14:30:34 +0000
commit	ed76d91cc15194db44286f7eec8d4c67155646d8 (patch)
tree	521f4b6ec244beb413ce4fc71b4386fdfd075edd /lang/ocaml
parent	cfd1201ceb497da70f88090f5bb1ceaf30df355c (diff)
download	pkgsrc-ed76d91cc15194db44286f7eec8d4c67155646d8.tar.gz