Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 May 2020 10:20:22 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537146 - in head/Mk: . Uses
Message-ID:  <202005311020.04VAKMCN050075@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sun May 31 10:20:21 2020
New Revision: 537146
URL: https://svnweb.freebsd.org/changeset/ports/537146

Log:
  Unregister expired Perl 5.26

Modified:
  head/Mk/Uses/perl5.mk
  head/Mk/bsd.default-versions.mk

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Sun May 31 10:14:50 2020	(r537145)
+++ head/Mk/Uses/perl5.mk	Sun May 31 10:20:21 2020	(r537146)
@@ -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.26
-.include "${PORTSDIR}/lang/perl5.26/version.mk"
-.    elif ${PERL5_DEFAULT} == 5.28
+.    if ${PERL5_DEFAULT} == 5.28
 .include "${PORTSDIR}/lang/perl5.28/version.mk"
 .    elif ${PERL5_DEFAULT} == 5.30
 .include "${PORTSDIR}/lang/perl5.30/version.mk"
@@ -85,10 +83,8 @@ PERL_ARCH?=	mach
 # Mk/bsd.default-versions.mk in sync.
 .  if   ${PERL_LEVEL} >= 503000
 PERL_PORT?=	perl5.30
-.  elif   ${PERL_LEVEL} >= 502800
+.  else # ${PERL_LEVEL} < 503000
 PERL_PORT?=	perl5.28
-.  else # ${PERL_LEVEL} < 502800
-PERL_PORT?=	perl5.26
 .  endif
 
 SITE_PERL_REL?=	lib/perl5/site_perl

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Sun May 31 10:14:50 2020	(r537145)
+++ head/Mk/bsd.default-versions.mk	Sun May 31 10:20:21 2020	(r537146)
@@ -67,7 +67,7 @@ LLVM_DEFAULT?=		90
 LUA_DEFAULT?=		5.2
 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.1m, 10.2m, 10.3m, 10.4m, 5.5p, 5.6p, 5.7p, 5.6w
 MYSQL_DEFAULT?=		5.7
-# Possible values: 5.26, 5.28, 5.30, devel
+# Possible values: 5.28, 5.30, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.30



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005311020.04VAKMCN050075>