Index: head/net/p5-POE-Component-Server-Twirc/Makefile
===================================================================
--- head/net/p5-POE-Component-Server-Twirc/Makefile	(revision 383055)
+++ head/net/p5-POE-Component-Server-Twirc/Makefile	(revision 383056)
@@ -1,41 +1,45 @@
 # Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	POE-Component-Server-Twirc
-PORTVERSION=	0.17
+PORTVERSION=	0.20
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:MMIMS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Twitter/IRC gateway
 
-BUILD_DEPENDS=	p5-AnyEvent-Twitter-Stream>=0:${PORTSDIR}/net/p5-AnyEvent-Twitter-Stream \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
+		p5-AnyEvent-Twitter>=0:${PORTSDIR}/net/p5-AnyEvent-Twitter \
+		p5-AnyEvent-Twitter-Stream>=0:${PORTSDIR}/net/p5-AnyEvent-Twitter-Stream \
 		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-LWP-UserAgent-POE>=0.02:${PORTSDIR}/www/p5-LWP-UserAgent-POE \
+		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Getopt>=0.15:${PORTSDIR}/devel/p5-MooseX-Getopt \
 		p5-MooseX-Log-Log4perl>=0:${PORTSDIR}/devel/p5-MooseX-Log-Log4perl \
 		p5-MooseX-POE>=0.215:${PORTSDIR}/devel/p5-MooseX-POE \
 		p5-MooseX-SimpleConfig>=0:${PORTSDIR}/devel/p5-MooseX-SimpleConfig \
 		p5-MooseX-Storage>=0:${PORTSDIR}/devel/p5-MooseX-Storage \
-		p5-Net-Twitter>=3.11007:${PORTSDIR}/net/p5-Net-Twitter \
 		p5-POE-Component-Server-IRC>=0.02005:${PORTSDIR}/irc/p5-POE-Component-Server-IRC \
 		p5-POE-Component-TSTP>=0:${PORTSDIR}/devel/p5-POE-Component-TSTP \
+		p5-POE-Loop-AnyEvent>=0:${PORTSDIR}/devel/p5-POE-Loop-AnyEvent \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
 		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
 		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
 		p5-String-Truncate>=0:${PORTSDIR}/textproc/p5-String-Truncate \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e '/auto_install/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
Index: head/net/p5-POE-Component-Server-Twirc/distinfo
===================================================================
--- head/net/p5-POE-Component-Server-Twirc/distinfo	(revision 383055)
+++ head/net/p5-POE-Component-Server-Twirc/distinfo	(revision 383056)
@@ -1,2 +1,2 @@
-SHA256 (POE-Component-Server-Twirc-0.17.tar.gz) = b5a38af9c59ef7773e81125e6519e6081c1828e06a012c3a7e35c27c3703bdb8
-SIZE (POE-Component-Server-Twirc-0.17.tar.gz) = 52739
+SHA256 (POE-Component-Server-Twirc-0.20.tar.gz) = 674214f4f55bab853305b972e7c8946c0cba1ff062f29a556eb7ec86a6ef2797
+SIZE (POE-Component-Server-Twirc-0.20.tar.gz) = 31341
Index: head/net/p5-POE-Component-Server-Twirc/pkg-plist
===================================================================
--- head/net/p5-POE-Component-Server-Twirc/pkg-plist	(revision 383055)
+++ head/net/p5-POE-Component-Server-Twirc/pkg-plist	(revision 383056)
@@ -1,15 +1,15 @@
 bin/twirc
-%%PERL5_MAN3%%/App::Twirc.3.gz
-%%PERL5_MAN3%%/App::Twirc::Manual.3.gz
-%%PERL5_MAN3%%/App::Twirc::Plugin::BangCommands.3.gz
-%%PERL5_MAN3%%/App::Twirc::Plugin::SecondaryAccount.3.gz
-%%PERL5_MAN3%%/App::Twirc::Plugin::SquashWhiteSpace.3.gz
-%%PERL5_MAN3%%/POE::Component::Server::Twirc.3.gz
 %%SITE_PERL%%/App/Twirc.pm
 %%SITE_PERL%%/App/Twirc/Manual.pod
 %%SITE_PERL%%/App/Twirc/Plugin/BangCommands.pm
 %%SITE_PERL%%/App/Twirc/Plugin/SecondaryAccount.pm
 %%SITE_PERL%%/App/Twirc/Plugin/SquashWhiteSpace.pm
 %%SITE_PERL%%/POE/Component/Server/Twirc.pm
 %%SITE_PERL%%/POE/Component/Server/Twirc/LogAppender.pm
 %%SITE_PERL%%/POE/Component/Server/Twirc/State.pm
+%%PERL5_MAN3%%/App::Twirc.3.gz
+%%PERL5_MAN3%%/App::Twirc::Manual.3.gz
+%%PERL5_MAN3%%/App::Twirc::Plugin::BangCommands.3.gz
+%%PERL5_MAN3%%/App::Twirc::Plugin::SecondaryAccount.3.gz
+%%PERL5_MAN3%%/App::Twirc::Plugin::SquashWhiteSpace.3.gz
+%%PERL5_MAN3%%/POE::Component::Server::Twirc.3.gz