From nobody Fri Dec 30 09:18:49 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 4Nk07G0GQ5z2khKl; Fri, 30 Dec 2022 09:18:50 +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 4Nk07F6vMxz4bqq; Fri, 30 Dec 2022 09:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391930; 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=w9mI+m3w7tdmSR8uMcH6mS0EnWAJ3TO/HZRJ6q+snbE=; b=CDqeEeVgDfNTwN0rSYoSUt63+rb2kKeBgsg/aOPjr8sLRgqJRWkaVwfxMkujozLJ/Wrt9o NttddEscesbYn/srF3wclY7t19isNQQbyfksZQWhYNkm5HRRbWOK7R1JpI79+GS+7TYeYj XmcM7HrffAVSQV6IU7YwNGnU1tIHmoFX4Noxdo1LLSUNlVXM33CkJE2PfjjGl3NkUthH9H YfNMnTMematdrs4mhmZSMuwGRlZ0RTC+1sK8QfznfZSPCTCxEtuFQcA5E0rH1kyEXnZBwS F8taEH9vCym4xr9NxIFw3sR/GrQ/USaa3Fw/01/1+s1Rncq5m31BR81T3/zOwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391930; 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=w9mI+m3w7tdmSR8uMcH6mS0EnWAJ3TO/HZRJ6q+snbE=; b=jTjGgySIyr5XyQ+t+acAhnaHKvlPfg4aCphQt/KCPcmjGL6kQzbH+WNfCVFXTwHZHV7hy7 XFDQ8k3w+Z1i+YwuQEhv0r/1+VN7tL6CiaiEi1EySgEMF76n9ITl/pZrjx283e75FhdNuT eO8QUrnTKAdnuBChIjuBGnvd4DkBvGZCkSX0M32EV/ugOnrwolApNVLvJNJRI4N2yH2AAP evu/+tA0wGc+jLMR8TLLA6vjPtRdACKQH5Lxxlmxe6ZgwFB629wfSBHrNfZCKYaKOvyI9d gNjFkS3fQQeHipkFLjpoYuT/wSloymFXWbE3jlL3p+WAC47UFJVrH4FABPxXUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391930; a=rsa-sha256; cv=none; b=ahawOieyIzMgVRcp39lYKI09Q8EQplrNs/biz/Awv0Ye84ZCBaXjreakadsA0Ziy037JEf gdW5WQlv7SW0vD+dQubCOng+5hnKTbpAdMvpK8roTpccgcEeGcdLC5Ot+m6OHP2oZBgqxK xBG0Wfr08dLxvkSqj0TpgXSmbN2iMeC4yArUBEfT7yjB1+9MuZck4JOlPB4krWZ/2xK6GX gTorc3xBWypKNFTxLejGoWhasqPXaDIfFoIMP/ERlm/+IA5QBdqpOtt836tdc8pAp502sb hX+3zOfQRDKHtPpOVfdHQYU3EXJVgaja/nwx6NDz8s5rtwGUWyXnFdobW8N+KQ== 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 4Nk07F61Rkz13dD; Fri, 30 Dec 2022 09:18:49 +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 2BU9InZC027612; Fri, 30 Dec 2022 09:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9Ings027611; Fri, 30 Dec 2022 09:18:49 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:18:49 GMT Message-Id: <202212300918.2BU9Ings027611@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: b59d2f879d21 - main - lang/ruby31: Fix orphaned .timestamp in 6021649ff0cee1ea88e34b5444c2fe31031ca29a 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b59d2f879d2123a09d4563a006443659128213ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b59d2f879d2123a09d4563a006443659128213ae commit b59d2f879d2123a09d4563a006443659128213ae Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:55:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:06:32 +0000 lang/ruby31: Fix orphaned .timestamp in 6021649ff0cee1ea88e34b5444c2fe31031ca29a 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/ruby31/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile index fa350ff2e52a..0bf41f00efa0 100644 --- a/lang/ruby31/Makefile +++ b/lang/ruby31/Makefile @@ -180,7 +180,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: @@ -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}/ "! -name .timestamp") + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \