From nobody Fri Dec 30 09:18:48 2022 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 4Nk07D6SRRz2khJq; Fri, 30 Dec 2022 09:18:48 +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 4Nk07D62yfz4byZ; Fri, 30 Dec 2022 09:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391928; 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=Qm18RObC1TLweFF1pff5wBCn8fc8Sp3VJgxG8aycOFM=; b=F8uGodndOLOccQOCF2+hzqHU2nC3pABkSbZ1cMgDbNH8k5c5jpVt+140NdIOjZvVKRnpXE phEmdvqF1BeZOmsxoiPNDFG2xp2Zf+efEqBiejZkD4vafRDaJ77b1IJHUzMtV6Y63jIWkW fs7xhhtQLfqMSeT9i6cuAL9bUyvUZs2xI5RszyYBwLFWcRB7BH0oCN/tLLB8yRJVBAvESJ NnQKDx5MtQZTKc53icLZh9/lwooDhclaEGyLA/woIVazq2+EnaAJux32TVU05Bu9retGsB hcJ6bLGkTITchOqf+gj/Je/XGXLHSjXs74+vjOWjUheavPNEF0CmppQIUGe6PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391928; 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=Qm18RObC1TLweFF1pff5wBCn8fc8Sp3VJgxG8aycOFM=; b=NoqbFSVLBRQL7lTXp9JG0MouwFRFGqiGECdwfnXfdVg7HbiKVJatK/IVRhlpjtp9YiW5ay XruW+RY1tzmrldkMIRV2zbT1gt0KWyZqtMfDA2xlUcz55QTclDLWSCKc5Z7bJeADEJFvVY mIaU8vH+WBSxz93KjtLtEt7bF5zcjqsIJ/xxqgCbpOIikQ68RKg1AfedlsBNaqv5T7eoNy gqErqNOVVTatZWc9RU2AKkUoQKHqBSA+nuM//NYLjv9zOL94VClBUHUNyHjZdV6iOzopRX 4cSgF5umsq69psO9GSJlthdZckcflcvok55PkfWRnw8kWPM+5KkAbwRZWO6iZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391928; a=rsa-sha256; cv=none; b=bFLPdVq46/96HPhyEkJ4qLzfCV4Hy7OyqtB0DM+z+g6FinxISOU0oLxZerthPVuWRC7EBA 36fkzB+JZW0y0E9nNLsQrYNH6RdnBGF+iWpDg0jkdJfQwhlhqWuTA9BWXbNWMiE8Uf76A4 FToB5H4G3cMO/RzLaNOc4125SIgR/gT0SNdrVjX+4jZhqdDKqmPywLQsKbueLBzoaQ9UK3 AlEHXVRtojt5kIehEqMS62UuZ+1D8WoizlpdgovZgq3Tk/UK8212rmy8pJiY1d1D4MjnxB +hFKVUCZcb9v/+DSRvj+dA89oseyZDn1+Nnx0P37+u6Y6AKFZk3ABUsYBudL/w== 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 4Nk07D54k2z13Lc; Fri, 30 Dec 2022 09:18:48 +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 2BU9ImUm027582; Fri, 30 Dec 2022 09:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9Img1027581; Fri, 30 Dec 2022 09:18:48 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:18:48 GMT Message-Id: <202212300918.2BU9Img1027581@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 27f9bd4c225e - main - lang/ruby30: Fix orphaned .timestamp in 93e3548c57a4a1dbd5fd335e2be23c02d9dcf066 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27f9bd4c225ec784b992974fd49cfb0987dbf88b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=27f9bd4c225ec784b992974fd49cfb0987dbf88b commit 27f9bd4c225ec784b992974fd49cfb0987dbf88b Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:55:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:06:32 +0000 lang/ruby30: Fix orphaned .timestamp in 93e3548c57a4a1dbd5fd335e2be23c02d9dcf066 When both CAPIDOCS and DOCS options are enabled, the following commands are executed: 1. post-install-CAPIDOCS-on: removed the installed .timestamp (in STAGEDIR). 2. post-install-DOCS-on: copied the generated .timestamp (in capi directory) to the STAGEDIR again. Therefore, the installed .timestamp is orphaned. To fix this, we remove both the generated and installed .timestamp in post-install-CAPIDOCS-on:. PR: 267775 Reported by: yasu --- lang/ruby30/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index 1580225a778a..b4e564ce8bd8 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -175,7 +175,7 @@ post-install: .endif post-install-CAPIDOCS-on: - ${RM} ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp + ${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST} post-install-DEBUG-off: @@ -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}/ "! -name .timestamp") + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \