diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 3358ec1e3e3a..6f32398bbcc5 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	omake
 DISTVERSION=	0.10.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Flexible build system
 WWW=		http://projects.camlcity.org/projects/omake.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ncurses readline
 USE_OCAML=	yes
 
 NO_OCAML_RUNDEPENDS=	yes
 HAS_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
-MAKE_JOBS_UNSAFE=	yes
 
 INFO=		omake-doc
 
 OPTIONS_DEFINE=	DOCS
 
 bench: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake bench
 
 post-install:
 	@(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
 	@(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info-* \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/omake
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake check
 	@${FIND} -ds ${WRKSRC}/test -type f -name 'result.log' -print0 | \
 		${XARGS} -0tI @ ${CAT} @
 
 .include <bsd.port.mk>
diff --git a/devel/omake/files/patch-mk_make__config b/devel/omake/files/patch-mk_make__config
new file mode 100644
index 000000000000..57f7a95b300c
--- /dev/null
+++ b/devel/omake/files/patch-mk_make__config
@@ -0,0 +1,13 @@
+Manual patch for MANDIR, configure lacks -mandir option
+
+--- mk/make_config.orig	2024-02-23 18:54:11 UTC
++++ mk/make_config
+@@ -35,7 +35,7 @@ MakeConfig(CONFIG_FILE) =
+         include $(PRECONFIG_FILE)
+         BINDIR = $(PREFIX)/bin
+         LIBDIR = $(PREFIX)/lib
+-        MANDIR = $(PREFIX)/man
++        MANDIR = $(PREFIX)/share/man
+         export
+ 
+     #
diff --git a/devel/omake/pkg-plist b/devel/omake/pkg-plist
index 79c63c1bda39..3196151a8212 100644
--- a/devel/omake/pkg-plist
+++ b/devel/omake/pkg-plist
@@ -1,58 +1,58 @@
 bin/omake
 bin/osh
 lib/omake/OMakefile.default
 lib/omake/OMakeroot.default
 lib/omake/OMakeroot.om
 lib/omake/Pervasives.om
 lib/omake/build/C.om
 lib/omake/build/Common.om
 lib/omake/build/LaTeX.om
 lib/omake/build/OCaml.om
 lib/omake/build/svn_realclean.om
 lib/omake/configure/Configure.om
 lib/omake/configure/X.om
 lib/omake/configure/fam.om
 lib/omake/configure/fs_case_sensitive.om
 lib/omake/configure/moncontrol.om
 lib/omake/configure/ncurses.om
 lib/omake/configure/posix_spawn.om
 lib/omake/configure/readline.om
 lib/omake/configure/snprintf.om
 lib/omake/parse/C/Lex.om
 lib/omake/parse/C/Parse.om
 lib/omake/parse/LaTeX/Lex.om
 lib/omake/parse/LaTeX/Macros.om
 lib/omake/parse/LaTeX/Parse.om
 lib/omake/parse/LaTeX/Spell.om
 lib/omake/web/simple-xml.om
-man/man1/omake.1.gz
-man/man1/osh.1.gz
+share/man/man1/omake.1.gz
+share/man/man1/osh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-all-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-autoconf.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-base.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-build-examples.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-build.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-contents.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-detail.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-doc.css
 %%PORTDOCS%%%%DOCSDIR%%/omake-doc.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-fun-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-grammar.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-language-examples.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-language-naming.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-language.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-obj-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-option-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-options.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-pervasives.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-references.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-rules.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-shell.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-system.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-target-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-var-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake.html
 %%PORTDOCS%%%%DOCSDIR%%/osh.html