From nobody Mon Apr 21 02:40:54 2025 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 4ZgqP235Yrz5slHp; Mon, 21 Apr 2025 02:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgqP223fgz3gNr; Mon, 21 Apr 2025 02:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745203254; 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=pHfwRzcKivQI8WSOmnDvrvtOi7m9Z+UvwlEgsLNC+b8=; b=wSMEzBn8Wq/UJwm5neCymg6qXyZ5a8AaayAuhtYIYuN+0+DefTWUmHzRm2sRlXJIFybVTj 3KUlOq0Ea+mC9+YMlSB2s7tNJurv+7PG1pf7R3FKtoP8pO465aMLAVtJ9fmJyXDy6J/AoP Yw2oUmzsOenSi8gYESyN20fViBnk842Dix8C+LD6dqlAvU0usgNLrwU1mPowNmdpz7QQ3K LdQ8I8cYMhuTwPKCubSr1VQcTkR6xZeRr5Au6ID1V05gUaQcDn4z7xNncWujNJshw9bZE1 Ff380KhLxHTzlStnJI+wHN91gSvOz7ACFI5Lif+qiDxpBCnVI0KJam0Jg2lmmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745203254; a=rsa-sha256; cv=none; b=kyJdLMzTJSlce7TwFroZAequ0cZRHfRYXYodRFq9DIlXxUN52OI456KzDG/uK+fyAP/7O5 I252M8eTEysuSzuR9s1FlpbAhNpxI1PdWoL6CScmhkuMMJnfUcrwM9cPSAHijKBo3NszOD +GxtlZkZex8x4iZD5q+QSBovskmlS0grjSZrWka3BYDCtMaxdG9CgPCsqZljmveBgDel+b m3WuQdTc7UpkIJhKt8NGw6zyE9T0fHs5EmEgOe/sLxJ/p3LmH9SJdHk4WVEaax8Azb0YCs fVc+yh3vDhgqLmnJYJRv455y9lmfGdKUuIiBoUI3OsyUooHUXYoh0+vjbwg3QA== 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=1745203254; 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=pHfwRzcKivQI8WSOmnDvrvtOi7m9Z+UvwlEgsLNC+b8=; b=nuLBYZYEkbE0K6j67lvrCJlgIhcp/WYHT4ufZh8TRBV9gnmBKudTwmOEQA3uN1dOtnRIlV pBaUdoI3bqOlmpoXkj6Xt6b1b+v+tDhd54/FECo8b17YiYITttRfFmSocJIIz+079MEtkk UoydYY2Z26avA4DEGwYeWNmfWht2pmbHp/kOAff5le4GJg2JxHtAEJvIvMqq5hzIQ46Ajy wbfQfawRfy8v01Lv9vo+yV7EEaPlSYut+fpDc0wlOXyNhs1480v+60Sg/QJORaW0/jPjqj xkuJPnp4qu2DtavRGCRDRG9BUmlbbeMsSfG8q9THRcsL83rwsUrW/3LLSfnTuw== 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 4ZgqP21TTWzWbM; Mon, 21 Apr 2025 02:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53L2eswt038479; Mon, 21 Apr 2025 02:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L2esSk038476; Mon, 21 Apr 2025 02:40:54 GMT (envelope-from git) Date: Mon, 21 Apr 2025 02:40:54 GMT Message-Id: <202504210240.53L2esSk038476@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: a80d345d4781 - main - lang/ruby34: Import improvements from lang/ruby33/Makefile 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: a80d345d47819226b847c28d5e5645ec70e8d777 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a80d345d47819226b847c28d5e5645ec70e8d777 commit a80d345d47819226b847c28d5e5645ec70e8d777 Author: Yasuhiro Kimura AuthorDate: 2025-04-20 23:49:51 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-04-21 02:38:54 +0000 lang/ruby34: Import improvements from lang/ruby33/Makefile On March 2024 I started work to add ruby 3.4 to ports tree based on lang/ruby33 at that time, and finally it was added as commit 438427bea8dd. After that, however, I noticed there are some improvements in lang/ruby33/Makefile. So import them. --- lang/ruby34/Makefile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lang/ruby34/Makefile b/lang/ruby34/Makefile index 9bbb90b62548..ab114f67d9fc 100644 --- a/lang/ruby34/Makefile +++ b/lang/ruby34/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= libffi>=0:devel/libffi USES= autoreconf cpe localbase ruby:none ssl tar:xz CPE_VENDOR= ruby-lang -CPE_VERSION= ${RUBY_RELVERSION} -CPE_UPDATE= p${RUBY_PATCHLEVEL} +CPE_UPDATE= p0 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -32,7 +31,7 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --enable-install-static-library \ --enable-pthread \ --enable-shared \ - --with-ruby-version="${RUBY_VER}" \ + --with-ruby-version=minor \ --with-sitedir="${PREFIX}/lib/ruby/site_ruby" \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= @@ -40,13 +39,15 @@ CONFIGURE_ENV= debugflags= # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem --exclude \ - ${DISTNAME}/ext/win32* --exclude \ - ${DISTNAME}/lib/bundler* --exclude ${DISTNAME}/lib/irb* \ - --exclude ${DISTNAME}/man/erb.1 --exclude \ - ${DISTNAME}/man/irb.1 --exclude ${DISTNAME}/man/ri.1 \ - --exclude ${DISTNAME}/sample/win32ole --no-same-owner \ - --no-same-permissions +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ + --exclude ${DISTNAME}/ext/win32* \ + --exclude ${DISTNAME}/lib/bundler* \ + --exclude ${DISTNAME}/lib/irb* \ + --exclude ${DISTNAME}/man/erb.1 \ + --exclude ${DISTNAME}/man/irb.1 \ + --exclude ${DISTNAME}/man/ri.1 \ + --exclude ${DISTNAME}/sample/win32ole \ + --no-same-owner --no-same-permissions WRKSRC= ${RUBY_WRKSRC} @@ -92,8 +93,7 @@ _SUF2= ,${PORTEPOCH} # keep in sync with all platforms where libunwind is available .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == \ - i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == \ - powerpc64le + i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .endif @@ -115,9 +115,10 @@ INSTALLED_MANUALS= ruby EXTDOCS= ripper/README stringio/README.md # Macros to change variables in rbconfig.rb +# NOTE: The last argument RB_SET_CONF_VAR is a dummy argument. See bug 222872. RB_SET_CONF_VAR= ${SH} -c \ '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \ - -- + RB_SET_CONF_VAR post-extract-DOCS-on: ${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog @@ -153,13 +154,13 @@ pre-install-RDOC-on: post-install: .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} # -# Link just installed "ruby" to "ruby31", etc. +# Link just installed "ruby" to "ruby34", etc. # . for FILE in ${INSTALLED_SCRIPTS} ${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE} . endfor # -# Link "ruby.1.gz" to "ruby31.1.gz", etc. +# Link "ruby.1.gz" to "ruby34.1.gz", etc. # . for FILE in ${INSTALLED_MANUALS} ${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/${FILE}.1.gz