From nobody Fri Dec 09 04:37:54 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 4NSytp48sxz4jQrH; Fri, 9 Dec 2022 04:37:54 +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 4NSytp3jY9z4KVY; Fri, 9 Dec 2022 04:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560674; 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=PDkevUHiXzH5v2ZKhEk0fGmwqJjvBIUpHkHN3nBzKf0=; b=GhuHlnVoyHJkVOG8cjqZF1hNVTK3UfNxcSisIVLHzOCD/d3DaD1CmAG4M3Rm5c8eyO/LJY vvewrN6eMvSOuNGJoJECc7Z/549czruX51DNxSMMR+g6daiRVbCXGtEPqG7xbahWC1Ckq0 m0UuQ9UN5jntnHB/MzIJR1nq96+86N9bA9rWLVqMbOq9bzstmoymldiq9t+9JOQyRn5xJX EPRvWaXQsb9xq5e8H1UbrcBKIKKY8PIPujcbeTFYNzK5O+PgME1xYwm3e5Gd+Oc9R1UJvo 6Dikf2HGdS+2iE30M/XOhC3ao2n/bT6ojdEr4+GTjIvH457teAE1iWhKyOZWSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670560674; 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=PDkevUHiXzH5v2ZKhEk0fGmwqJjvBIUpHkHN3nBzKf0=; b=mvVczu9BRLEN31NoAFmssBNtRfWnNaxPwYucJKlk8Im2ezi5iKOoEjpZyUKpj/JtZfbveO 6StvfgihSpkYQeD+xLo9sAGh+GLWQYq058l4f8jpeaQf7tSFLYRsSsqqc6JHXkGhPgICyN eQuFKq4fxg1tC5QpfbUpJC5r6PLYaEocyh436EmsuH2UwaYBhBOB+e2fasljZzNzMmXLAk I8s6+ZhU5mohZ6BvE1RLK/jWPFtaUhn656EubnxooWPMhJm1ae9lcDl2OTVjDd7tbwWN3S 2RW9aP5ugMSfdyUFZCnady2gkYhW3+1KQcHjCzs0egknH8dd9Ogso+0jh1xsSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670560674; a=rsa-sha256; cv=none; b=ks8oNaFBu0k89iDppcPyuvGuqWIQv2wdR8tFFERL1+MLlhK4g7hc3p4P6ewDffYOv4CWAb /n92WAe9u89gMD/M4RKVMqrdzDlzmtdBokb/2Z4AzxiccaP7tX4pTXMTn/wXGEcWGob3ma 813kqKCfpklTgfNBsMOgMmNoLIdbpHb9iblkKd1MExfXoe+UJvfGSVExi75/6pj1zDpKpT ai5PT+gNC8f2S+CcvyAUJ3AlxNNdblHFoRW2hUhVbfxE3FDbnoWTqqha+F/XcXGsBU7o7n Ex3QRZgmaoLSS9T5g9PQuYUZz4mjHY+xejqeCUgWm3mYzGhMoYg7o7Bc/D/cQA== 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 4NSytp2qdwzNGN; Fri, 9 Dec 2022 04:37:54 +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 2B94bspU029928; Fri, 9 Dec 2022 04:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B94bsLL029927; Fri, 9 Dec 2022 04:37:54 GMT (envelope-from git) Date: Fri, 9 Dec 2022 04:37:54 GMT Message-Id: <202212090437.2B94bsLL029927@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: e8d4ab71ea07 - main - lang/ruby32: 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: e8d4ab71ea07e6d3c3a5bcf7a3003bd9a9ce6c23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8d4ab71ea07e6d3c3a5bcf7a3003bd9a9ce6c23 commit e8d4ab71ea07e6d3c3a5bcf7a3003bd9a9ce6c23 Author: Yasuhiro Kimura AuthorDate: 2022-11-25 01:49:35 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-12-09 04:35:01 +0000 lang/ruby32: 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: b49bdb1fe468 lang/ruby32: Simplify CAPIDOCS handling --- lang/ruby32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index 83e67d185456..0ac382a86ee1 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -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}/) + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/ "! -name .timestamp") ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \