Date: Tue, 6 Apr 2021 15:50:19 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 38ae32933985 - main - Mk: remove support for Ruby 2.5 Message-ID: <202104061550.136FoJpP011873@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=38ae329339857c1c0dd2264bdab85b43b350c630 commit 38ae329339857c1c0dd2264bdab85b43b350c630 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2021-04-06 15:46:38 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-04-06 15:49:59 +0000 Mk: remove support for Ruby 2.5 --- Mk/bsd.default-versions.mk | 4 ++-- Mk/bsd.ruby.mk | 17 +++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index b983230922f4..1d0176f8a267 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -10,7 +10,7 @@ # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # -# DEFAULT_VERSIONS= perl5=5.20 ruby=2.0 +# DEFAULT_VERSIONS= perl5=5.20 ruby=2.7 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes @@ -106,7 +106,7 @@ PYTHON_DEFAULT?= 3.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.6, 3.7, 3.8, 3.9 PYTHON3_DEFAULT?= 3.7 -# Possible values: 2.5, 2.6, 2.7, 3.0 +# Possible values: 2.6, 2.7, 3.0 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 ce1e7a4f5a38..9ae1706102c0 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -11,7 +11,7 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org # [variables that a user may define] # # RUBY_VER - (See below) -# RUBY_DEFAULT_VER - Set to (e.g.) "2.5" if you want to refer to "ruby25" +# RUBY_DEFAULT_VER - Set to (e.g.) "2.7" if you want to refer to "ruby27" # just as "ruby". # RUBY_ARCH - (See below) # @@ -140,16 +140,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${RUBY_VER} == 2.5 -# -# Ruby 2.5 -# -RUBY_VERSION= 2.5.9 -RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 -RUBY25= "" # PLIST_SUB helpers - -. elif ${RUBY_VER} == 2.6 +. if ${RUBY_VER} == 2.6 # # Ruby 2.6 # @@ -182,7 +173,7 @@ RUBY30= "" # PLIST_SUB helpers # # Other versions # -IGNORE= Only ruby 2.5, 2.6, 2.7 and 3.0 are supported +IGNORE= Only ruby 2.6, 2.7 and 3.0 are supported _INVALID_RUBY_VER= 1 . endif .endif # defined(RUBY_VER) @@ -199,7 +190,6 @@ RUBY_DISTVERSION= ${RUBY_VERSION} .if !defined(_INVALID_RUBY_VER) -RUBY25?= "@comment " RUBY26?= "@comment " RUBY27?= "@comment " RUBY30?= "@comment " @@ -312,7 +302,6 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY_SUFFIX="${RUBY_SUFFIX}" \ RUBY_NAME="${RUBY_NAME}" \ RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \ - RUBY25=${RUBY25} \ RUBY26=${RUBY26} \ RUBY27=${RUBY27} \ RUBY30=${RUBY30}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104061550.136FoJpP011873>