diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-12-31 16:50:58 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-12-31 16:50:58 +0000 |
| commit | 5b8a302787b27177ab5d74bd2882ef88dbaa1563 (patch) | |
| tree | 4f131ef8b27a2d2a29a870d7e85427744bd157f5 /Mk | |
| parent | 166f200fa2a8091796526ca5305caf9bd53ca76e (diff) | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/perl5.mk | 10 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index ff736c41768f..fb885b6521dc 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -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 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 07da7774b8e3..699dad3faf98 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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 deprecated, please use DEFAULT_VERSIONS+ 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 |