From nobody Fri Dec 09 04:37:52 2022 X-Original-To: dev-commits-ports-main@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 4NSytm3KlRz4jQt4; Fri, 9 Dec 2022 04:37:52 +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 4NSytm1Xdbz4K5J; Fri, 9 Dec 2022 04:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560672; 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=ozmwtIuWmc+SrBl1NxfaC062PO0kGImphstvZDKcy8s=; b=a3CcCBhB9Bc2NwindCqjXgwcX0UMQAeb5nuFSHDgP20EN/6ShHZjHQhsOhpWswoBsjgDn/ f8Zc8uj2/0S0ZPExnLtGVNtRgJYtAWIq7tsHjdykMxA8TGwlthA42fj+zs1vc/AGQZoW5/ 5qScDocG0AFwWrjQ25cOalq3Tw75jVVjVIxoIYZafPGFNiP1ZJk4QPLsdYb5TvDXzv5KKv Wo4DoK3Ocp++rF+hWrtLbDBDe725nV7dB2ZaX6G3JFCcWxOaUTQaEWyI4c6/FJF+uYeB5z bMAFgSaSzkP09jZJogME8BbaRhIAWIRnUnoSHCGvQSe3fjVJYycci8OsvRvhcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560672; 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=ozmwtIuWmc+SrBl1NxfaC062PO0kGImphstvZDKcy8s=; b=HYmgYyV6S5pPO4bgvKulc520i0L7ch4ZqJyv2Q+PmpdnH3VzMMANGxuae3osq4gJ7KjJQA 0PDwiS2lLxic2zThtSFD3XQ+37lTb1+jKoc+dLnSc0w57SkRLjnfDw5EIOUILlx5zLvVY8 GvgBRpoLavNBJmMSMKLEGvj/AXTQ6CvB8iLzafEYizwK+vviPTemslY9ikuYOL8hXAkV+6 IpIFVh/vafxc8uoV8aqjmZ16UfAEbsKyBQ3J7amLoHETPYtvA45iW5/G5cXclWR8Aubbys 8Os0kkqhLJ5X0AJQQHmAyq2OOlCix73gVsbN6VHP+6EZ4ipx3eEzp+9Vd+uSrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670560672; a=rsa-sha256; cv=none; b=d48AHjCJiBEynM4qbp6hFFF4zqW/gojVhZd94vwgtUBjaCNRC8Nw31RDBTeevr4JcFSzyC BCHIjr8l7CWs1nFSXJP4sBFT9RxfNaSJpOwGwtvJ77SN26CQqaG+mt1C+biQeto7jgd4Xu RX0QuumFRzp6SAKAjCVMLeWMVG8G1IV+tnObz7QKawpM3lRNyE7ygSeGCNI/zCBNcQN/ZQ o258ZkCFYr09tZ87MuUpXWIPnLCRH+5ZFadUkeVa/PCHKI1W6Z0Otkm2GKr/lbuCLLYqBy oHdxOrJvrCL1Dr51IoPCj6ut1gpoeJ8FxEneBmobj9sSkvU4Ebk1Y0pboIMdLw== 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 4NSytm0fPHzN4Z; Fri, 9 Dec 2022 04:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B94bqwR029876; Fri, 9 Dec 2022 04:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B94bqpc029875; Fri, 9 Dec 2022 04:37:52 GMT (envelope-from git) Date: Fri, 9 Dec 2022 04:37:52 GMT Message-Id: <202212090437.2B94bqpc029875@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 2930b1926d9e - main - lang/ruby30: Fix plist error when both CAPIDOCS and DOCS options are on. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2930b1926d9e48729689af98928ae1ed2dfa7c06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=2930b1926d9e48729689af98928ae1ed2dfa7c06 commit 2930b1926d9e48729689af98928ae1ed2dfa7c06 Author: Yasuhiro Kimura AuthorDate: 2022-11-25 01:45:56 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-09 04:34:58 +0000 lang/ruby30: Fix plist error when both CAPIDOCS and DOCS options are on. When the both options are on, post-install-DOCS-on target is called after post-install-CAPIDOCS-on has completed. And in the former files under ${WRKSRC}/doc/ are copied to ${STAGEDIR}${RUBY_DOCDIR}. This means files under ${WRKSRC}/doc/capi are copied to ${STAGEDIR}${RUBY_DOCDIR}/capi again. And of course ${WRKSRC}/doc/capi/.timestamp is included in them. As a result, even though ${STAGEDIR}${RUBY_DOCDIR}/capi/.timestamp is removed in post-install-CAPIDOCS-on target, it is detected as orphaned file at check-plist phase. So fix it by adding 3rd argument to ${COPYTREE_SHARE} command so .timestamp is excluded from files to be copied. PR: 267775 Approved by: meta (ruby@) Fixes: 93e3548c57a4 lang/ruby30: Simplify CAPIDOCS handling --- lang/ruby30/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index 5cd724866913..1580225a778a 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -196,7 +196,7 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \ ${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/ .endfor - @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/ "! -name .timestamp") ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \