From nobody Fri Dec 09 04:37:50 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 4NSytl1WfHz4jQt0; Fri, 9 Dec 2022 04:37:51 +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 4NSytl0yDYz4K7b; Fri, 9 Dec 2022 04:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560671; 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=pZZ6NDELwgoIZdhIViU+WywiVSsieXY1WRwyUDNOkuM=; b=CpOfZ+nPGM5N/HwLDmRS7M8iAGBcb/0jiBjtEK/jkI1oYKGlTdYzY2+OIXfehIwNkFYpTV VMt4b0BGoX4uzqotoSq1U7WxuKgMvSmS9uy2hsi+EthHYxRDCumimwU2iI1aYqMXjIZv9P TEzvKMJqrtzSJVc9TueG0DhX/OkKq+ZFiQ0xuTdDi+bjgo7sTBT0yK5vCfawJPOUKAAXQr lJd2jizCOs/44Dn7JUCg56LpK54DD4GWbBtKOA1Jh0a/jE5eYU+Csei6uHsz/KuFkQaGzZ mt6TjbIoTWH61qMYiUkGeyOK/IAEvkhB45b+CsxofzmvtXjPltUgYw45n5TNEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560671; 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=pZZ6NDELwgoIZdhIViU+WywiVSsieXY1WRwyUDNOkuM=; b=Z6+Wg+O6lCjjv/eO5/kNB44GnP5ypAi+4KpszYu5hSdwRH6zrXdGZOYC+VcB3OsZNyOFZt U9htn/diMfIhbswoK/mdQKLG/TTPXF7MP4xCsTDq/fyFVkcb6n0NHqCeT7QCRHNP7uh/Qa pbGDKk+CLuUc0SnWb87ph8NcL5z2hgvRRhQ2X/ExmfUmtkUrBbeU7B2JVb0wNwIMD2RJ3a S5njeNArBNBtSi4YmikxYP4U/TZDDInVaRuXdDeOm6MnJMGnZRegBHfCtSeP6ypH0tN3zA nAeZFcpucS+DPtMyVL482z7kzwGoynVYUAuyxV1nMQMVWqvridsgtZ1Ks3kx8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670560671; a=rsa-sha256; cv=none; b=cdBtawFiKv8zm2fw/qahuSOK8EPnMrAPP0rw+hd4Umx+Jpg1Y9Hmg0EijQcBBeVVBugiqp HRDKdsT2npndIlsEx4nE1PjtHWDD3LWiYdiawY1WIUGB82BPqlSBk3eQaic23mBW7dlauj aIevKNoCwP4TdNOqE5/l+Y/A2uqcAIlOGstdHRkdooY2ozyuzXGj+v8KvIqG7Y7ifB5NtQ k4Ez+TGq3yKBPXVDRtWOLidLtSKYmYn7s4K7TBw/8gnJe5a/8IHBFI6pxyy3amjRPJkGZd Ng922iCOT26mtPrp3IRRRhNvWVgV0trCjjA75PXWLJlUjIQspOH0R/srA6wYPQ== 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 4NSytl0014zMrd; Fri, 9 Dec 2022 04:37:50 +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 2B94bow7029852; Fri, 9 Dec 2022 04:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B94bo95029851; Fri, 9 Dec 2022 04:37:50 GMT (envelope-from git) Date: Fri, 9 Dec 2022 04:37:50 GMT Message-Id: <202212090437.2B94bo95029851@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: bca8d7334e2d - main - lang/ruby27: 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: bca8d7334e2d24d2be79498c5e561af8919c17f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=bca8d7334e2d24d2be79498c5e561af8919c17f9 commit bca8d7334e2d24d2be79498c5e561af8919c17f9 Author: Yasuhiro Kimura AuthorDate: 2022-11-25 01:44:04 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-09 04:34:56 +0000 lang/ruby27: 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: bdbe2a2f4098 lang/ruby27: Simplify CAPIDOCS handling --- lang/ruby27/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile index f72e3b688d92..cb6e5734c7a6 100644 --- a/lang/ruby27/Makefile +++ b/lang/ruby27/Makefile @@ -207,7 +207,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 \