10 files changed, 83 insertions, 40 deletions

diff --git a/devel/otrs/Makefile b/devel/otrs/Makefile
index 2b82c51c8143..a71e47ba578e 100644
--- a/devel/otrs/Makefile
+++ b/devel/otrs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	otrs
 PORTVERSION=	2.4.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
@@ -106,8 +106,10 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef WITH_PDF
-RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2
+. if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+. endif
 .endif
 
 .ifdef WITH_ISPELL
diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile
index 373543b79fe4..ee3ab4377b21 100644
--- a/devel/p5-CPAN-Checksums/Makefile
+++ b/devel/p5-CPAN-Checksums/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CPAN-Checksums
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,12 +23,10 @@ PERL_CONFIGURE=	YES
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501000
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Bzip2.pm:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Bzip2.pm:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Bzip2.pm:${PORTSDIR}/archivers/p5-IO-Compress \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Bzip2.pm:${PORTSDIR}/archivers/p5-IO-Compress \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
 .endif
 
 MAN3=		CPAN::Checksums.3
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index 935305701b2e..4cd86cc99a97 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CPAN-Mini
 PORTVERSION=	1.100630
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	CPAN::Mini - create a minimal mirror of CPAN
 
-RUN_DEPENDS=	p5-Compress-Zlib>=1.20:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		p5-File-HomeDir>=0.57:${PORTSDIR}/devel/p5-File-HomeDir \
+RUN_DEPENDS=	p5-File-HomeDir>=0.57:${PORTSDIR}/devel/p5-File-HomeDir \
 		p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
 		p5-URI>=1:${PORTSDIR}/net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
@@ -25,4 +25,10 @@ PERL_CONFIGURE=	yes
 MAN1=	minicpan.1
 MAN3=	CPAN::Mini.3 CPAN::Mini::App.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index f9fe5bcec3a9..d0ea171e4229 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Data-Dump-Streamer
 PORTVERSION=	2.22
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,15 +15,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Stream a highly accurate breadth first data dump in Perl code
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
+RUN_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
 		p5-B-Utils>=0:${PORTSDIR}/devel/p5-B-Utils \
-		p5-Compress-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 		p5-PadWalker>=0.99:${PORTSDIR}/devel/p5-PadWalker
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN3=		Data::Dump::Streamer.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Data-Serializer/Makefile b/devel/p5-Data-Serializer/Makefile
index 2f8091bd5c95..ce024dadfaba 100644
--- a/devel/p5-Data-Serializer/Makefile
+++ b/devel/p5-Data-Serializer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Data-Serializer
 PORTVERSION=	0.49
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,10 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modules that serialize data structures
 
-BUILD_DEPENDS=	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
+RUN_DEPENDS=	${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes
 
@@ -32,4 +31,10 @@ MAN3=		Data::Serializer.3 Data::Serializer::Config::General.3 \
 		Data::Serializer::XML::Simple.3 Data::Serializer::YAML.3 \
 		Data::Serializer::YAML::Syck.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index 02015f6bfcd2..ec024acb977f 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Git-PurePerl
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/L/LB/LBROCARD
@@ -16,8 +17,6 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Pure Perl interface to Git repositories
 
 RUN_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		p5-Compress-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		p5-Data-Stream-Bulk>=0:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
@@ -28,4 +27,11 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Git::PurePerl.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+BUILD_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-PAR-Packer/Makefile b/devel/p5-PAR-Packer/Makefile
index cd5a3a6cadf1..3e612c03d688 100644
--- a/devel/p5-PAR-Packer/Makefile
+++ b/devel/p5-PAR-Packer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	PAR-Packer
 PORTVERSION=	1.00.7
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,15 +16,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	PAR Packager
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.00:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Compress-Zlib>=1.30:${PORTSDIR}/archivers/p5-Compress-Zlib \
+RUN_DEPENDS=	p5-Archive-Zip>=1.00:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-Getopt-ArgvFile>=1.07:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
 		p5-Module-ScanDeps>=0.96:${PORTSDIR}/devel/p5-Module-ScanDeps \
 		${SITE_PERL}/Module/Signature.pm:${PORTSDIR}/security/p5-Module-Signature \
 		p5-PAR-Dist>=0.22:${PORTSDIR}/devel/p5-PAR-Dist \
 		p5-PAR>=1.00.0:${PORTSDIR}/devel/p5-PAR \
 		${SITE_PERL}/B/Deobfuscate.pm:${PORTSDIR}/devel/p5-B-Deobfuscate
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 CONFLICTS=	sketchy-*
 
@@ -44,4 +44,10 @@ MAN3=		pp.3 \
 		PAR::StrippedPARL::Dynamic.3 \
 		PAR::StrippedPARL::Static.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 5214d422332f..06e1ae4db145 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	PAR
 PORTVERSION=	1.00.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,11 +16,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Perl Archive Toolkit
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.00:${PORTSDIR}/archivers/p5-Archive-Zip \
+RUN_DEPENDS=	p5-Archive-Zip>=1.00:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-AutoLoader>=5.67:${PORTSDIR}/devel/p5-AutoLoader \
-		p5-Compress-Zlib>=1.30:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		p5-PAR-Dist>=0.32:${PORTSDIR}/devel/p5-PAR-Dist
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
@@ -30,7 +30,13 @@ MAN3=		PAR.3 \
 		PAR::SetupProgname.3 \
 		PAR::SetupTemp.3
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
 regression-test:
 	cd ${WRKSRC} && ${MAKE} test
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index fbde46b49ea1..53b09b813325 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Parse-CPAN-Packages
 PORTVERSION=	2.31
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,11 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Parse 02packages.details.txt.gz from CPAN
 
-BUILD_DEPENDS=	p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-Compress-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Zlib \
+RUN_DEPENDS=	p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-version>=0:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
@@ -26,4 +26,10 @@ MAN3=	Parse::CPAN::Packages.3 \
 	Parse::CPAN::Packages::Distribution.3 \
 	Parse::CPAN::Packages::Package.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 853d05a8f77c..0db594086c0f 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	svk
 PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/C/CL/CLKAO
@@ -23,7 +23,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-L
 		${SITE_PERL}/App/CLI.pm:${PORTSDIR}/devel/p5-App-CLI \
 		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
 		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
 		${SITE_PERL}/IO/Digest.pm:${PORTSDIR}/devel/p5-IO-Digest \
 		${SITE_PERL}/IO/Pager.pm:${PORTSDIR}/devel/p5-IO-Pager \
@@ -171,9 +170,11 @@ RUN_DEPENDS+=	p5-Getopt-Long>=2.35:${PORTSDIR}/devel/p5-Getopt-Long
 
 .if ${PERL_LEVEL} < 500903
 BUILD_DEPENDS+=	p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Escapes
+		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
+		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
 RUN_DEPENDS+=	p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Escapes
+		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
+		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
 .endif
 
 pre-everything::