Cleanup dependencies on lang/p5-Scalar-List-Utils.

The different cases are:

- Only bring it if the one bundled with Perl is outdated.
- The version bundled with all our Perl is sufficient.
- Scalar-List-Util is not really needed by the port.
  (looking for /(Sub|Scalar|List)::Util/ returns nothing.)

While there, do some minor cleanup that caught my eye.

PR:		208378
With hat:	perl@
Sponsored by:	Absolight

30 files changed, 74 insertions, 79 deletions

diff --git a/databases/p5-DBIx-Class-Helpers/Makefile b/databases/p5-DBIx-Class-Helpers/Makefile
index dda848b..20b48da 100644
--- a/databases/p5-DBIx-Class-Helpers/Makefile
+++ b/databases/p5-DBIx-Class-Helpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DBIx-Class-Helpers
 PORTVERSION=	2.032000
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,7 +20,6 @@ RUN_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
 		p5-DBIx-Introspector>=0:${PORTSDIR}/databases/p5-DBIx-Introspector \
 		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
 		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase \
 		p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
 		p5-Text-Brew>=0:${PORTSDIR}/textproc/p5-Text-Brew \
diff --git a/devel/p5-Class-Spiffy/Makefile b/devel/p5-Class-Spiffy/Makefile
index 434aaea..6d745d8 100644
--- a/devel/p5-Class-Spiffy/Makefile
+++ b/devel/p5-Class-Spiffy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Class-Spiffy
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,9 +11,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Class::Spiffy - Spiffy Perl Interface Framework For You
 
-BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/devel/p5-Config-Validator/Makefile b/devel/p5-Config-Validator/Makefile
index ee067ed..ac05752 100644
--- a/devel/p5-Config-Validator/Makefile
+++ b/devel/p5-Config-Validator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Config-Validator
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +15,6 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-No-Worries>=1.0:${PORTSDIR}/devel/p5-No-Worries \
-		p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-URI>=1.67:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 471a204..3f768a7 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -14,10 +14,14 @@ COMMENT=	Portably create pipe() or pipe-like handles, one way or another
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
-
 NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502000
+TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Minilla/Makefile b/devel/p5-Minilla/Makefile
index 84f8663..32664cc 100644
--- a/devel/p5-Minilla/Makefile
+++ b/devel/p5-Minilla/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	Minilla
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=CPAN:TOKUHIROM
@@ -50,7 +51,6 @@ BUILD_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
 		p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
 		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Software-License>=0:${PORTSDIR}/misc/p5-Software-License \
 		p5-Version-Next>=0:${PORTSDIR}/textproc/p5-Version-Next
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index 369f0d9..c577ebb 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Moo
 PORTVERSION=	2.001001
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
@@ -28,13 +29,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 XS_BUILD_DEPENDS=	p5-Class-XSAccessor>=1.18:${PORTSDIR}/devel/p5-Class-XSAccessor
-XS_RUN_DEPENDS:=	${XS_BUILD_DEPENDS}
+XS_RUN_DEPENDS=		${XS_BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502104 && ${PORT_OPTIONS:MXS}
-BUILD_DEPENDS+=		p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=		p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Perl-Version/Makefile b/devel/p5-Perl-Version/Makefile
index e79ff47..b3026f2 100644
--- a/devel/p5-Perl-Version/Makefile
+++ b/devel/p5-Perl-Version/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Perl-Version
 PORTVERSION=	1.013
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +14,7 @@ COMMENT=	Parse and manipulate Perl version strings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 9bf93fb..5423b33 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Perl6-Form
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Implements the Perl 6 'form' built-in
 
-BUILD_DEPENDS=	p5-Perl6-Export>=0:${PORTSDIR}/devel/p5-Perl6-Export \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Perl6-Export>=0:${PORTSDIR}/devel/p5-Perl6-Export
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Return-Type/Makefile b/devel/p5-Return-Type/Makefile
index a30fb77..93cd538 100644
--- a/devel/p5-Return-Type/Makefile
+++ b/devel/p5-Return-Type/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Return-Type
 PORTVERSION=	0.005
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
@@ -15,8 +15,7 @@ COMMENT=	Specify a return type for a function (optionally with coercion)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
diff --git a/devel/p5-SUPER/Makefile b/devel/p5-SUPER/Makefile
index 2ea6fee..725adb8 100644
--- a/devel/p5-SUPER/Makefile
+++ b/devel/p5-SUPER/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	SUPER
 PORTVERSION=	1.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl module control superclass method dispatch
 
-BUILD_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-Scalar-List-Utils>=0.20:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Data/Makefile b/devel/p5-Test-Data/Makefile
index f1f4bc4..8e19330 100644
--- a/devel/p5-Test-Data/Makefile
+++ b/devel/p5-Test-Data/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Test-Data
 PORTVERSION=	1.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
@@ -12,9 +12,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test functions for particular variable types
 
-RUN_DEPENDS=	p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/finance/p5-Finance-Bitcoin/Makefile b/finance/p5-Finance-Bitcoin/Makefile
index 842435f..d5d748c 100644
--- a/finance/p5-Finance-Bitcoin/Makefile
+++ b/finance/p5-Finance-Bitcoin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Finance-Bitcoin
 PORTVERSION=	0.901
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +14,6 @@ COMMENT=	Perl interface to a bitcoin instance
 BUILD_DEPENDS=	p5-JSON-RPC>=0.96:${PORTSDIR}/devel/p5-JSON-RPC \
 		p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Module-Signature>=0.66:${PORTSDIR}/security/p5-Module-Signature \
-		p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
 		p5-Object-AUTHORITY>=0:${PORTSDIR}/devel/p5-Object-Authority
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index a8e2a84..81437a8 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MIME-Fast
 PORTVERSION=	1.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,9 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create, edit, and parse MIME messages (via gmime2 C library)
 
-BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index 392d670..a1ea930 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Graph
 PORTVERSION=	0.96
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
@@ -12,8 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Graph, the Perl module for graph operations
 
-BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/math/p5-Math-Algebra-Symbols/Makefile b/math/p5-Math-Algebra-Symbols/Makefile
index 02cbcaa..a824f30 100644
--- a/math/p5-Math-Algebra-Symbols/Makefile
+++ b/math/p5-Math-Algebra-Symbols/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-Algebra-Symbols
 PORTVERSION=	1.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,9 +14,6 @@ COMMENT=	Symbolic Algebra in Pure Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 USES=		perl5 shebangfix
 SHEBANG_FILES=	symbols.pl
 perl_OLD_CMD=	perl
diff --git a/math/p5-Math-Polygon-Tree/Makefile b/math/p5-Math-Polygon-Tree/Makefile
index 1d22bb4..6ebf517 100644
--- a/math/p5-Math-Polygon-Tree/Makefile
+++ b/math/p5-Math-Polygon-Tree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Math-Polygon-Tree
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LIOSHA
@@ -12,7 +13,6 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Class for fast check if point is inside polygon
 
 BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Math-Geometry-Planar-GPC-PolygonXS>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-GPC-PolygonXS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index 505c7b0..6210594 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gtk-youtube-viewer
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,7 +25,6 @@ BUILD_DEPENDS=	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
 		p5-Term-ReadLine>0:${PORTSDIR}/devel/p5-Term-ReadLine \
 		p5-Thread-Queue>0:${PORTSDIR}/devel/p5-Thread-Queue \
 		p5-threads>0:${PORTSDIR}/devel/p5-threads \
-		p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Socket>0:${PORTSDIR}/net/p5-Socket \
 		p5-Text-CharWidth>0:${PORTSDIR}/textproc/p5-Text-CharWidth \
 		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
diff --git a/net-mgmt/p5-Nagios-Object/Makefile b/net-mgmt/p5-Nagios-Object/Makefile
index 5b0c65d..27b1e62 100644
--- a/net-mgmt/p5-Nagios-Object/Makefile
+++ b/net-mgmt/p5-Nagios-Object/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Nagios-Object
 PORTVERSION=	0.21.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +14,6 @@ COMMENT=	Perl objects to represent Nagios configuration
 BUILD_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Module-Build>=0.3607:${PORTSDIR}/devel/p5-Module-Build \
 		p5-Data-Dumper>=2.126:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-List-Compare>=0.37:${PORTSDIR}/misc/p5-List-Compare \
 		p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple \
 		p5-Test-NoWarnings>=1.01:${PORTSDIR}/devel/p5-Test-NoWarnings
diff --git a/net-mgmt/p5-Net-SNMP-Util/Makefile b/net-mgmt/p5-Net-SNMP-Util/Makefile
index 8dfe495..08c98d9 100644
--- a/net-mgmt/p5-Net-SNMP-Util/Makefile
+++ b/net-mgmt/p5-Net-SNMP-Util/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-SNMP-Util
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TONODERA
@@ -12,8 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hhyou@cs.nctu.edu.tw
 COMMENT=	Utility functions for Net::SNMP
 
-RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-	        p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-mgmt/p5-jmx4perl/Makefile b/net-mgmt/p5-jmx4perl/Makefile
index 2cccde9..3cdba0b 100644
--- a/net-mgmt/p5-jmx4perl/Makefile
+++ b/net-mgmt/p5-jmx4perl/Makefile
@@ -2,11 +2,12 @@
 
 PORTNAME=	jmx4perl
 PORTVERSION=	1.11
+DISTVERSIONSUFFIX=	_2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROLAND
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${DISTNAME}_2${EXTRACT_SUFX}
 
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	JMX access for Perl
@@ -24,7 +25,6 @@ RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
 		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
 		p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
 		p5-Term-Clui>=0:${PORTSDIR}/devel/p5-Term-Clui \
 		p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
@@ -53,7 +53,6 @@ ETC_FILES=	common.cfg \
 
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	ETC_FILES="${ETC_FILES}"
-WRKSRC=		${WRKDIR}/${DISTNAME}_2
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/net/p5-Kafka/Makefile b/net/p5-Kafka/Makefile
index 77de7615..9fa1af0 100644
--- a/net/p5-Kafka/Makefile
+++ b/net/p5-Kafka/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Kafka
 PORTVERSION=	0.8010
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SGLADKOV
@@ -22,7 +23,6 @@ BUILD_DEPENDS=	p5-Compress-Snappy>=0:${PORTSDIR}/archivers/p5-Compress-Snappy \
 		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
 		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
 		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-		p5-Scalar-List-Utils>=1:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Scalar-Util-Numeric>=0:${PORTSDIR}/devel/p5-Scalar-Util-Numeric \
 		p5-Data-HexDump-Range>=0:${PORTSDIR}/devel/p5-Data-HexDump-Range
 
@@ -31,4 +31,11 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502000
+BUILD_DEPENDS+=      p5-Scalar-List-Utils>=1.38:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=        p5-Scalar-List-Utils>=1.38:${PORTSDIR}/lang/p5-Scalar-List-Utils
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/p5-MaxMind-DB-Reader/Makefile b/net/p5-MaxMind-DB-Reader/Makefile
index c4bf8ef..57332b1 100644
--- a/net/p5-MaxMind-DB-Reader/Makefile
+++ b/net/p5-MaxMind-DB-Reader/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MaxMind-DB-Reader
 PORTVERSION=	1.000009
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAXMIND
@@ -27,7 +28,6 @@ BUILD_DEPENDS=	p5-Data-IEEE754>=0:${PORTSDIR}/devel/p5-Data-IEEE754 \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Path-Class>=0.27:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Scalar-List-Utils>=1.42:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Test-Bits>=0:${PORTSDIR}/devel/p5-Test-Bits \
 		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
 		p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta \
@@ -37,4 +37,10 @@ NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502300
+TEST_DEPENDS+=      p5-Scalar-List-Utils>=1.42:${PORTSDIR}/lang/p5-Scalar-List-Utils
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/p5-Rex/Makefile b/sysutils/p5-Rex/Makefile
index 6a50458..4faacf5 100644
--- a/sysutils/p5-Rex/Makefile
+++ b/sysutils/p5-Rex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Rex
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FERKI
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	\
 	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
 	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
 	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
 	p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
diff --git a/textproc/p5-ElasticSearch-SearchBuilder/Makefile b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
index c3dd0dd..5ab84b4 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/Makefile
+++ b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ElasticSearch-SearchBuilder
 PORTVERSION=	0.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/../by-authors/id/D/DR/DRTECH/
 PKGNAMEPREFIX=	p5-
@@ -14,8 +14,7 @@ COMMENT=	ElasticSearch Query Builder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Carp>=0:${PORTSDIR}/devel/p5-Carp \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS=	p5-Carp>=0:${PORTSDIR}/devel/p5-Carp
 TEST_DEPENDS=	p5-Test-Deep>=:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump
diff --git a/textproc/p5-Geo-Parse-OSM/Makefile b/textproc/p5-Geo-Parse-OSM/Makefile
index 921b586..58c72c6 100644
--- a/textproc/p5-Geo-Parse-OSM/Makefile
+++ b/textproc/p5-Geo-Parse-OSM/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Geo-Parse-OSM
 PORTVERSION=	0.42
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc geography perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LIOSHA
@@ -13,7 +13,6 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	OpenStreetMap XML file regexp parser
 
 BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/textproc/p5-Perl-Lint/Makefile b/textproc/p5-Perl-Lint/Makefile
index 8d81d3f..cc6c6c7 100644
--- a/textproc/p5-Perl-Lint/Makefile
+++ b/textproc/p5-Perl-Lint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Perl-Lint
 PORTVERSION=	0.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MOZNION
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords \
 		p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Path-Tiny>=0.068:${PORTSDIR}/devel/p5-Path-Tiny \
 		p5-Regexp-Lexer>=0.05:${PORTSDIR}/devel/p5-Regexp-Lexer \
-		p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase \
 		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -44,6 +43,9 @@ post-install-EXAMPLES-on:
 .if ${PERL_LEVEL} >= 502000
 BUILD_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
 RUN_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+.else
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-RDF-Trine/Makefile b/textproc/p5-RDF-Trine/Makefile
index 279e3b4..aa3d5a4 100644
--- a/textproc/p5-RDF-Trine/Makefile
+++ b/textproc/p5-RDF-Trine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	RDF-Trine
 PORTVERSION=	1.014
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -30,7 +31,6 @@ BUILD_DEPENDS=	p5-Algorithm-Combinatorics>=0:${PORTSDIR}/math/p5-Algorithm-Combi
 		p5-Module-Load-Conditional>=0.38:${PORTSDIR}/devel/p5-Module-Load-Conditional \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-ArrayRef>=0:${PORTSDIR}/devel/p5-MooseX-ArrayRef \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
@@ -49,4 +49,11 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502000
+BUILD_DEPENDS+=      p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=        p5-Scalar-List-Utils>=1.33:${PORTSDIR}/lang/p5-Scalar-List-Utils
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index d19f469..3e85180 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Component-ACCEPT_CONTEXT
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Make the Catalyst request context available in Models and Views
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle
 
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index 0c58a9d..912d826 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Plugin-Singleton
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
@@ -13,8 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Singleton accessors to context
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/www/p5-HTTP-MobileAgent/Makefile b/www/p5-HTTP-MobileAgent/Makefile
index a6db91f..c03cc47 100644
--- a/www/p5-HTTP-MobileAgent/Makefile
+++ b/www/p5-HTTP-MobileAgent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTTP-MobileAgent
 PORTVERSION=	0.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KURIHARA
@@ -17,7 +17,6 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
 		p5-HTTP-Message>=1.43:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Scalar-List-Utils>=1.14:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		ja-p5-WWW-MobileCarrierJP>=0.04:${PORTSDIR}/japanese/p5-WWW-MobileCarrierJP \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML