From nobody Fri Dec 30 09:18:47 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 4Nk07C6b77z2khT6; Fri, 30 Dec 2022 09:18:47 +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 4Nk07C4wtmz4c1S; Fri, 30 Dec 2022 09:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391927; 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=I2hN+cJAf45nGaDB93I3qvZMYE4Vg/qUGCasSxymm2Q=; b=g+jayWF3yKBWo2PAUYWRwUaXG1n5D4qC5NRVvI682cKGuSldOvjYxZ3XDJBOq8Gnej39vj tgAIj1F2GBIC51HxEIkySaSxJnzEOvb8DnSByPTOYsrLg7A4aREl8xZ53h/HYZ1E2dzdNc LkAJ0zAjHNh29Ph2DQU8jBzPfCVblBxp+HF3jkLThqDkDpLB+3KgFN65i/4oqiNHPdxSPP S+lNfIxWsC46/7atEjL298A6iLqrbGKllvpy5bSLDVTuLwEjMZV6UEi/jDKQ5KoUbwLbPS 4utZG2Z4KqN91gLuU2wiXiBppCoWJPoKRHW4So+QxWhCM7dI8+XJG8rgqQR4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391927; 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=I2hN+cJAf45nGaDB93I3qvZMYE4Vg/qUGCasSxymm2Q=; b=oQpz+Gb4EiJhXVeZ2O9ziM9cmIvxnu4qvzkDArg2L84kql0FMeqQ+8Z21e0EgjkNJBCSjl ULi2pK566YUvy/khw8tu0riHI1dukUL/DaSzgS9D/aAEJtX/054VEmdHkXktfOCVqZP9/I tc3iXBHZ9Hk5z6lMfmNqML2E7ERuHm5dnYKKEPfcn6plXKQl3DlSm7LmOBSQiQl9geJT3j 82t7kNQJXYvlsZk8al8lpoMvlpSLqI3V8YR2DTs/jfRlR/Sk22UuPdduKDvpuv/bYhJlfk K8kcEh/2eKqgoYKtsN5U+xS1ur6ne7UV1Us4owklWCya6Pw0G3U3OqaebW4nrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391927; a=rsa-sha256; cv=none; b=jWOv/j12Eksfo0uxoEDhaX9JXg7EWVq2Kj9ns3lcNj2g56qCOhxp/kOuNADBeazstBKmg7 tApss4UxCOOPO54BAYGf/FpnU9y0s0kPg1IFgue9Qc72Gwr5BXpy60mLRNkv0+6F9ZVDBx ailcsdrUS3rHBYwVRPUORM2ggW6DUjsa1hDU8p2Zk+8C2/aY0kZweDIg1hnXuLAQWsM7Y9 kR8GqfHJm6u0Iyux4IZUlMqGBODbaWmbscVLoTaRReo4qJ0S30q1rjMBYplsy9axZL8ws2 gEeVaivsC6I1GraTjI4yc39rxXtlgi1L8HzHnwEJNZ2K0vrFtz5jXLNjjYLd4A== 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 4Nk07C412Dz13Vh; Fri, 30 Dec 2022 09:18:47 +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 2BU9IltM027558; Fri, 30 Dec 2022 09:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9IlfO027557; Fri, 30 Dec 2022 09:18:47 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:18:47 GMT Message-Id: <202212300918.2BU9IlfO027557@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: e1a7c49e51c3 - main - lang/ruby27: Fix orphaned .timestamp in bdbe2a2f4098f4d21495f314cf4d571efdb4f08f 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: e1a7c49e51c3c0658dc044047d108e28acc8d27f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1a7c49e51c3c0658dc044047d108e28acc8d27f commit e1a7c49e51c3c0658dc044047d108e28acc8d27f Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:55:15 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:06:32 +0000 lang/ruby27: Fix orphaned .timestamp in bdbe2a2f4098f4d21495f314cf4d571efdb4f08f 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/ruby27/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile index cb6e5734c7a6..1326301338a5 100644 --- a/lang/ruby27/Makefile +++ b/lang/ruby27/Makefile @@ -186,7 +186,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: @@ -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}/ "! -name .timestamp") + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \