git: e9a5dbb3d4e2 - main - lang/ruby30: Update to 3.0.1
Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sun Apr 25 20:53:44 UTC 2021
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e9a5dbb3d4e2d45e5bc40c288ce9d2869c68aebd
commit e9a5dbb3d4e2d45e5bc40c288ce9d2869c68aebd
Author: Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-04-25 20:53:29 +0000
Commit: Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-04-25 20:53:29 +0000
lang/ruby30: Update to 3.0.1
Changes: https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/
https://www.ruby-lang.org/en/news/2021/04/05/ruby-3-0-1-released/
PR: 251741
Reported by: Yasuhiro Kimura <yasu at utahime.org>
---
Mk/bsd.ruby.mk | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index f2b90ab0c85e..c72a168bb39a 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -162,8 +162,8 @@ RUBY27= "" # PLIST_SUB helpers
#
# Ruby 3.0
#
-RUBY_DISTVERSION= 3.0.0-preview1
-RUBY_PORTREVISION= 2
+RUBY_VERSION= 3.0.1
+RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
RUBY30= "" # PLIST_SUB helpers
@@ -178,16 +178,6 @@ _INVALID_RUBY_VER= 1
. endif
.endif # defined(RUBY_VER)
-.if defined(RUBY_DISTVERSION)
-.if !defined(RUBY_VERSION)
-RUBY_VERSION= ${RUBY_DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
-.else
-DEV_ERROR+= "Defining both RUBY_VERSION and RUBY_DISTVERSION is wrong, only set one"
-.endif
-.else
-RUBY_DISTVERSION= ${RUBY_VERSION}
-.endif
-
.if !defined(_INVALID_RUBY_VER)
RUBY26?= "@comment "
@@ -202,7 +192,7 @@ BROKEN= ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}}
.endif
.endif
-RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
+RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \
--with-rubylibprefix="${PREFIX}/lib/ruby" \
@@ -227,7 +217,7 @@ RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//}
RUBY_PORTVERSION?= ${RUBY_VERSION}
MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER}
-RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION}
+RUBY_DISTNAME?= ruby-${RUBY_VERSION}
RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME}
More information about the dev-commits-ports-all
mailing list