git: b3fb5d8b3c86 - main - Mk: unregister expired lang/perl5.30
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 May 2022 16:12:57 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b3fb5d8b3c860bd3c3ebcffafe621aea61379539
commit b3fb5d8b3c860bd3c3ebcffafe621aea61379539
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-05-23 16:11:39 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-05-23 16:12:31 +0000
Mk: unregister expired lang/perl5.30
---
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 d885e1d37654..85511e16f53d 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.30
-.include "${PORTSDIR}/lang/perl5.30/version.mk"
-. elif ${PERL5_DEFAULT} == 5.32
+. if ${PERL5_DEFAULT} == 5.32
.include "${PORTSDIR}/lang/perl5.32/version.mk"
. elif ${PERL5_DEFAULT} == 5.34
.include "${PORTSDIR}/lang/perl5.34/version.mk"
@@ -83,10 +81,8 @@ PERL_ARCH?= mach
# Mk/bsd.default-versions.mk in sync.
. if ${PERL_LEVEL} >= 503400
PERL_PORT?= perl5.34
-. elif ${PERL_LEVEL} >= 503200
+. else # ${PERL_LEVEL} < 503400
PERL_PORT?= perl5.32
-. else # ${PERL_LEVEL} < 503200
-PERL_PORT?= perl5.30
. endif
SITE_PERL_REL?= lib/perl5/site_perl
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index b43fef1da9c9..b046d2dd9bba 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -90,7 +90,7 @@ MONO_DEFAULT= 5.10
MYSQL_DEFAULT?= 5.7
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
-# Possible values: 5.30, 5.32, 5.34, devel
+# Possible values: 5.32, 5.34, devel
. if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
PERL5_DEFAULT?= 5.32