diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2017-06-02 20:41:34 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2017-06-02 20:41:34 +0800 |
| commit | 8154fa0789dd6f82941966545e3903813a7f4b06 (patch) | |
| tree | 87e72c6b95cd79a248586a8e42873389c3659c17 /Mk | |
| parent | 29dc3def23b5395ca1ff32fa9c1cb5ee0f0ab9c1 (diff) | |
| parent | 281934daf27b06ec7e0de2e1bd3b728ce8a56ebc (diff) | |
| download | freebsd-ports-gnome-8154fa0789dd6f82941966545e3903813a7f4b06.tar.gz freebsd-ports-gnome-8154fa0789dd6f82941966545e3903813a7f4b06.tar.zst freebsd-ports-gnome-8154fa0789dd6f82941966545e3903813a7f4b06.zip | |
Merge branch 'master' into gstreamer
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/perl5.mk | 22 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 8 insertions, 16 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index d4e6de2b1311..1b22c9602a49 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -42,21 +42,14 @@ IGNORE= Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments USE_PERL5?= run build -# remove when 5.20 goes away. -.sinclude "${LOCALBASE}/etc/perl5_version" -. if defined(PERL_VERSION) -PERL5_DEPEND= ${PERL5} -THIS_IS_OLD_PERL= yes -. else -# end of remove # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${PERL5_DEFAULT} == 5.20 -.include "${PORTSDIR}/lang/perl5.20/version.mk" -. elif ${PERL5_DEFAULT} == 5.22 +. if ${PERL5_DEFAULT} == 5.22 .include "${PORTSDIR}/lang/perl5.22/version.mk" . elif ${PERL5_DEFAULT} == 5.24 .include "${PORTSDIR}/lang/perl5.24/version.mk" +. elif ${PERL5_DEFAULT} == 5.26 +.include "${PORTSDIR}/lang/perl5.26/version.mk" . elif ${PERL5_DEFAULT} == devel .include "${PORTSDIR}/lang/perl5-devel/version.mk" # Force PERL_PORT here in case two identical PERL_VERSION. @@ -64,7 +57,6 @@ PERL_PORT?= perl5-devel . else IGNORE= Invalid perl5 version ${PERL5_DEFAULT} . endif -. endif PERL_VER?= ${PERL_VERSION:C/\.[0-9]+$//} @@ -91,12 +83,12 @@ PERL_ARCH?= mach # perl5_default file, or up there in the default versions selection. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${PERL_LEVEL} >= 502400 +. if ${PERL_LEVEL} >= 502600 +PERL_PORT?= perl5.26 +. elif ${PERL_LEVEL} >= 502400 PERL_PORT?= perl5.24 -. elif ${PERL_LEVEL} >= 502200 +. else # ${PERL_LEVEL} < 502400 PERL_PORT?= perl5.22 -. else # ${PERL_LEVEL} < 502200 -PERL_PORT?= perl5.20 . endif SITE_PERL_REL?= lib/perl5/site_perl diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index a6e1564aba26..0a3acec0171e 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -56,7 +56,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, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.6 -# Possible values: 5.20, 5.22, 5.24, devel +# Possible values: 5.22, 5.24, 5.26, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.24 |