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

4 files changed, 16 insertions, 9 deletions

diff --git a/textproc/p5-ElasticSearch-SearchBuilder/Makefile b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
index c3dd0dd83bcf..5ab84b472820 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 921b5867093d..58c72c672dca 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 8d81d3fcb402..cc6c6c7e25f7 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 279e3b49c2dd..aa3d5a41dad5 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>