Date: Fri, 30 Dec 2022 09:18:46 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0e6cbfa14a8e - main - Mk/bsd.ruby.mk: Consolidate RUBY_PORTEPOCH Message-ID: <202212300918.2BU9IkSm027533@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e6cbfa14a8e8d9a2052f28dd6f7cf272cf7cc94 commit 0e6cbfa14a8e8d9a2052f28dd6f7cf272cf7cc94 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-12-30 08:55:14 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-12-30 09:06:32 +0000 Mk/bsd.ruby.mk: Consolidate RUBY_PORTEPOCH RUBY_PORTEPOCH is identical for all ruby ports (lang/rubyXX). --- Mk/bsd.ruby.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index dcb8b6e52b14..a9a6ce42574e 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -134,7 +134,6 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} # RUBY_DISTVERSION= 2.7.7 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.0 # @@ -142,14 +141,12 @@ RUBY_PORTEPOCH= 1 # RUBY_DISTVERSION= 3.0.5 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.1 # # Ruby 3.1 # RUBY_DISTVERSION= 3.1.3 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.2 # @@ -157,7 +154,6 @@ RUBY_PORTEPOCH= 1 # RUBY_DISTVERSION= 3.2.0 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. @@ -168,6 +164,7 @@ RUBY_PORTEPOCH= 1 IGNORE= Only ruby 2.7, 3.0, 3.1 and 3.2 are supported _INVALID_RUBY_VER= 1 . endif +RUBY_PORTEPOCH= 1 RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} . endif # defined(RUBY_VER)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212300918.2BU9IkSm027533>