- Update to 1.21

- Restrict to Perl 5.8.1+ due to vendor's requirement

PR:		ports/98995
Submitted by:	aaron
Approved by:	maintainer timeout, tobez (implicit)

3 files changed, 17 insertions, 42 deletions

diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index d0b34149833..481011b4b2e 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -7,42 +7,32 @@
 #
 
 PORTNAME=	POE-Component-Jabber
-PORTVERSION=	1.0
+PORTVERSION=	1.21
 CATEGORIES=	net devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:1,2/}
-MASTER_SITE_SUBDIR=	POE/:1 ExtUtils/:2
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1 \
-		ExtUtils-AutoInstall-0.59${EXTRACT_SUFX}:2
 
 MAINTAINER=	jdputsch@comcast.net
 COMMENT=	A POE Component for communicating over Jabber
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/POE/Filter/XML.pm:${PORTSDIR}/textproc/p5-POE-Filter-XML \
+		${SITE_PERL}/Filter/Template.pm:${PORTSDIR}/devel/p5-Filter-Template \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
 		${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}
 
-PERL_CONFIGURE=	yes
+PERL_MODBUILD=	yes
 
 MAN3=		POE::Component::Jabber.3 \
 		POE::Component::Jabber::Client::Component.3 \
 		POE::Component::Jabber::Client::J2.3 \
 		POE::Component::Jabber::Client::Legacy.3 \
 		POE::Component::Jabber::Client::XMPP.3 \
-		POE::Component::Jabber::Client::XMPP::TLS.3 \
-		POE::Component::Jabber::Error.3 \
-		POE::Component::Jabber::Server::Socket::CTLS.3 \
-		POE::Component::Jabber::Server::Socket::STLS.3
-
-pre-configure:
-	@${ECHO_MSG} "===>   Putting AutoInstall.pm in work dir"
-	@${MKDIR} ${WRKSRC}/install/ExtUtils
-	@${CP} ${WRKDIR}/ExtUtils-AutoInstall-0.59/lib/ExtUtils/AutoInstall.pm \
-	 ${WRKSRC}/install/ExtUtils
+		POE::Component::Jabber::Error.3
 
 post-install:
 .ifndef(NOPORTDOCS)
@@ -53,15 +43,8 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e 's/^our (\S+)/use vars qw($$1); $$1/' \
-		${WRKSRC}/lib/POE/Component/Jabber/Client/Legacy.pm \
-		${WRKSRC}/lib/POE/Component/Jabber/Client/Component.pm \
-		${WRKSRC}/lib/POE/Component/Jabber/Client/XMPP.pm \
-		${WRKSRC}/lib/POE/Component/Jabber/Client/J2.pm \
-		${WRKSRC}/lib/POE/Component/Jabber/Error.pm \
-		${WRKSRC}/lib/POE/Component/Jabber.pm
+.if ${PERL_LEVEL} < 500801 # required by vendor
+IGNORE=	requires at least Perl 5.8.1.  Please install lang/perl5.8 and try again
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-POE-Component-Jabber/distinfo b/net/p5-POE-Component-Jabber/distinfo
index 08bf4a94424..5014201d547 100644
--- a/net/p5-POE-Component-Jabber/distinfo
+++ b/net/p5-POE-Component-Jabber/distinfo
@@ -1,6 +1,3 @@
-MD5 (POE-Component-Jabber-1.0.tar.gz) = 4e0a60020511c19403b53d6fc993a3dd
-SHA256 (POE-Component-Jabber-1.0.tar.gz) = d08e7ca148f8ea029978553ddcad70a0fede1e37fbc7420fa0e3df7e9aaa0079
-SIZE (POE-Component-Jabber-1.0.tar.gz) = 24771
-MD5 (ExtUtils-AutoInstall-0.59.tar.gz) = 1dbcfe20069d125f5d2a0a351c2e9a57
-SHA256 (ExtUtils-AutoInstall-0.59.tar.gz) = b0fa1e133ecf79e786a35231b951772f11ee78d1b804da12096bb623d1219faa
-SIZE (ExtUtils-AutoInstall-0.59.tar.gz) = 25859
+MD5 (POE-Component-Jabber-1.21.tar.gz) = 75196e23db297a2b07b1d58a866b03d7
+SHA256 (POE-Component-Jabber-1.21.tar.gz) = 395ecd636b5c0be43327c2163a161bdf21d4e28c816928d5b1eeec2afe5f4c9e
+SIZE (POE-Component-Jabber-1.21.tar.gz) = 25510
diff --git a/net/p5-POE-Component-Jabber/pkg-plist b/net/p5-POE-Component-Jabber/pkg-plist
index e70d9883ff9..e37e87ab71c 100644
--- a/net/p5-POE-Component-Jabber/pkg-plist
+++ b/net/p5-POE-Component-Jabber/pkg-plist
@@ -3,29 +3,24 @@
 %%SITE_PERL%%/POE/Component/Jabber/Client/J2.pm
 %%SITE_PERL%%/POE/Component/Jabber/Client/Legacy.pm
 %%SITE_PERL%%/POE/Component/Jabber/Client/XMPP.pm
-%%SITE_PERL%%/POE/Component/Jabber/Client/XMPP/TLS.pm
 %%SITE_PERL%%/POE/Component/Jabber/Error.pm
+%%SITE_PERL%%/POE/Component/Jabber/Server.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/InputHandler.pm
+%%SITE_PERL%%/POE/Component/Jabber/Server/PresenceManager.pm
+%%SITE_PERL%%/POE/Component/Jabber/Server/RosterTable.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/RouteProcessor.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/RouteTable.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/SelfRouter.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/Socket.pm
-%%SITE_PERL%%/POE/Component/Jabber/Server/Socket/CTLS.pm
-%%SITE_PERL%%/POE/Component/Jabber/Server/Socket/STLS.pm
 %%SITE_PERL%%/POE/Component/Jabber/Server/SocketServer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Jabber/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/COMPTester.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/J2Tester.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/LEGACYTester.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/SERVERTester.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/XMPPSimpleTester.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/XMPPTester.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Jabber
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrm %%SITE_PERL%%/POE/Component/Jabber/Server/Socket
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Server
-@dirrm %%SITE_PERL%%/POE/Component/Jabber/Client/XMPP
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Client
 @dirrm %%SITE_PERL%%/POE/Component/Jabber
 @dirrmtry %%SITE_PERL%%/POE/Component