svn commit: r430142 - in head/Mk: . Uses
Rene Ladan
rene at FreeBSD.org
Sat Dec 31 16:51:00 UTC 2016
Author: rene
Date: Sat Dec 31 16:50:58 2016
New Revision: 430142
URL: https://svnweb.freebsd.org/changeset/ports/430142
Log:
Drop support for Perl 5.18 (infrastructure part)
Modified:
head/Mk/Uses/perl5.mk
head/Mk/bsd.default-versions.mk
Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk Sat Dec 31 16:47:04 2016 (r430141)
+++ head/Mk/Uses/perl5.mk Sat Dec 31 16:50:58 2016 (r430142)
@@ -20,7 +20,7 @@
# PERL_ARCH - Directory name of architecture dependent libraries
# (value: mach).
# PERL_PORT - Name of the perl port that is installed
-# (for example: perl5.18)
+# (for example: perl5.24)
# SITE_PERL - Directory name where site specific perl packages go.
# This value is added to PLIST_SUB.
# SITE_ARCH - Directory name where arch site specific perl packages go.
@@ -51,9 +51,7 @@ THIS_IS_OLD_PERL= yes
# end of remove
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-.if ${PERL5_DEFAULT} == 5.18
-.include "${PORTSDIR}/lang/perl5.18/version.mk"
-.elif ${PERL5_DEFAULT} == 5.20
+.if ${PERL5_DEFAULT} == 5.20
.include "${PORTSDIR}/lang/perl5.20/version.mk"
.elif ${PERL5_DEFAULT} == 5.22
.include "${PORTSDIR}/lang/perl5.22/version.mk"
@@ -97,10 +95,8 @@ PERL_ARCH?= mach
PERL_PORT?= perl5.24
.elif ${PERL_LEVEL} >= 502200
PERL_PORT?= perl5.22
-.elif ${PERL_LEVEL} >= 502000
+.else # ${PERL_LEVEL} < 502200
PERL_PORT?= perl5.20
-.else # ${PERL_LEVEL} < 502000
-PERL_PORT?= perl5.18
.endif
SITE_PERL_REL?= lib/perl5/site_perl
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Sat Dec 31 16:47:04 2016 (r430141)
+++ head/Mk/bsd.default-versions.mk Sat Dec 31 16:50:58 2016 (r430142)
@@ -8,7 +8,7 @@
# Users who want to override these defaults can easily do so by defining
# DEFAULT_VERSIONS in their make.conf as follows:
#
-# DEFAULT_VERSIONS= perl5=5.18 ruby=2.0
+# DEFAULT_VERSIONS= perl5=5.20 ruby=2.0
.if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
_INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes
@@ -51,7 +51,7 @@ WARNING+= "OVERRIDE_LINUX_BASE_PORT is
LUA_DEFAULT?= 5.2
# Possible values: 5.1, 5.5, 5.6, 5.7, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p
MYSQL_DEFAULT?= 5.6
-# Possible values: 5.18, 5.20, 5.22, devel
+# Possible values: 5.20, 5.22, devel
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
PERL5_DEFAULT?= 5.24
More information about the svn-ports-head
mailing list