From nobody Sun Jan 21 01:01:18 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4THZmb2f6sz57v3c; Sun, 21 Jan 2024 01:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4THZmZ5fD9z471H; Sun, 21 Jan 2024 01:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705798878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPDlvVCpxY68OhBJMtLHo1W3Qsq7tuTdIub1/x83LGM=; b=kuIXV3P6aYkF9h/TbaQHwW/Z062VlNaBy3YXd/hBHnWiNLj9FDXvcnvdNgfSVwVc2PYvQR llPF7p1eewKVXDxLWtcYN4d4w/WOiGEuSoqW92CNGh7vWaT0l4jMk7LNIviH3Ge5h8K7y6 dEI4w9ihgLt71SDPotQ4WAakz/Sw+XXPhzV/40w9c6zwmuN1VRRO5i3AQmzQwsVBBuBWmc rQDnOFoZnWYzw5rY9IAgaUJLnSJMiG6IDEWtMnvlJfRcP1HAAb716VSH5RIpcn2/bPDYwv ghQQ0mkjd0UwQIXlrXeRUROWdQaJymfwTmJhoPwK4SLlhDIWtD+vXiMt3lTzzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705798878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPDlvVCpxY68OhBJMtLHo1W3Qsq7tuTdIub1/x83LGM=; b=fStd4ZdnOJyTHlJuT0dXmeNzq4PADfNLzbrHlRi9vkusD0vlYhJ1LyHsKq2aCV5j9k0vCQ PCt8J2NwYdgeOc6TgNGfZmjPjZWNZBMauIj2KwGlNEJKt92iEyCXuoJSxh6FX7vmYSxEnC 6HRRj2JC9LjqgoWi8kKAoIjxotcpy8qH+YoUDHiqYwimqGJFNGPmJBI+AoXscZZFBuIMIr hIhdbxU9piOsL7jjoW3zPmtXL1u1ROeSstljsAPjd0lnhxtGGUTS/DRWgVQ40SBIcmRMxK n4gi5TE0RBCYBoHslPjyS7lYC965FwVkDfwQg/kabFkSV0CWJdehwPVzjuH7iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705798878; a=rsa-sha256; cv=none; b=wUCX2B/ucTiGbjtJdYRJghm18P+w4Ilfp0o3RNM69UETE2gadzIZGLoDY+SNxrU8Z7Fe5j V6GSDMDAksY1Sui1RQVRKup9TQhBsgJUdAZAw+l8LdBO0tPe95v4YQIXGt0SKOgohvIV29 ad01ui9fqq+Jq1vQXLEib0o67EXBJZXQRlZ/i+c+7UXQHGa/qnsbT/Z61jSXFGIi3iQQ8S C2KvrWlMDJ7efYuDgHyIDsz2xSA3ZAZ448Vs3MJfSjK3ZVM/KHOdmcxhVXKgDiHkXJD35U fnaW7istKWvlJsSTr0h2e8TDZabBRy5K3Fi3f/C82aN6iBMb5roIDxBBeKY0zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4THZmZ4kqCzxY7; Sun, 21 Jan 2024 01:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40L11IEw008810; Sun, 21 Jan 2024 01:01:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40L11IRM008807; Sun, 21 Jan 2024 01:01:18 GMT (envelope-from git) Date: Sun, 21 Jan 2024 01:01:18 GMT Message-Id: <202401210101.40L11IRM008807@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9d226a1505ea - main - devel/ocaml-dune: Sanitize MANPREFIX List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d226a1505ea51ea3fce7b720c5aa7b8988c9e0c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d226a1505ea51ea3fce7b720c5aa7b8988c9e0c commit 9d226a1505ea51ea3fce7b720c5aa7b8988c9e0c Author: Muhammad Moinur Rahman AuthorDate: 2024-01-21 00:27:28 +0000 Commit: Muhammad Moinur Rahman 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