Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Jun 2017 02:26:53 +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: r442270 - in head: . Mk Mk/Uses lang lang/perl5.20
Message-ID:  <201706010226.v512Qr3o074043@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Thu Jun  1 02:26:53 2017
New Revision: 442270
URL: https://svnweb.freebsd.org/changeset/ports/442270

Log:
  Remove lang/perl5.20 and unregister it, it expired in May 2017.
  
  Submitted by:	rene
  Reviewed by:	perl (sunpoet), portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D10983

Deleted:
  head/lang/perl5.20/
Modified:
  head/MOVED
  head/Mk/Uses/perl5.mk
  head/Mk/bsd.default-versions.mk
  head/lang/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Jun  1 02:13:00 2017	(r442269)
+++ head/MOVED	Thu Jun  1 02:26:53 2017	(r442270)
@@ -9396,3 +9396,4 @@ net-mgmt/zabbix24-proxy||2017-05-29|Has expired: Upstr
 net-mgmt/zabbix24-server||2017-05-29|Has expired: Upstream has declared this version EoL in 2016 (Q1)
 net/py-cloudfiles|net/py-python-cloudfiles|2017-05-30|Rename to match PyPI naming
 irc/konversation-kde4|irc/konversation|2017-05-30|Renamed to irc/konversation
+lang/perl5.20|lang/perl5.24|2017-06-01|Support ends three years after .0 release, please upgrade to a more recent version of Perl

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Thu Jun  1 02:13:00 2017	(r442269)
+++ head/Mk/Uses/perl5.mk	Thu Jun  1 02:26:53 2017	(r442270)
@@ -42,18 +42,9 @@ IGNORE=	Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 ta
 
 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"
@@ -66,7 +57,6 @@ PERL_PORT?=	perl5-devel
 .    else
 IGNORE=	Invalid perl5 version ${PERL5_DEFAULT}
 .    endif
-.  endif
 
 PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
 
@@ -97,10 +87,8 @@ PERL_ARCH?=	mach
 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

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Thu Jun  1 02:13:00 2017	(r442269)
+++ head/Mk/bsd.default-versions.mk	Thu Jun  1 02:26:53 2017	(r442270)
@@ -56,7 +56,7 @@ WARNING+=		"OVERRIDE_LINUX_BASE_PORT is deprecated, pl
 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, 5.26, 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

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Thu Jun  1 02:13:00 2017	(r442269)
+++ head/lang/Makefile	Thu Jun  1 02:26:53 2017	(r442270)
@@ -244,7 +244,6 @@
     SUBDIR += pcc
     SUBDIR += pecl-perl
     SUBDIR += perl5-devel
-    SUBDIR += perl5.20
     SUBDIR += perl5.22
     SUBDIR += perl5.24
     SUBDIR += perl5.26



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