From nobody Fri Dec 09 04:37:53 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 4NSytn32t5z4jQVr; Fri, 9 Dec 2022 04:37:53 +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 4NSytn2Vtsz4KRd; Fri, 9 Dec 2022 04:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560673; 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=ZDmgcYedE5CEgXGpKbZARVN+U5upw2nw2ZtjjzxBypc=; b=xsjBcZjRP2k10p7Q3lk7EiBIF7k8VmpjqhMqJ15cn+2++hfjJQIe2NW16sZko8NtU5SCMk ZEWlGSJ+ZblUr7C0jXgYfG91DcHJSYMHAmXAjEgQ6+xLhnmHFkHXqx6BBDviXNKBw6DSu/ lssXdqNQtIocSNwlv8CSfQJEPDoQPS+3zpk4mVW3E3LAqzx4Ft7ZNiYnVdHSfLbZi+HC5N y0T9SrQ8Incr8izk1R0fN8LnIoLC9oy8FJTRDrsNojAHQ92NcCiWcidLSpOYgYEuMUHng1 DQL7HIm1jJ7tvODn/Flc7pmLgOQssd3erjojdFFgdBTn1SFOl/Ii7jQj2Ev1JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560673; 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=ZDmgcYedE5CEgXGpKbZARVN+U5upw2nw2ZtjjzxBypc=; b=rVdflXcQln2ZsdNxd9c9Tkz/fj2ggwXR57nzpU/VtRMpvGxBFMF6fNYf6x+QgCGUFqQ7ut 6bnmiJ1oBAKXLAhCo9g+OmDQmWbbi89ib/y/Yb+L/vjXG3diXPlJ7U8PbMTznNMUBjW9BE 2Ul7aja0qG+bSuUdd4CZp4uV0sQxplCqBxDLUl45cxXt7U64cwxNb72+u+S/jnVh+FpRpB wNBp50D9/V1P3u1KI+bXwCECI8NmQ23NrTlKp14hJ4gMff/cI4dlY7F6ocUoTbaXOd5z/8 sxUssudKetpsyraHNUWjyjUUYxAO7eQFexT7hrErUiQFwWYME2jvJQSb2s61Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670560673; a=rsa-sha256; cv=none; b=EKYSKdGnLBthg54JNy6l8JNhF0I6gw2OZxOxwuoTOiojUWa3+TmYdhKqARmdQCOaf0ye3w l9obu6Sl/alvrjYScymX8N8XXEBCKlTq/hXXYGMwSUF+Z+wOexS48Vd76Knpb6FaCWfe1u RxemFoaEMYGBFJvDmBTuYF26/j6MCpUuf95YSbR3vVfj1E4DkMZSfWxeBF64yz8Cb5p1e1 eiCzKnF66Sq6v2WDFnBxcQvfKpZDJyXklMnSWZAfaZWwy7RbjY0GDVPB1lmp9QuvjW3F0i 4G7ClmVJlpInYKz6b3XfXyRciXL2hUehC0ol1+leDumlcZ8+RHHuxvEis+itGA== 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 4NSytn1cCwzNGM; Fri, 9 Dec 2022 04:37:53 +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 2B94br9X029901; Fri, 9 Dec 2022 04:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B94brM2029900; Fri, 9 Dec 2022 04:37:53 GMT (envelope-from git) Date: Fri, 9 Dec 2022 04:37:53 GMT Message-Id: <202212090437.2B94brM2029900@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: e09de8e0440d - main - lang/ruby31: 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: e09de8e0440d26dbe40e4200c647d7aebef02cc6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e09de8e0440d26dbe40e4200c647d7aebef02cc6 commit e09de8e0440d26dbe40e4200c647d7aebef02cc6 Author: Yasuhiro Kimura AuthorDate: 2022-11-25 01:47:17 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-09 04:34:59 +0000 lang/ruby31: 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: 6021649ff0ce lang/ruby31: Simplify CAPIDOCS handling --- lang/ruby31/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile index 295f3bd3a650..fa350ff2e52a 100644 --- a/lang/ruby31/Makefile +++ b/lang/ruby31/Makefile @@ -201,7 +201,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 \