ocaml: start of update to 5.0, fixed patches except patch-configure

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ocaml: start of update to 5.0, fixed patches except patch-configure
From: Jaap Boender <jaapb%netbsd.org@localhost>
Date: Mon, 21 Nov 2022 09:32:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%netbsd.org@localhost>
Pushed By:	jaapb
Date:		Mon Nov 21 10:32:42 2022 +0100
Changeset:	c5ea743988e457082708dd31019c47a2bbca73ed

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/native.mk
	ocaml/ocaml.mk
	ocaml/options.mk
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-Makefile.build_config.in
	ocaml/patches/patch-api__docgen_ocamldoc_Makefile
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-man_Makefile
	ocaml/patches/patch-ocamldoc_Makefile
	ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
	ocaml/patches/patch-otherlibs_systhreads_Makefile
	ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
	ocaml/patches/patch-otherlibs_unix_Makefile
	ocaml/patches/patch-runtime_floats.c
	ocaml/patches/patch-runtime_sak.c
	ocaml/patches/patch-tools_Makefile
	ocaml/patches/patch-tools_ocamlmklib.ml
Removed Files:
	ocaml/patches/patch-runtime_Makefile
	ocaml/patches/patch-yacc_Makefile

Log Message:
ocaml: start of update to 5.0, fixed patches except patch-configure

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c5ea743988e457082708dd31019c47a2bbca73ed

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ocaml/Makefile                                     | 14 +++++--
 ocaml/Makefile.common                              |  9 ++--
 ocaml/PLIST                                        |  2 +-
 ocaml/buildlink3.mk                                |  8 ++--
 ocaml/distinfo                                     | 32 +++++++-------
 ocaml/native.mk                                    |  8 ++--
 ocaml/ocaml.mk                                     | 31 +++++++-------
 ocaml/options.mk                                   |  2 +-
 ocaml/patches/patch-Makefile                       | 41 +++++++++++-------
 ocaml/patches/patch-Makefile.build_config.in       | 10 ++---
 ocaml/patches/patch-api__docgen_ocamldoc_Makefile  |  6 +--
 ocaml/patches/patch-configure                      |  2 +-
 ocaml/patches/patch-lex_Makefile                   | 27 ++++--------
 ocaml/patches/patch-man_Makefile                   |  2 +-
 ocaml/patches/patch-ocamldoc_Makefile              | 12 +++---
 .../patch-otherlibs_Makefile.otherlibs.common      | 10 ++---
 ocaml/patches/patch-otherlibs_systhreads_Makefile  | 39 +++--------------
 .../patches/patch-otherlibs_systhreads_st__stubs.c | 12 +++---
 ocaml/patches/patch-otherlibs_unix_Makefile        | 14 +++----
 ocaml/patches/patch-runtime_Makefile               | 49 ----------------------
 ocaml/patches/patch-runtime_floats.c               |  2 +-
 ocaml/patches/patch-runtime_sak.c                  |  2 +-
 ocaml/patches/patch-tools_Makefile                 |  8 ++--
 ocaml/patches/patch-tools_ocamlmklib.ml            | 18 ++++----
 ocaml/patches/patch-yacc_Makefile                  | 15 -------
 25 files changed, 139 insertions(+), 236 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 56343d9e27..289acf132f 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2020/12/26 08:36:18 nia Exp $
+# $NetBSD: Makefile,v 1.147 2022/10/23 13:09:30 he Exp $
 
 .include "Makefile.common"
 
-#CONFIGURE_ENV+=		disable_x11=yes
-
 TEST_PROGRAM=		ocamltest
 MAKE_JOBS_SAFE=		no
 UNLIMIT_RESOURCES=	stacksize
@@ -28,6 +26,16 @@ CONFIGURE_ARGS+=	--disable-native-compiler
 BUILD_TARGET=		world
 .endif
 
+# configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
+CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
+.endif
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && (${OPSYS_VERSION} < 99999)
+# fma(3) was added for powerpc between 9.99.98 and 9.99.99
+CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
+.endif
+
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
 # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index b43cc76b99..c66ef14037 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.62 2021/03/08 08:08:43 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.64 2022/05/24 18:25:38 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.14.0
+DISTNAME=	ocaml-5.0.0~beta1
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.14/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-5.0/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb%NetBSD.org@localhost
@@ -27,6 +27,9 @@ GNU_CONFIGURE=		yes
 #DISTINFO_FILE=	${.CURDIR}/../../lang/ocaml/distinfo
 #PATCHDIR=	${.CURDIR}/../../lang/ocaml/patches
 
+# build failure on i386: "../ocamlopt.opt: text relocations"
+MKPIE_SUPPORTED=	no
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
diff --git a/ocaml/PLIST b/ocaml/PLIST
index 49a95c88da..a16d0e763c 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.57 2022/05/24 18:25:38 jaapb Exp $
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 91f67f9857..97dd047322 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.56 2021/03/08 08:08:43 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.57 2022/05/24 18:25:38 jaapb Exp $
 # Should only be used through ocaml.mk, not directly.
 
 BUILDLINK_TREE+=	ocaml
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=	ocaml
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.14.0
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.14.0
-BUILDLINK_PKGSRCDIR.ocaml?=	../../wip/ocaml
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>4.15.9
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>4.15.9
+BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
 BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.ocaml}/lib/ocaml
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 43f436fb9b..a8b36c4a3e 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,25 +1,23 @@
-$NetBSD: distinfo,v 1.139 2020/12/10 21:37:07 wiz Exp $
+$NetBSD: distinfo,v 1.145 2022/05/24 18:25:38 jaapb Exp $
 
-BLAKE2s (ocaml-4.14.0.tar.gz) = 07f8e81765693d73c5b9326da424df67c9281a5e04fc6ca0f2539935fdc96d2c
-SHA512 (ocaml-4.14.0.tar.gz) = 84cd7fd96a4cde5f1063caae112629f37812add4ca2a888c56b3992b8d5528769c2ebc6b1b8f4a0b54e620f8450a7dbe11225f716e0f47cef0d3707457911ac0
-Size (ocaml-4.14.0.tar.gz) = 5492464 bytes
-SHA1 (patch-Makefile) = 978156d1e5795615adda840521bf5911a801f6a5
-SHA1 (patch-Makefile.build_config.in) = 9702fc3b8fa8f4e963f3e4a193439a12836af816
-SHA1 (patch-api__docgen_ocamldoc_Makefile) = cc677bed9d2da3d7eedd2c696ac89085bf2002d2
+BLAKE2s (ocaml-5.0.0~beta1.tar.gz) = 4eed36e7838ce27aafb45f4b5199608a098e4daab6528aab9822472c5d2d307f
+SHA512 (ocaml-5.0.0~beta1.tar.gz) = e0a9a1a61e77ab5ef22f0733410f1d3ad9119c14e5507ca26a3584bed9b74bb13ae07369701a521a4926fde65e0b8d202eb4581f998f51dee1bf87db07f97499
+Size (ocaml-5.0.0~beta1.tar.gz) = 5648536 bytes
+SHA1 (patch-Makefile) = 15bb45ef45add0bd082f1b47050bc38456aeb5bd
+SHA1 (patch-Makefile.build_config.in) = cbbe5dfd7ebf3302676cc47e35a7bd5177404108
+SHA1 (patch-api__docgen_ocamldoc_Makefile) = 075419e3534abc0dd06b19be599c42ec18f3bd75
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
 SHA1 (patch-configure) = 36ddb6f19ce7564889dc48ee290904dce00b04ec
-SHA1 (patch-lex_Makefile) = ba5df45c608fa292732e1acd0d955870e60c972d
+SHA1 (patch-lex_Makefile) = ecfb05c919a12ddf4be30c810b9a245d295eb113
 SHA1 (patch-man_Makefile) = 3d55fe5127758566f81a1b4e55e66c6ae3a848f1
-SHA1 (patch-ocamldoc_Makefile) = 5431d357ecbe719efffeb14826a8d79f0590784e
+SHA1 (patch-ocamldoc_Makefile) = 3c2460a03c148789b2f187eee6678858ecb39ead
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 5518c6b4d8772d995252b6f640323e2602097c4d
-SHA1 (patch-otherlibs_systhreads_Makefile) = 76b6619f43562d30be9a87fd450b75033f4aff0b
-SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
-SHA1 (patch-otherlibs_unix_Makefile) = 9eaf8d561670a765a647b36486ec533c674ee609
-SHA1 (patch-runtime_Makefile) = 4daf1ddb9ce70d99719bcb0aacbaadfc393574b0
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 0a91ea3a5d1b89b9755ea41c29f85c34e4025600
+SHA1 (patch-otherlibs_systhreads_Makefile) = ba4668460e6300b10f1d57fa0e46c0c39b2ff98f
+SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 65adba4249a6ef871c3f44df2fc0252a664d3a15
+SHA1 (patch-otherlibs_unix_Makefile) = 2c58be92b9dfab1abace62a0f4c168da72226c9f
 SHA1 (patch-runtime_floats.c) = 584a30d31c7b7da4f8387dc58b90fa1a8078f723
 SHA1 (patch-runtime_sak.c) = 62a0946419b96033497a4a12105bbd9b4ef3aba6
 SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
-SHA1 (patch-tools_Makefile) = f71ac6fa7f2ee79c6d531f95eb90d28360c04434
-SHA1 (patch-tools_ocamlmklib.ml) = 66ddab3ae0f6890326a51d315a2516fe4975107d
-SHA1 (patch-yacc_Makefile) = ee27db9ca0149ee9e1dc93988458bbb7446ecb89
+SHA1 (patch-tools_Makefile) = d181dd3ed3f3eb270451fb5bd15317cfb9e6fb11
+SHA1 (patch-tools_ocamlmklib.ml) = dad1d55e0b0cef61a76844b45fcde83277f4a087
diff --git a/ocaml/native.mk b/ocaml/native.mk
index af53237710..b462411b5e 100644
--- a/ocaml/native.mk
+++ b/ocaml/native.mk
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: native.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
 #
 # This Makefile fragment handles the native code compiler options for OCaml.
 # It is used by ocaml.mk and the lang/ocaml package.
@@ -13,7 +13,7 @@
 # Set based on OCAML_USE_OPT_COMPILER
 
 .if !defined(OCAML_NATIVE_MK)
-OCAML_NATIVE_MK= # defined
+OCAML_NATIVE_MK=	# defined
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -26,7 +26,7 @@ _DEF_VARS.ocaml=	\
 # Default value of OCAML_USE_OPT_COMPILER
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
      !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
-     (${MACHINE_ARCH} == "x86_64")
+     (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
 OCAML_USE_OPT_COMPILER?=	yes
 .else
 OCAML_USE_OPT_COMPILER?=	no
@@ -37,7 +37,7 @@ PLIST_VARS+=	ocaml-opt
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 # The opt compiler needs the C compiler suite
-USE_LANGUAGES+=	c
+USE_LANGUAGES+=		c
 PLIST.ocaml-opt=	yes
 .else
 # If we're bytecode compiling, don't strip executables
diff --git a/ocaml/ocaml.mk b/ocaml/ocaml.mk
index a4ab90f20f..89cbf7f694 100644
--- a/ocaml/ocaml.mk
+++ b/ocaml/ocaml.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.31 2022/02/14 11:37:48 wiz Exp $
+# $NetBSD: ocaml.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 # It should be included by every package that uses OCaml.
@@ -28,14 +28,14 @@
 # OCAML_SITELIBDIR
 
 .if !defined(OCAML_MK)
-OCAML_MK= # defined
+OCAML_MK=	# defined
 
 # Text relocations errors when building packages that use
 # ocamlfind on i386.
 MKPIE_SUPPORTED=	no
 
 .include "../../mk/bsd.fast.prefs.mk"
-.include "../../wip/ocaml/native.mk"
+.include "../../lang/ocaml/native.mk"
 
 
 _PKG_VARS.ocaml=	\
@@ -77,10 +77,10 @@ OCAML_USE_TOPKG?=	no
 # Default value of OCAML_USE_DUNE
 OCAML_USE_DUNE?=	no
 
-OCAML_TOPKG_NAME?=	${PKGBASE:S/^ocaml-//}
-OCAML_TOPKG_DOCDIR?=	${PREFIX}/share/doc
-OCAML_TOPKG_FLAGS?=	# empty
-OCAML_TOPKG_TARGETS?=	# empty
+OCAML_TOPKG_NAME?=		${PKGBASE:S/^ocaml-//}
+OCAML_TOPKG_DOCDIR?=		${PREFIX}/share/doc
+OCAML_TOPKG_FLAGS?=		# empty
+OCAML_TOPKG_TARGETS?=		# empty
 OCAML_TOPKG_OPTIONAL_TARGETS?=	# empty
 OCAML_TOPKG_NATIVE_TARGETS?=	# empty
 
@@ -105,7 +105,7 @@ OCAML_USE_OASIS=	yes
 #
 .if ${OCAML_USE_OASIS} == "yes"
 OCAML_USE_FINDLIB=	yes
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--destdir "${DESTDIR}"
 CONFIGURE_ARGS+=	--prefix "${PREFIX}"
 # Force use of native code compiler according to setting
@@ -143,8 +143,8 @@ OPAM_INSTALL_DIR?=	.
 
 # Value for OCAML_SITELIBDIR
 OCAML_SITELIBDIR=	lib/ocaml/site-lib
-MAKE_ENV+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
-PLIST_SUBST+=	OCAML_SITELIB="${OCAML_SITELIBDIR}"
+MAKE_ENV+=		OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+PLIST_SUBST+=		OCAML_SITELIB="${OCAML_SITELIBDIR}"
 
 PRINT_PLIST_AWK+=	{ gsub(/^.+\.cmx/, "$${PLIST.ocaml-opt}&") }
 PRINT_PLIST_AWK+=	{ gsub(/^.+\.a$$/, "$${PLIST.ocaml-opt}&") }
@@ -173,9 +173,9 @@ OCAML_FINDLIB_REGISTER?=	yes
 pre-configure:
 	${RUN} cd ${WRKSRC} && ocamlfind ocamlc -linkpkg -package oasis.dynrun -o setup setup.ml && ${RM} setup.cmo setup.cmi
 
-OASIS_EXEC=./setup
+OASIS_EXEC=	./setup
 .else
-OASIS_EXEC=ocaml setup.ml
+OASIS_EXEC=	ocaml setup.ml
 .endif
 
 # Redefine configure target
@@ -203,7 +203,7 @@ do-build:
 	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS}
 
-.endif # topkg
+.endif # ${OCAML_USE_TOPKG} == "yes"
 
 #
 # opam targets
@@ -218,13 +218,14 @@ do-install:
 		-destdir ${DESTDIR} \
 		-prefix ${PREFIX} \
 		-libdir ${PREFIX}/${OCAML_SITELIBDIR} \
+		-mandir ${PREFIX}/${PKGMANDIR} \
 		-docdir ${OCAML_TOPKG_DOCDIR}/$$i \
 		-stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
 		-bindir ${PREFIX}/bin \
 		${OPAM_INSTALL_DIR}/$$i.install; \
 	done
 
-.endif # opam
+.endif # ${OCAML_USE_OPAM} == "yes"
 
 #
 # dune targets
@@ -244,7 +245,7 @@ do-build:
 		${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
 .endif
 
-.endif # dune
+.endif # ${OCAML_USE_DUNE} == "yes"
 
 # Add dependency on ocaml.
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/ocaml/options.mk b/ocaml/options.mk
index e043f6b721..6c46b4392a 100644
--- a/ocaml/options.mk
+++ b/ocaml/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: options.mk,v 1.6 2022/05/24 18:25:38 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml
 PKG_SUPPORTED_OPTIONS=	pic flambda
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index a0b060e342..d1e1819ed9 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -3,7 +3,7 @@ $NetBSD$
 Use BSD_INSTALL_* instead of mkdir
 Honor LDFLAGS
 
---- Makefile.orig	2022-02-08 16:50:12.000000000 +0000
+--- Makefile.orig	2022-10-12 13:53:12.000000000 +0000
 +++ Makefile
 @@ -50,7 +50,7 @@ COMPFLAGS=-strict-sequence -principal -a
            -w +a-4-9-40-41-42-44-45-48-66-70 \
@@ -14,7 +14,25 @@ Honor LDFLAGS
  
  ifeq "$(strip $(NATDYNLINKOPTS))" ""
  OCAML_NATDYNLINKOPTS=
-@@ -377,11 +377,11 @@ DOC_FILES=\
+@@ -922,7 +922,7 @@ endif # ifneq "$(COMPUTE_DEPS)" "false"
+ endef
+ 
+ $(DEPDIR)/runtime:
+-	$(MKDIR) $@
++	$(BSD_INSTALL_LIB_DIR) $@
+ 
+ runtime_OBJECT_TYPES = % %.b %.bd %.bi %.bpic
+ ifneq "$(NATIVE_COMPILER)" "false"
+@@ -1014,7 +1014,7 @@ runtime: $(addprefix stdlib/flexdll/, $(
+ stdlib/flexdll/flexdll%.$(O): $(FLEXDLL_SOURCES)/flexdll%.$(O) | stdlib/flexdll
+ 	cp $< $@
+ stdlib/flexdll:
+-	$(MKDIR) $@
++	$(BSD_INSTALL_LIB_DIR) $@
+ endif
+ 
+ .PHONY: makeruntime
+@@ -1419,12 +1419,12 @@ distclean: clean
  # Installation
  .PHONY: install
  install:
@@ -23,15 +41,17 @@ Honor LDFLAGS
 -	$(MKDIR) "$(INSTALL_STUBLIBDIR)"
 -	$(MKDIR) "$(INSTALL_COMPLIBDIR)"
 -	$(MKDIR) "$(INSTALL_DOCDIR)"
+-	$(MKDIR) "$(INSTALL_INCDIR)"
 +	$(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
 +	$(BSD_INSTALL_DATA_DIR) "$(INSTALL_DOCDIR)"
- 	$(MAKE) -C runtime install
- 	$(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)"
- ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
-@@ -462,7 +462,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "tru
++	$(BSD_INSTALL_DATA_DIR) "$(INSTALL_INCDIR)"
+ 	$(INSTALL_PROG) $(runtime_PROGRAMS) "$(INSTALL_BINDIR)"
+ 	$(INSTALL_DATA) $(runtime_BYTECODE_STATIC_LIBRARIES) \
+ 	  "$(INSTALL_LIBDIR)"
+@@ -1507,7 +1507,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "tru
  	$(INSTALL_PROG) \
  	  boot/flexlink.byte$(EXE) "$(INSTALL_BINDIR)/flexlink.byte$(EXE)"
  endif # ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
@@ -40,12 +60,3 @@ Honor LDFLAGS
  	$(INSTALL_DATA) $(addprefix stdlib/flexdll/, $(FLEXDLL_OBJECTS)) \
      "$(INSTALL_FLEXDLLDIR)"
  endif # ifeq "$(BOOTSTRAPPING_FLEXDLL)" "true"
-@@ -792,7 +792,7 @@ runtime: $(addprefix stdlib/flexdll/, $(
- stdlib/flexdll/flexdll%.$(O): $(FLEXDLL_SOURCES)/flexdll%.$(O) | stdlib/flexdll
- 	cp $< $@
- stdlib/flexdll:
--	$(MKDIR) $@
-+	$(BSD_INSTALL_LIB_DIR) $@
- endif
- 
- .PHONY: makeruntime
diff --git a/ocaml/patches/patch-Makefile.build_config.in b/ocaml/patches/patch-Makefile.build_config.in
index ab71590331..e560ed2067 100644
--- a/ocaml/patches/patch-Makefile.build_config.in
+++ b/ocaml/patches/patch-Makefile.build_config.in
@@ -1,14 +1,14 @@
 $NetBSD$
 
-USE BSD_INSTALL_*
+Use BSD_INSTALL_*
 
---- Makefile.build_config.in.orig	2022-02-08 16:50:12.000000000 +0000
+--- Makefile.build_config.in.orig	2022-10-12 13:53:12.000000000 +0000
 +++ Makefile.build_config.in
-@@ -20,9 +20,9 @@
- # $(ROOTDIR) has been defined.
+@@ -25,9 +25,9 @@
+ override BUILD_CONFIG_INCLUDED =
  
  include $(ROOTDIR)/Makefile.config
--INSTALL ?= @INSTALL@
+-INSTALL ?= @INSTALL@ -p
 -INSTALL_DATA ?= @INSTALL_DATA@
 -INSTALL_PROG ?= @INSTALL_PROGRAM@
 +INSTALL ?= $(BSD_INSTALL)
diff --git a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
index 9a98d0517d..cc391fa0dc 100644
--- a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
+++ b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
@@ -1,8 +1,6 @@
 $NetBSD$
 
-Install manpages with correct suffix
-
---- api_docgen/ocamldoc/Makefile.orig	2022-02-21 15:57:25.000000000 +0000
+--- api_docgen/ocamldoc/Makefile.orig	2022-10-12 13:53:12.000000000 +0000
 +++ api_docgen/ocamldoc/Makefile
 @@ -19,7 +19,7 @@ include ../../ocamldoc/Makefile.best_oca
  vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS)  $(DOC_STDLIB_DIRS)
@@ -23,7 +21,7 @@ Install manpages with correct suffix
  
  build/latex/ifocamldoc.tex: | build/latex
 @@ -60,7 +60,7 @@ build/libref/%.odoc: build/%.mld | build
- 	$(OCAMLDOC_RUN) $(DOC_STDLIB_INCLUDES) -text $< -dump  $@
+ 	$(OCAMLDOC_RUN) -hide-warnings $(DOC_STDLIB_INCLUDES) -text $< -dump  $@
  
  ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
 -build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index a4ec4ed7b5..19d5719976 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-configure,v 1.44 2022/05/24 18:25:38 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index f9e5c4edd0..3cc5e8f921 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,24 +1,13 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- lex/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
+--- lex/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
 +++ lex/Makefile
-@@ -31,7 +31,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
- CAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) -nostdlib -I $(ROOTDIR)/stdlib
- COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
+@@ -34,7 +34,7 @@ CAMLC = $(BOOT_OCAMLC) $(BOOT_STDLIBFLAG
+ CAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) $(STDLIBFLAGS)
+ COMPFLAGS = -g -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
              -safe-string -strict-sequence -strict-formats -bin-annot
--LINKFLAGS =
-+LINKFLAGS = -cclib "$(LDFLAGS)"
- CAMLDEP = $(BOOT_OCAMLC) -depend
- DEPFLAGS = -slash
- DEPINCLUDES =
-@@ -52,7 +52,7 @@ ocamllex$(EXE): $(OBJS)
- 	$(CAMLC) $(LINKFLAGS) -compat-32 -o $@ $^
- 
- ocamllex.opt$(EXE): $(OBJS:.cmo=.cmx)
--	$(CAMLOPT_CMD) -o $@ $^
-+	$(CAMLOPT_CMD) $(LINKFLAGS) -o $@ $^
+-LINKFLAGS = -g
++LINKFLAGS = -g -cclib "$(LDFLAGS)" # JPB: remove the -g for the non-beta-version, I guess
  
- clean::
- 	rm -f $(programs) $(programs:=.exe)
+ OBJS=cset.cmo syntax.cmo parser.cmo lexer.cmo table.cmo lexgen.cmo \
+      compact.cmo common.cmo output.cmo outputbis.cmo main.cmo
diff --git a/ocaml/patches/patch-man_Makefile b/ocaml/patches/patch-man_Makefile
index 95c6313ac9..65c124f23e 100644
--- a/ocaml/patches/patch-man_Makefile
+++ b/ocaml/patches/patch-man_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-man_Makefile,v 1.5 2022/05/24 18:25:38 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
 
diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile
index a57c880ea1..7f0a07546b 100644
--- a/ocaml/patches/patch-ocamldoc_Makefile
+++ b/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,15 +1,13 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- ocamldoc/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
+--- ocamldoc/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
 +++ ocamldoc/Makefile
-@@ -77,7 +77,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE
- COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
+@@ -66,7 +66,7 @@ COMPFLAGS = \
+   -g $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
    -safe-string -strict-sequence -strict-formats -bin-annot -principal
  
--LINKFLAGS=$(INCLUDES) -nostdlib
-+LINKFLAGS=$(INCLUDES) -nostdlib -cclib "$(LDFLAGS)"
+-LINKFLAGS = -g $(INCLUDES)
++LINKFLAGS = -g $(INCLUDES) -cclib "$(LDFLAGS)" # JPB: remove -g?
  
  CMOFILES=\
    odoc_config.cmo \
diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
index ced17451e8..cab79ae2b8 100644
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
@@ -1,11 +1,9 @@
-$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.3 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD$
 
-Honor LDFLAGS.
-
---- otherlibs/Makefile.otherlibs.common.orig	2021-02-24 13:49:29.000000000 +0000
+--- otherlibs/Makefile.otherlibs.common.orig	2022-10-12 13:53:13.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
-@@ -50,7 +50,7 @@ EXTRACFLAGS ?=
- EXTRACPPFLAGS ?=
+@@ -45,7 +45,7 @@ MKLIB=$(OCAMLRUN) $(ROOTDIR)/tools/ocaml
+ COBJS ?=
  EXTRACAMLFLAGS ?=
  LINKOPTS ?=
 -LDOPTS ?=
diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile
index edf081852d..a279d1b8b1 100644
--- a/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,42 +1,13 @@
 $NetBSD$
 
-Use BSD_INSTALL_* instead of mkdir
-Honor LDFLAGS.
-
---- otherlibs/systhreads/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
 +++ otherlibs/systhreads/Makefile
-@@ -30,6 +30,7 @@ NATIVE_CPPFLAGS = \
-   -DNATIVE_CODE -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM)
- 
- LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB)
-+LDOPTS = -ldopt "$(LDFLAGS)"
- 
- CAMLC=$(BEST_OCAMLC) $(LIBS)
- CAMLOPT=$(BEST_OCAMLOPT) $(LIBS)
-@@ -66,7 +67,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
- allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES)
- 
- lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS)
--	$(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LIBS)
-+	$(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LIBS) $(LDOPTS)
- 
- lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS)
- 	$(MKLIB_CMD) -o $(LIBNAME)nat $^
-@@ -74,7 +75,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB
- $(LIBNAME).cma: $(THREADS_BCOBJS)
- ifeq "$(UNIX_OR_WIN32)" "unix"
- 	$(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall \
--	  $(PTHREAD_CAML_LIBS) $^
-+	  $(PTHREAD_CAML_LIBS) $(LDOPTS) $^
- # TODO: Figure out why -cclib -lunix is used here.
- # It may be because of the threadsUnix module which is deprecated.
- # It may hence be good to figure out whether this module shouldn't be
-@@ -122,7 +123,7 @@ install:
+@@ -118,7 +118,7 @@ install:
+ 	  $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \
  	fi
  	$(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
- 	cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
--	mkdir -p "$(INSTALL_THREADSLIBDIR)"
+-	$(MKDIR) "$(INSTALL_THREADSLIBDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_THREADSLIBDIR)"
  	$(INSTALL_DATA) \
- 	  $(CMIFILES) threads.cma \
+ 	  $(CMIFILES) threads.cma META \
  	  "$(INSTALL_THREADSLIBDIR)"
diff --git a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c b/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
index b20da18bc7..de934490d8 100644
--- a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
+++ b/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
@@ -1,8 +1,6 @@
-$NetBSD: patch-otherlibs_systhreads_st__stubs.c,v 1.4 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD$
 
-Make the POSIX sigwait visible on SmartOS
-
---- otherlibs/systhreads/st_stubs.c.orig	2020-09-01 12:47:58.000000000 +0000
+--- otherlibs/systhreads/st_stubs.c.orig	2022-10-12 13:53:13.000000000 +0000
 +++ otherlibs/systhreads/st_stubs.c
 @@ -15,6 +15,9 @@
  
@@ -11,6 +9,6 @@ Make the POSIX sigwait visible on SmartOS
 +/* Needed for sigwait */
 +#define _POSIX_PTHREAD_SEMANTICS
 +
- #include "caml/alloc.h"
- #include "caml/backtrace.h"
- #include "caml/callback.h"
+ #if defined(_WIN32) && !defined(NATIVE_CODE)
+ /* Ensure that pthread.h marks symbols __declspec(dllimport) so that they can be
+    picked up from the runtime (which will have linked winpthreads statically) */
diff --git a/ocaml/patches/patch-otherlibs_unix_Makefile b/ocaml/patches/patch-otherlibs_unix_Makefile
index c5525a26b7..9b7bcdf955 100644
--- a/ocaml/patches/patch-otherlibs_unix_Makefile
+++ b/ocaml/patches/patch-otherlibs_unix_Makefile
@@ -1,15 +1,13 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- otherlibs/unix/Makefile.orig	2021-02-24 13:49:29.000000000 +0000
+--- otherlibs/unix/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
 +++ otherlibs/unix/Makefile
-@@ -23,7 +23,7 @@ unixLabels.cmi: \
-   EXTRACAMLFLAGS += -pp "$(AWK) -f $(ROOTDIR)/stdlib/expand_module_aliases.awk"
- 
+@@ -40,7 +40,7 @@ LINKOPTS=$(addprefix -cclib ,$(WIN32_LIB
+ LDOPTS=$(addprefix -ldopt ,$(WIN32_LIBS))
+ else # Unix
  # dllunix.so particularly requires libm for modf symbols
 -LDOPTS=$(NATIVECCLIBS)
 +LDOPTS=$(NATIVECCLIBS) "$(LDFLAGS)"
+ endif
  
- COBJS=accept.o access.o addrofstr.o alarm.o bind.o channels.o chdir.o \
-   chmod.o chown.o chroot.o close.o fsync.o closedir.o connect.o cst2constr.o \
+ # C source files common to both Unix and Windows
diff --git a/ocaml/patches/patch-runtime_Makefile b/ocaml/patches/patch-runtime_Makefile
deleted file mode 100644
index 919dadbabb..0000000000
--- a/ocaml/patches/patch-runtime_Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-Honor LDFLAGS.
-
---- runtime/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
-+++ runtime/Makefile
-@@ -265,7 +265,7 @@ build_config.h: $(ROOTDIR)/Makefile.conf
- # Libraries and programs
- 
- ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
--	$(MKEXE) -o $@ $^ $(LIBS)
-+	$(MKEXE) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- ocamlruns$(EXE): prims.$(O) libcamlrun_non_shared.$(A)
- 	$(call MKEXE_USING_COMPILER,$@,$^ $(LIBS))
-@@ -277,13 +277,13 @@ libcamlrun_non_shared.$(A): $(libcamlrun
- 	$(call MKLIB,$@, $^)
- 
- ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
--	$(MKEXE) $(MKEXEDEBUGFLAG) -o $@ $^ $(LIBS)
-+	$(MKEXE) $(LDFLAGS) $(MKEXEDEBUGFLAG) -o $@ $^ $(LIBS)
- 
- libcamlrund.$(A): $(libcamlrund_OBJECTS)
- 	$(call MKLIB,$@, $^)
- 
- ocamlruni$(EXE): prims.$(O) libcamlruni.$(A)
--	$(MKEXE) -o $@ $^ $(INSTRUMENTED_RUNTIME_LIBS) $(LIBS)
-+	$(MKEXE) $(LDFLAGS) -o $@ $^ $(INSTRUMENTED_RUNTIME_LIBS) $(LIBS)
- 
- libcamlruni.$(A): $(libcamlruni_OBJECTS)
- 	$(call MKLIB,$@, $^)
-@@ -292,7 +292,7 @@ libcamlrun_pic.$(A): $(libcamlrunpic_OBJ
- 	$(call MKLIB,$@, $^)
- 
- libcamlrun_shared.$(SO): $(libcamlrunpic_OBJECTS)
--	$(MKDLL) -o $@ $^ $(BYTECCLIBS)
-+	$(MKDLL) $(LDFLAGS) -o $@ $^ $(BYTECCLIBS)
- 
- libasmrun.$(A): $(libasmrun_OBJECTS)
- 	$(call MKLIB,$@, $^)
-@@ -307,7 +307,7 @@ libasmrun_pic.$(A): $(libasmrunpic_OBJEC
- 	$(call MKLIB,$@, $^)
- 
- libasmrun_shared.$(SO): $(libasmrunpic_OBJECTS)
--	$(MKDLL) -o $@ $^ $(NATIVECCLIBS)
-+	$(MKDLL) $(LDFLAGS) -o $@ $^ $(NATIVECCLIBS)
- 
- # Target-specific preprocessor and compiler flags
- 
diff --git a/ocaml/patches/patch-runtime_floats.c b/ocaml/patches/patch-runtime_floats.c
index 10b9c04c01..472ee10ec1 100644
--- a/ocaml/patches/patch-runtime_floats.c
+++ b/ocaml/patches/patch-runtime_floats.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-runtime_floats.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
 
 math.h on NetBSD 9 only declares copysign if _NETBSD_SOURCE is defined
 (implicitly or explicitly).  However copysign is specified by POSIX
diff --git a/ocaml/patches/patch-runtime_sak.c b/ocaml/patches/patch-runtime_sak.c
index d57abf976b..9e36a2755c 100644
--- a/ocaml/patches/patch-runtime_sak.c
+++ b/ocaml/patches/patch-runtime_sak.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-runtime_sak.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
 
 Explicit cast to int to eliminate warning
 
diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
index f599375b7e..afe9edd490 100644
--- a/ocaml/patches/patch-tools_Makefile
+++ b/ocaml/patches/patch-tools_Makefile
@@ -1,11 +1,9 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- tools/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
+--- tools/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
 +++ tools/Makefile
-@@ -41,7 +41,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
-                        file_formats lambda)
+@@ -42,7 +42,7 @@ DIRS = $(addprefix $(ROOTDIR)/,utils par
+ INCLUDES = $(addprefix -I ,$(DIRS))
  COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48-70 -strict-sequence \
  -warn-error +A -principal -safe-string -strict-formats -bin-annot $(INCLUDES)
 -LINKFLAGS = $(INCLUDES)
diff --git a/ocaml/patches/patch-tools_ocamlmklib.ml b/ocaml/patches/patch-tools_ocamlmklib.ml
index 8ee5c093be..1cc6566d4c 100644
--- a/ocaml/patches/patch-tools_ocamlmklib.ml
+++ b/ocaml/patches/patch-tools_ocamlmklib.ml
@@ -1,18 +1,16 @@
 $NetBSD$
 
-Add ELF mode support to ocamlmklib
-
---- tools/ocamlmklib.ml.orig	2021-09-30 15:40:11.000000000 +0000
+--- tools/ocamlmklib.ml.orig	2022-10-12 13:53:13.000000000 +0000
 +++ tools/ocamlmklib.ml
-@@ -42,6 +42,7 @@ and c_objs = ref []         (* .o, .a, .
+@@ -40,6 +40,7 @@ and c_objs = ref []         (* .o, .a, .
  and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
  and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
  and dynlink = ref Config.supports_shared_libraries
 +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 *)
-@@ -109,6 +110,8 @@ let parse_arguments argv =
+ and c_libs = ref []         (* libs to pass to mkdll and ocamlc -cclib *)
+ and c_Lopts = ref []      (* options to pass to mkdll and ocamlc -cclib *)
+@@ -105,6 +106,8 @@ let parse_arguments argv =
        c_objs := s :: !c_objs
      else if s = "-cclib" then
        caml_libs := next_arg s :: "-cclib" :: !caml_libs
@@ -21,7 +19,7 @@ Add ELF mode support to ocamlmklib
      else if s = "-ccopt" then
        caml_opts := next_arg s :: "-ccopt" :: !caml_opts
      else if s = "-custom" then
-@@ -135,8 +138,9 @@ let parse_arguments argv =
+@@ -131,8 +134,9 @@ let parse_arguments argv =
        c_libs := s :: !c_libs
      else if starts_with s "-L" then
       (c_Lopts := s :: !c_Lopts;
@@ -33,7 +31,7 @@ Add ELF mode support to ocamlmklib
      else if s = "-ocamlcflags" then
        ocamlc_opts := next_arg s :: !ocamlc_opts
      else if s = "-ocamlc" then
-@@ -151,6 +155,8 @@ let parse_arguments argv =
+@@ -147,6 +151,8 @@ let parse_arguments argv =
        output_c := next_arg s
      else if s = "-dllpath" || s = "-R" || s = "-rpath" then
        rpath := next_arg s :: !rpath
@@ -42,7 +40,7 @@ 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
-@@ -199,6 +205,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+@@ -195,6 +201,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\
diff --git a/ocaml/patches/patch-yacc_Makefile b/ocaml/patches/patch-yacc_Makefile
deleted file mode 100644
index d9e895858c..0000000000
--- a/ocaml/patches/patch-yacc_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Honor LDFLAGS when building ocamlyacc.
-
---- yacc/Makefile.orig	2022-02-08 16:50:13.000000000 +0000
-+++ yacc/Makefile
-@@ -38,7 +38,7 @@ generated_files := ocamlyacc$(EXE) $(oca
- all: ocamlyacc$(EXE)
- 
- ocamlyacc$(EXE): $(ocamlyacc_OBJECTS)
--	$(MKEXE) -o $@ $^ $(EXTRALIBS)
-+	$(MKEXE) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- 
- .PHONY: clean
- clean:
Prev by Date: redeclipse16: Install it as "redeclipse16" instead of "redeclipse"
Next by Date: plan9port: update to plan9port-20220912
Previous by Thread: redeclipse16: Install it as "redeclipse16" instead of "redeclipse"
Next by Thread: plan9port: update to plan9port-20220912
Indexes:
Home | Main Index | Thread Index | Old Index