git: 4d57f82c17d8 - main - Mk: unregister expired Perl 5.28
Rene Ladan
rene at FreeBSD.org
Sat Jun 26 10:43:19 UTC 2021
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4d57f82c17d8d6f3083edc9b7eac30a095688107
commit 4d57f82c17d8d6f3083edc9b7eac30a095688107
Author: Rene Ladan <rene at FreeBSD.org>
AuthorDate: 2021-06-26 10:42:18 +0000
Commit: Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-06-26 10:43:09 +0000
Mk: unregister expired Perl 5.28
---
Mk/Uses/perl5.mk | 8 ++------
Mk/bsd.default-versions.mk | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index eb1b65eee554..fac14002a7ce 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -42,9 +42,7 @@ USE_PERL5?= run build
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-. if ${PERL5_DEFAULT} == 5.28
-.include "${PORTSDIR}/lang/perl5.28/version.mk"
-. elif ${PERL5_DEFAULT} == 5.30
+. if ${PERL5_DEFAULT} == 5.30
.include "${PORTSDIR}/lang/perl5.30/version.mk"
. elif ${PERL5_DEFAULT} == 5.32
.include "${PORTSDIR}/lang/perl5.32/version.mk"
@@ -87,10 +85,8 @@ PERL_ARCH?= mach
PERL_PORT?= perl5.34
. elif ${PERL_LEVEL} >= 503200
PERL_PORT?= perl5.32
-. elif ${PERL_LEVEL} >= 503000
+. else # ${PERL_LEVEL} < 503200
PERL_PORT?= perl5.30
-. else # ${PERL_LEVEL} < 503000
-PERL_PORT?= perl5.28
. endif
SITE_PERL_REL?= lib/perl5/site_perl
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 0b79b9d10688..f39294707edd 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -86,7 +86,7 @@ MONO_DEFAULT= 5.10
MYSQL_DEFAULT?= 5.7
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
-# Possible values: 5.28, 5.30, 5.32, 5.34, devel
+# Possible values: 5.30, 5.32, 5.34, devel
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
PERL5_DEFAULT?= 5.32
More information about the dev-commits-ports-all
mailing list