diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2021-11-09 15:19:42 +0000 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2021-12-19 00:34:57 +0000 |
| commit | 633b51aa6f3efa1e4cc4ebcf07b95880cdd9a3fe (patch) | |
| tree | a9ce4cfb9e3457bbd7dff04188e6573138700edf /Mk | |
| parent | c420b2afd8c2f9f315ab26761330902668a1d0d2 (diff) | |
| download | ports-633b51aa6f3efa1e4cc4ebcf07b95880cdd9a3fe.tar.gz ports-633b51aa6f3efa1e4cc4ebcf07b95880cdd9a3fe.zip | |
lang/ruby31: Add new port
Add preview1 of Ruby 3.3 series.
To handle pre-release version, Mk/bsd.ruby.mk is changed as following.
* New variable RUBY_DISTVERSION is introduced. It keeps DISTVERSION of
each ruby port (lang/rubyXY).
* The value of RUBY_VERSION, RUBY_PORTVERSION, RUBY_WRKSRC and
RUBY_DISTNAME is set by using that of RUBY_DISTVERSION
ReleaseNotes: https://www.ruby-lang.org/en/news/2021/11/09/ruby-3-1-0-preview1-released/
PR: 259746
Approved by: maintainer timeout (> 1 month)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.ruby.mk | 29 |
2 files changed, 22 insertions, 9 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index ff5a45ed0b0f..53519b606af4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -115,7 +115,7 @@ PYTHON_DEFAULT?= 3.8 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.6, 3.7, 3.8, 3.9, 3.10 PYTHON3_DEFAULT?= 3.8 -# Possible values: 2.6, 2.7, 3.0 +# Possible values: 2.6, 2.7, 3.0, 3.1 RUBY_DEFAULT?= 2.7 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 3abf32058c94..30182178af26 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -47,6 +47,8 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org # the form of `x.y.z' (see below for current value). # RUBY_VERSION_CODE - Integer version of RUBY_VERSION in the form of # `xyz'. +# RUBY_DISTVERSION - DISTVERSION for the standard ruby ports (ruby, +# ruby-gdbm, etc.). # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). # RUBY_PORTREVISION - PORTREVISION for the standard ruby ports. @@ -133,7 +135,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} # # Ruby 2.6 # -RUBY_VERSION= 2.6.9 +RUBY_DISTVERSION= 2.6.9 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY26= "" # PLIST_SUB helpers @@ -142,7 +144,7 @@ RUBY26= "" # PLIST_SUB helpers # # Ruby 2.7 # -RUBY_VERSION= 2.7.5 +RUBY_DISTVERSION= 2.7.5 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY27= "" # PLIST_SUB helpers @@ -151,10 +153,18 @@ RUBY27= "" # PLIST_SUB helpers # # Ruby 3.0 # -RUBY_VERSION= 3.0.3 +RUBY_DISTVERSION= 3.0.3 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY30= "" # PLIST_SUB helpers +. elif ${RUBY_VER} == 3.1 +# +# Ruby 3.1 +# +RUBY_DISTVERSION= 3.1.0-preview1 +RUBY_PORTREVISION= 0 +RUBY_PORTEPOCH= 1 +RUBY31= "" # PLIST_SUB helpers # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. @@ -162,9 +172,10 @@ RUBY30= "" # PLIST_SUB helpers # # Other versions # -IGNORE= Only ruby 2.6, 2.7 and 3.0 are supported +IGNORE= Only ruby 2.6, 2.7, 3.0 and 3.1 are supported _INVALID_RUBY_VER= 1 . endif +RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} .endif # defined(RUBY_VER) .if !defined(_INVALID_RUBY_VER) @@ -172,6 +183,7 @@ _INVALID_RUBY_VER= 1 RUBY26?= "@comment " RUBY27?= "@comment " RUBY30?= "@comment " +RUBY31?= "@comment " .if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}) .if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes" @@ -181,7 +193,7 @@ BROKEN= ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} .endif .endif -RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION} +RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ --with-rubylibprefix="${PREFIX}/lib/ruby" \ @@ -203,9 +215,9 @@ _RUBY_VENDORDIR?= ${_RUBY_SYSLIBDIR}/ruby/vendor_ruby RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//} -RUBY_PORTVERSION?= ${RUBY_VERSION} +RUBY_PORTVERSION?= ${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} MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER} -RUBY_DISTNAME?= ruby-${RUBY_VERSION} +RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} @@ -281,7 +293,8 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \ RUBY26=${RUBY26} \ RUBY27=${RUBY27} \ - RUBY30=${RUBY30} + RUBY30=${RUBY30} \ + RUBY30=${RUBY31} .if ${PORT_OPTIONS:MDEBUG} RUBY_FLAGS+= -d |