From nobody Wed Apr 24 18:13:26 2024 X-Original-To: dev-commits-ports-branches@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 4VPnD71Cjxz5J5K8; Wed, 24 Apr 2024 18:13:27 +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 4VPnD70jl7z41TZ; Wed, 24 Apr 2024 18:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713982407; 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=Oej1vsd7rs28aHy1qHwS5tis7AXlPMfoc31rK32nb4s=; b=gmi7pDHEnMAM1QcpJcIjv/Uc6gDDI0uD6HY6pZeYMhJUCAp6caDkDEzvKmGaY8W7lb9zwS TjwyRtaZzIHPIOop6VKI6pVp5qKdm2aNWSDRNVYuZOMFJFkKJC5YtsBeYGO5h7Xdv3dV3I 0HIGbu3GN5HQfhr3D0MrUR7TcFHaeF6UtJYMIDS5HwjFSuT77PRLp0UzjGIpUwD3dtPmaL JrWUx5imHHwt1ZUXpQbONmwfF13gTuRfcwfUcdMFZgpabLSHJFMw2YS6rVG1XTuxnxKKIh H64Vm06hs8E8y3DKJGJYjod3ljlCN1NWn2dMiqw4IEQf6UiqZVD/3yccrAcRxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713982407; a=rsa-sha256; cv=none; b=cMrJABrcWCUXkvTwGJ9MhVi5iusGV+HfB6xLgzFf/HiHovtLuxt6H5aJpQyB/Q3FY1HuCW jHGNL89eN6ZCjCuExgiTCxm9+difpds8f3VBwH5ME1WUEzF3HRdasVRoE5KOQCmrmbJhJd 7ysmc2ti0KbEBoRZGUeJfzYs7mCbmM7bvBqdQCMyJjS1ohmXEt69Aw62EX9uw8UjthS1KH ayjsGoKkVRUDpuLQYINrNod1obIs5j/J0VycSIMtl9eb+M4ZkXWQOOCbzsMqs2wxnx8Gpw L+EjL1KrrM3l07jKZZp03CmUNe7mhSY3OBS9tyvsVHlu9OIBLfgTz2iijIE/cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713982407; 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=Oej1vsd7rs28aHy1qHwS5tis7AXlPMfoc31rK32nb4s=; b=ePopvCz/4zPLtGr/FjLvYuHja24WljbmZsUmk1dREHalCrGho2MWlr4ZFk8jnXxrqWD6VS TfH1ujNVTv2Mv4njYbtjqC9yis2WsqIqrj7EhnDvkb46puAVVtntdIQyNyEL/a2EUkc4dn RIbbNcW8ZjZmk1Jq3r9bq0I4aoVPhBTMAxQF4kej53RSCcjHo8VUiz8xB5cyxMcH874rwD OXrqf4WyjBdJ+lm2CuATGnorXVshMZmUXL/f27SmUoB464gFdpupv5spsuHnC3V2lzuASd qbbtxe907VNarF5kDoMjiVgrrKFeYXrPqaZIYud3WAMHbzyTdOLUw/6NLavpFQ== 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 4VPnD70KjrzQfk; Wed, 24 Apr 2024 18:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OIDQk2061307; Wed, 24 Apr 2024 18:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIDQ13061304; Wed, 24 Apr 2024 18:13:26 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:13:26 GMT Message-Id: <202404241813.43OIDQ13061304@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: d4e0df85317b - 2024Q2 - lang/ruby33: Fix build with latest -CURRENT List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: d4e0df85317bd23b887c4c61817bd4b1ffebb274 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4e0df85317bd23b887c4c61817bd4b1ffebb274 commit d4e0df85317bd23b887c4c61817bd4b1ffebb274 Author: Yasuhiro Kimura AuthorDate: 2024-04-24 18:07:09 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-04-24 18:13:07 +0000 lang/ruby33: Fix build with latest -CURRENT post-install-DOCS-on copies all files/directories under ${WRKSRC}/doc/ into ${STAGEDIR}${RUBY_DOCDIR}/, then installs ${WRKSRC}/ChangeLog to same directory. But there is ChangeLog directory under ${WRKSRC}/doc/. As a result there is already ${STAGEDIR}${RUBY_DOCDIR}/ChangeLog directory when ${WRKSRC}/ChangeLog is tried to be installed as ${WRKSRC}/doc/ChangeLog. Previously install(1) regards it as non-fatal and build continues. But on latest -CURRENT the command regards it as fatal and results in build error. So fix it by moving ${WRKSRC}/ChangeLog to ${WRKSRC}/doc/ChangeLog/ChangeLog at extract phase. Bump PORTREVISION as plist is changed. PR: 278554 Reported by: Siva Mahadevan MFH: 2024Q2 (cherry picked from commit 8f7dac72c518bd1de867e78af351a4a7cf02d799) --- Mk/Uses/ruby.mk | 2 +- lang/ruby33/Makefile | 4 +++- lang/ruby33/pkg-plist | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index cad327f2bd46..e1650bfe791a 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -163,7 +163,7 @@ RUBY_PORTREVISION= 0 # Ruby 3.3 # RUBY_DISTVERSION= 3.3.1 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile index 21949fe60944..89cb21edfbb6 100644 --- a/lang/ruby33/Makefile +++ b/lang/ruby33/Makefile @@ -113,6 +113,9 @@ RB_SET_CONF_VAR= ${SH} -c \ '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \ -- +post-extract-DOCS-on: + ${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog + post-patch: # We get these from other ports .for d in bin/* ext/dbm ext/gdbm ext/win32* lib/bundler* libexec/bundler* \ @@ -188,7 +191,6 @@ post-install-DOCS-on: .endfor @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) ${INSTALL_DATA} ${WRKSRC}/COPYING* \ - ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \ ${WRKSRC}/README* \ ${STAGEDIR}${RUBY_DOCDIR}/ diff --git a/lang/ruby33/pkg-plist b/lang/ruby33/pkg-plist index f18a365ed509..b4cc54ee25c9 100644 --- a/lang/ruby33/pkg-plist +++ b/lang/ruby33/pkg-plist @@ -1113,6 +1113,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%NO_CAPIDOCS%%%%NO_DOCS%%%%RDOC%%@dir %%RUBY_DOCDIR%% %%DOCS%%%%RUBY_DOCDIR%%/COPYING %%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja +%%DOCS%%%%RUBY_DOCDIR%%/ChangeLog/ChangeLog %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog/ChangeLog-0.06_to_0.52 %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog/ChangeLog-0.50_to_0.60 %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog/ChangeLog-0.60_to_1.1