Change dependency on old p5-Compress-Zlib, p5-IO-Compress-Base,

p5-IO-Compress-Zlib and p5-IO-Compress-Bzip2 modules to p5-IO-Compress.
Explicitly depend on p5-IO-Compress only if PERL_LEVEL < 500903
Bump PORTREVISION

3 files changed, 19 insertions, 7 deletions

diff --git a/net-mgmt/glpi-plugins-tracker-agent/Makefile b/net-mgmt/glpi-plugins-tracker-agent/Makefile
index 4b75616471cd..c7d5aaf3b509 100644
--- a/net-mgmt/glpi-plugins-tracker-agent/Makefile
+++ b/net-mgmt/glpi-plugins-tracker-agent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	agent
 DISTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://forge.indepnet.net/attachments/download/512/ \
 		http://glpi.siprossii.com/distfiles/
@@ -16,8 +17,7 @@ DISTNAME=	glpi-tracker_agent-1.5.3
 MAINTAINER=	d.durieux@siprossii.com
 COMMENT=	Agent get informations of networking devices by SNMP for GLPI
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+RUN_DEPENDS=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
@@ -33,6 +33,10 @@ TRACKERAGENTDIR?=	share/tracker_agent
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
 post-configure:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
 	  -e 's,%%TRACKERAGENTDIR%%,${TRACKERAGENTDIR},g' pkg-message > ${PKGMESSAGE}
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index 92f01adf96f7..c67f9bc613ff 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netdisco
 PORTVERSION=	0.95
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_with_mibs
@@ -25,7 +25,6 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP				\
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5		\
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg			\
 		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test			\
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib	\
 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser		\
 		${SITE_PERL}/MasonX/Request/WithApacheSession.pm:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession
 
@@ -57,6 +56,10 @@ CONFIG_FILES=	netdisco.conf netdisco.crontab netdisco-topology.txt \
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
 .if ${APACHE_VERSION} >= 20
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2	\
 		${SITE_PERL}/${PERL_ARCH}/APR/Request/Apache2.pm:${PORTSDIR}/www/p5-libapreq2
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 4d8e2ee16073..37f6a1530d56 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ocsinventory-ng
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://launchpad.net/ocsinventory-server/stable-${PORTVERSION:R}/${PORTVERSION}/+download/
 DISTNAME=	OCSNG_UNIX_SERVER-${PORTVERSION}
@@ -15,7 +15,6 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Open Computer and Software Inventory Next Generation
 
 RUN_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
@@ -32,6 +31,12 @@ USE_PHP=	mysql pcre zlib session xml gd zip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
 do-install:
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "Apache binutils dtd etc ocsreports" ${DATADIR}/)
@@ -41,4 +46,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>