Date: Sun, 21 Jan 2024 01:01:18 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9d226a1505ea - main - devel/ocaml-dune: Sanitize MANPREFIX Message-ID: <202401210101.40L11IRM008807@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d226a1505ea51ea3fce7b720c5aa7b8988c9e0c commit 9d226a1505ea51ea3fce7b720c5aa7b8988c9e0c Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-21 00:27:28 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-21 01:01:07 +0000 devel/ocaml-dune: Sanitize MANPREFIX Approved by: portmgr (blanket) --- devel/ocaml-dune/Makefile | 6 +++-- devel/ocaml-dune/pkg-plist | 64 +++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index fc788d16c232..179ee59f8897 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -1,5 +1,6 @@ PORTNAME= dune PORTVERSION= 3.7.1 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -17,8 +18,7 @@ USE_OCAML_FINDLIB= yes SUB_FILES= setup.ml SUB_LIST= OCAML_SITELIBDIR="${PREFIX}/${OCAML_SITELIBDIR}" \ OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" \ - OCAML_DOCSDIR="${OCAML_DOCSDIR}" \ - MANPREFIX="${MANPREFIX}" + OCAML_DOCSDIR="${OCAML_DOCSDIR}" CONFLICTS_INSTALL= wdune @@ -33,6 +33,8 @@ post-patch: @${REINPLACE_CMD} -e '/doc_root = Path.relative/ \ s:"doc:"${OCAML_DOCSDIR:S,^${PREFIX}/,,}:' \ ${WRKSRC}/src/dune_rules/install.ml + @${REINPLACE_CMD} -e 's|\"man\"|\"share/man\"|g' \ + ${WRKSRC}/src/dune_rules/install.ml pre-configure: @${MV} ${WRKDIR}/setup.ml ${WRKSRC}/src/dune_rules/setup.ml diff --git a/devel/ocaml-dune/pkg-plist b/devel/ocaml-dune/pkg-plist index a3b0ef9841b8..df6d7cb6c05e 100644 --- a/devel/ocaml-dune/pkg-plist +++ b/devel/ocaml-dune/pkg-plist @@ -950,38 +950,38 @@ bin/dune %%OCAML_SITELIBDIR%%/xdg/xdg.cmxs %%OCAML_SITELIBDIR%%/xdg/xdg.ml %%OCAML_SITELIBDIR%%/xdg/xdg.mli -man/man1/dune-build.1.gz -man/man1/dune-cache.1.gz -man/man1/dune-clean.1.gz -man/man1/dune-coq.1.gz -man/man1/dune-describe.1.gz -man/man1/dune-diagnostics.1.gz -man/man1/dune-exec.1.gz -man/man1/dune-external-lib-deps.1.gz -man/man1/dune-fmt.1.gz -man/man1/dune-format-dune-file.1.gz -man/man1/dune-help.1.gz -man/man1/dune-init.1.gz -man/man1/dune-install.1.gz -man/man1/dune-installed-libraries.1.gz -man/man1/dune-internal.1.gz -man/man1/dune-ocaml-merlin.1.gz -man/man1/dune-ocaml.1.gz -man/man1/dune-printenv.1.gz -man/man1/dune-promote.1.gz -man/man1/dune-promotion.1.gz -man/man1/dune-rpc.1.gz -man/man1/dune-rules.1.gz -man/man1/dune-runtest.1.gz -man/man1/dune-shutdown.1.gz -man/man1/dune-subst.1.gz -man/man1/dune-test.1.gz -man/man1/dune-top.1.gz -man/man1/dune-uninstall.1.gz -man/man1/dune-upgrade.1.gz -man/man1/dune-utop.1.gz -man/man1/dune.1.gz -man/man5/dune-config.5.gz +share/man/man1/dune-build.1.gz +share/man/man1/dune-cache.1.gz +share/man/man1/dune-clean.1.gz +share/man/man1/dune-coq.1.gz +share/man/man1/dune-describe.1.gz +share/man/man1/dune-diagnostics.1.gz +share/man/man1/dune-exec.1.gz +share/man/man1/dune-external-lib-deps.1.gz +share/man/man1/dune-fmt.1.gz +share/man/man1/dune-format-dune-file.1.gz +share/man/man1/dune-help.1.gz +share/man/man1/dune-init.1.gz +share/man/man1/dune-install.1.gz +share/man/man1/dune-installed-libraries.1.gz +share/man/man1/dune-internal.1.gz +share/man/man1/dune-ocaml-merlin.1.gz +share/man/man1/dune-ocaml.1.gz +share/man/man1/dune-printenv.1.gz +share/man/man1/dune-promote.1.gz +share/man/man1/dune-promotion.1.gz +share/man/man1/dune-rpc.1.gz +share/man/man1/dune-rules.1.gz +share/man/man1/dune-runtest.1.gz +share/man/man1/dune-shutdown.1.gz +share/man/man1/dune-subst.1.gz +share/man/man1/dune-test.1.gz +share/man/man1/dune-top.1.gz +share/man/man1/dune-uninstall.1.gz +share/man/man1/dune-upgrade.1.gz +share/man/man1/dune-utop.1.gz +share/man/man1/dune.1.gz +share/man/man5/dune-config.5.gz %%PORTDOCS%%share/doc/ocaml/dune-action-plugin/CHANGES.md %%PORTDOCS%%share/doc/ocaml/dune-action-plugin/LICENSE.md %%PORTDOCS%%share/doc/ocaml/dune-action-plugin/README.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401210101.40L11IRM008807>