From nobody Fri Dec 30 09:18:50 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 4Nk07H3hmPz2khVk; Fri, 30 Dec 2022 09:18: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 4Nk07H0t0sz4c93; Fri, 30 Dec 2022 09:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391931; 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=B1X4CM26+6n8mfGmrQX4WbleFNSgYhpUaTNpeCaKzAQ=; b=fVvirVxHQlIRe6SAkxYklZ+qGLeAUkicW5RALNFuw8VB+V9p+5+0Liv8/5hgWU6o0SBllC EhToJCYiz853FAMDDzEv6hl0Vs1MqmpIT0jDA0e6ismEcyYJ4ZEUY6mQeam0/H1x/qR9Ou NIJHWhMb5qGMUrNaM0HtX0BIgakRHZ+4NX2O7YreCHx/vX7zXTDud80ziYaduwysCKOh8O KYrlegXxOZhE3kDHVpJXShVMSlNyE9DZLTaZW0/dlcoi+FlovJaQF6c0MnvfGQRRL2zhmT L5eDUcXpRvLajTtWn1rv6z9B8T6BvO4t2ClPZo0WKON5+z50ZoTV0EqAsXt/rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391931; 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=B1X4CM26+6n8mfGmrQX4WbleFNSgYhpUaTNpeCaKzAQ=; b=sK+LoCdQQ5mFMi9/6R4cAMmRxgK48b2nvcLdOtgsJjgMjrKOKA8zOatJubmN8sOJegsDyS +PWuk3n5X3BJqdAG/VYCTisA0pGMo0AhDncn4EPS9vWGd48l6mNDut5gETfQWDn50NKlKL Xx2oLLqGU/49UCGnOdKLY13/2AB/639r1ZgHKh3mGKuRyfDEMEw/LXhVYCr06IO5+Ou+ru 0lMmpku3D04JMjiSmkVET2z2+C+4hx+HkUuSpSaOntCNQHpBqjeDy/5Ok18FTb9wKhfUqv G5HonRy6LP6W6wEYlJ8VvrMoAQNUE1aONKTR0cGuqqddGuLTBh5Jz1JB17MvHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391931; a=rsa-sha256; cv=none; b=DUHnu/cfKKXtJP26WqqGlZ6BTzzKB7bykNzmJUi1s1n76tkr3RWRzJXvm38uV0qfquMSiL 72BLC1h3jta80taiLt77kriThKtGKXfLHlkdrBs0SwdB3RCCAHLvecR1gxrwLuM3vs8dsZ 3ltYgn2qFXfEydz2eaZ7o90jbHbkRQWGFFZm1HlROvwXdLYdSyj9dOM04luGSHKVC6YC1/ 33goX60P5foJlOyLQlpECJmxqonAjnJh03RfK3BdT/cRaqVhX55Ffg929sumQFyNiKBEny h/+0NHavkjtjZ305ykDv3UVvC2LUKE70zK76PLOJ82I2GCc+zuT0VlpvlLQn1Q== 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 4Nk07G72xwz13dF; Fri, 30 Dec 2022 09:18: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 2BU9IogS027636; Fri, 30 Dec 2022 09:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9IoGl027635; Fri, 30 Dec 2022 09:18:50 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:18:50 GMT Message-Id: <202212300918.2BU9IoGl027635@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: 1626e9a9a59c - main - lang/ruby32: Fix orphaned .timestamp in b49bdb1fe4680488411546540e6f737770a6003b 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: 1626e9a9a59cf12d9757f49f9991e6bd531c768e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1626e9a9a59cf12d9757f49f9991e6bd531c768e commit 1626e9a9a59cf12d9757f49f9991e6bd531c768e Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:55:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:06:33 +0000 lang/ruby32: Fix orphaned .timestamp in b49bdb1fe4680488411546540e6f737770a6003b 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/ruby32/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index 3f35054828df..7ac4d13817e0 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -183,7 +183,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: @@ -204,7 +204,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 \