Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Mar 2020 11:13:55 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529959 - head/Mk
Message-ID:  <202003311113.02VBDtMh023260@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Tue Mar 31 11:13:55 2020
New Revision: 529959
URL: https://svnweb.freebsd.org/changeset/ports/529959

Log:
  Unregister expired Ruby 2.4

Modified:
  head/Mk/bsd.default-versions.mk
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Tue Mar 31 09:32:17 2020	(r529958)
+++ head/Mk/bsd.default-versions.mk	Tue Mar 31 11:13:55 2020	(r529959)
@@ -90,7 +90,7 @@ PYTHON_DEFAULT?=	3.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.5, 3.6, 3.7, 3.8
 PYTHON3_DEFAULT?=	3.7
-# Possible values: 2.4, 2.5, 2.6, 2.7
+# Possible values: 2.5, 2.6, 2.7
 RUBY_DEFAULT?=		2.6
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Tue Mar 31 09:32:17 2020	(r529958)
+++ head/Mk/bsd.ruby.mk	Tue Mar 31 11:13:55 2020	(r529959)
@@ -15,7 +15,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.4" if you want to refer to "ruby24"
+# RUBY_DEFAULT_VER	- Set to (e.g.) "2.5" if you want to refer to "ruby25"
 #			  just as "ruby".
 # RUBY_ARCH		- (See below)
 #
@@ -144,17 +144,8 @@ 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.4
+. if ${RUBY_VER} == 2.5
 #
-# Ruby 2.4
-#
-RUBY_VERSION=		2.4.9
-RUBY_PORTREVISION=	0
-RUBY_PORTEPOCH=		1
-RUBY24=			""	# PLIST_SUB helpers
-
-. elif ${RUBY_VER} == 2.5
-#
 # Ruby 2.5
 #
 RUBY_VERSION=		2.5.7
@@ -186,7 +177,7 @@ RUBY27=			""	# PLIST_SUB helpers
 #
 # Other versions
 #
-IGNORE=	Only ruby 2.4, 2.5, 2.6 and 2.7 are supported
+IGNORE=	Only ruby 2.5, 2.6 and 2.7 are supported
 _INVALID_RUBY_VER=	1
 . endif
 .endif # defined(RUBY_VER)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003311113.02VBDtMh023260>