- update to 2.03

3 files changed, 34 insertions, 23 deletions

diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index 3b61b93f9599..04756b888ade 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	POE-Component-Jabber
-PORTVERSION=	2.02
+PORTVERSION=	2.03
 CATEGORIES=	net devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,30 +15,42 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A POE Component for communicating over Jabber
 
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/Filter/Template.pm:${PORTSDIR}/devel/p5-Filter-Template \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
-		${SITE_PERL}/POE/Component/SSLify.pm:${PORTSDIR}/security/p5-POE-Component-SSLify \
-		${SITE_PERL}/POE/Filter/XML.pm:${PORTSDIR}/textproc/p5-POE-Filter-XML \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-Filter-Template>=0:${PORTSDIR}/devel/p5-Filter-Template \
+		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
+		p5-POE-Filter-XML>=0:${PORTSDIR}/textproc/p5-POE-Filter-XML
 
 PERL_MODBUILD=	5.8.8+	# required by vendor
 CONFIGURE_ARGS=	</dev/null
 
-MAN3=		POE::Component::Jabber.3 POE::Component::Jabber::Error.3 \
-		POE::Component::Jabber::J14.3 POE::Component::Jabber::J2.3 \
+PORTEXAMPLES=	*
+MAN3=		POE::Component::Jabber.3 \
+		POE::Component::Jabber::Error.3 \
+		POE::Component::Jabber::J14.3 \
+		POE::Component::Jabber::J2.3 \
 		POE::Component::Jabber::Legacy.3 \
 		POE::Component::Jabber::Protocol.3 \
 		POE::Component::Jabber::ProtocolFactory.3 \
-		POE::Component::Jabber::Status.3 POE::Component::Jabber::XMPP.3
+		POE::Component::Jabber::Status.3 \
+		POE::Component::Jabber::Utility::ClientHandle.3 \
+		POE::Component::Jabber::Utility::SSLify.3 \
+		POE::Component::Jabber::Utility::ServerHandle.3 \
+		POE::Component::Jabber::XMPP.3
 
 post-install:
-.ifndef(NOPORTDOCS)
+.ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500703
+RUN_DEPENDS+=	p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/p5-POE-Component-Jabber/distinfo b/net/p5-POE-Component-Jabber/distinfo
index bc7c3721b9da..d0ca5cd8e15d 100644
--- a/net/p5-POE-Component-Jabber/distinfo
+++ b/net/p5-POE-Component-Jabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (POE-Component-Jabber-2.02.tar.gz) = fc66b0afdcb6f11b4ce61d016d299a04
-SHA256 (POE-Component-Jabber-2.02.tar.gz) = 5aed35738cb3b68ccd269c9d139c0b59283b4872d035f2607d58faca0031fd43
-SIZE (POE-Component-Jabber-2.02.tar.gz) = 31275
+MD5 (POE-Component-Jabber-2.03.tar.gz) = 523d2e37c8dc1eac4605059f6627baff
+SHA256 (POE-Component-Jabber-2.03.tar.gz) = 22aecf8e76685085b4a73a43523bfedcfe6ec4321f47db71d8fed6e7feac3b53
+SIZE (POE-Component-Jabber-2.03.tar.gz) = 37080
diff --git a/net/p5-POE-Component-Jabber/pkg-plist b/net/p5-POE-Component-Jabber/pkg-plist
index 2fc2e04bfbb6..959961a1add8 100644
--- a/net/p5-POE-Component-Jabber/pkg-plist
+++ b/net/p5-POE-Component-Jabber/pkg-plist
@@ -7,11 +7,10 @@
 %%SITE_PERL%%/POE/Component/Jabber/Status.pm
 %%SITE_PERL%%/POE/Component/Jabber/XMPP.pm
 %%SITE_PERL%%/POE/Component/Jabber/Error.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/J14Component
-%%PORTDOCS%%%%EXAMPLESDIR%%/J2Component
-%%PORTDOCS%%%%EXAMPLESDIR%%/LegacyClient
-%%PORTDOCS%%%%EXAMPLESDIR%%/XMPPClient
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/POE/Component/Jabber
+%%SITE_PERL%%/POE/Component/Jabber/Utility/ClientHandle.pm
+%%SITE_PERL%%/POE/Component/Jabber/Utility/SSLify.pm
+%%SITE_PERL%%/POE/Component/Jabber/Utility/ServerHandle.pm
+@dirrmtry %%SITE_PERL%%/POE/Component/Jabber/Utility
+@dirrmtry %%SITE_PERL%%/POE/Component/Jabber
 @dirrmtry %%SITE_PERL%%/POE/Component
 @dirrmtry %%SITE_PERL%%/POE