aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2018-06-02 08:11:44 +0000
committerRene Ladan <rene@FreeBSD.org>2018-06-02 08:11:44 +0000
commitaa3cf6e4dc1eb13e3c045dde78926950d545da67 (patch)
treeb8ee463835db3680922556e87add5ec4402d441a /Mk
parent6d96e19baf3ee9cadbd96d108136a6f4c824af1c (diff)
downloadports-aa3cf6e4dc1eb13e3c045dde78926950d545da67.tar.gz
ports-aa3cf6e4dc1eb13e3c045dde78926950d545da67.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/perl5.mk8
-rw-r--r--Mk/bsd.default-versions.mk2
2 files changed, 3 insertions, 7 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 4c088774c8f9..b4ba2d53bb0d 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -44,9 +44,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.22
-.include "${PORTSDIR}/lang/perl5.22/version.mk"
-. elif ${PERL5_DEFAULT} == 5.24
+. if ${PERL5_DEFAULT} == 5.24
.include "${PORTSDIR}/lang/perl5.24/version.mk"
. elif ${PERL5_DEFAULT} == 5.26
.include "${PORTSDIR}/lang/perl5.26/version.mk"
@@ -89,10 +87,8 @@ PERL_ARCH?= mach
PERL_PORT?= perl5.28
. elif ${PERL_LEVEL} >= 502600
PERL_PORT?= perl5.26
-. elif ${PERL_LEVEL} >= 502400
+. else # ${PERL_LEVEL} < 502600
PERL_PORT?= perl5.24
-. else # ${PERL_LEVEL} < 502400
-PERL_PORT?= perl5.22
. endif
SITE_PERL_REL?= lib/perl5/site_perl
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 2ba26f17bc6b..b07a02cee900 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -59,7 +59,7 @@ LINUX_DEFAULT?= c6
LUA_DEFAULT?= 5.2
# Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w
MYSQL_DEFAULT?= 5.6
-# Possible values: 5.22, 5.24, 5.26, 5.28, devel
+# Possible values: 5.24, 5.26, 5.28, devel
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
PERL5_DEFAULT?= 5.26