diff options
author | Koichiro Iwao <meta@FreeBSD.org> | 2019-05-09 01:28:38 +0000 |
---|---|---|
committer | Koichiro Iwao <meta@FreeBSD.org> | 2019-05-09 01:28:38 +0000 |
commit | 96e32bdc19a17660b7b35097d2bc115610d5b710 (patch) | |
tree | 853c67effaf30bc93d09a776106797147fbee812 /Mk | |
parent | lang/rust-nightly: update to 1.36.0.20190509 (diff) |
Add ruby26 2.6.3 (copied from ruby25)
PR: 234509 235826
Submitted by: pete@nomadlogic.org (initial revision)
Yasuhiro KIMURA <yasu@utahime.org> (initial revision)
meta (myself, minor modifications)
Relnotes:: https://www.ruby-lang.org/en/news/2018/12/25/ruby-2-6-0-released/
https://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/
https://www.ruby-lang.org/en/news/2019/03/13/ruby-2-6-2-released/
https://www.ruby-lang.org/en/news/2019/04/17/ruby-2-6-3-released/
Differential Revision: https://reviews.freebsd.org/D19961
Notes
Notes:
svn path=/head/; revision=501068
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
-rw-r--r-- | Mk/bsd.ruby.mk | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index b7853b513245..f1f2305db50f 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -87,7 +87,7 @@ PYTHON_DEFAULT?= 3.6 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.5, 3.6, 3.7 PYTHON3_DEFAULT?= 3.6 -# Possible values: 2.4, 2.5 +# Possible values: 2.4, 2.5, 2.6 RUBY_DEFAULT?= 2.5 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 0372c842558d..15bca4995b34 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -170,13 +170,23 @@ RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY25= "" # PLIST_SUB helpers +. elif ${RUBY_VER} == 2.6 +# +# Ruby 2.6 +# +RUBY_RELVERSION= 2.6.3 +RUBY_PORTREVISION= 0 +RUBY_PORTEPOCH= 1 +RUBY_PATCHLEVEL= 0 +RUBY26= "" # PLIST_SUB helpers + # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . else # # Other versions # -IGNORE= Only ruby 2.4 and 2.5 are supported +IGNORE= Only ruby 2.4, 2.5 and 2.6 are supported _INVALID_RUBY_VER= 1 . endif .endif # defined(RUBY_VER) @@ -185,6 +195,7 @@ _INVALID_RUBY_VER= 1 RUBY24?= "@comment " RUBY25?= "@comment " +RUBY26?= "@comment " .if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}) .if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes" @@ -300,7 +311,8 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY_NAME="${RUBY_NAME}" \ RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \ RUBY24=${RUBY24} \ - RUBY25=${RUBY25} + RUBY25=${RUBY25} \ + RUBY26=${RUBY26} .if defined(USE_RUBY_RDOC) MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC} |