4 files changed, 28 insertions, 25 deletions

diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 19a988d3093a..657db89d08de 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	POE
-PORTVERSION=	0.17
+PORTVERSION=	0.18
 CATEGORIES=	devel perl5
-MASTER_SITES=	http://poe.perl.org/poedown/	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} http://poe.perl.org/poedown/
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 BUILD_DEPENDS=	\
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
@@ -25,18 +25,18 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		POE.3 POE::Component.3 POE::Component::Server::TCP.3 \
-		POE::Driver.3 POE::Driver::SysRW.3 POE::Filter.3 \
-		POE::Filter::Block.3 POE::Filter::Grep.3 POE::Filter::HTTPD.3 \
-		POE::Filter::Line.3 POE::Filter::Map.3 \
-		POE::Filter::RecordBlock.3 POE::Filter::Reference.3 \
-		POE::Filter::Stackable.3 POE::Filter::Stream.3 POE::Kernel.3 \
-		POE::NFA.3 POE::Pipe.3 POE::Pipe::OneWay.3 POE::Pipe::TwoWay.3 \
-		POE::Preprocessor.3 POE::Session.3 POE::Wheel.3 \
-		POE::Wheel::Curses.3 POE::Wheel::FollowTail.3 \
-		POE::Wheel::ListenAccept.3 POE::Wheel::ReadLine.3 \
-		POE::Wheel::ReadWrite.3 POE::Wheel::Run.3 \
-		POE::Wheel::SocketFactory.3
+MAN3=		POE.3 POE::Component.3 POE::Component::Client::TCP.3 \
+		POE::Component::Server::TCP.3 POE::Driver.3 \
+		POE::Driver::SysRW.3 POE::Filter.3 POE::Filter::Block.3 \
+		POE::Filter::Grep.3 POE::Filter::HTTPD.3 POE::Filter::Line.3 \
+		POE::Filter::Map.3 POE::Filter::RecordBlock.3 \
+		POE::Filter::Reference.3 POE::Filter::Stackable.3 \
+		POE::Filter::Stream.3 POE::Kernel.3 POE::NFA.3 POE::Pipe.3 \
+		POE::Pipe::OneWay.3 POE::Pipe::TwoWay.3 POE::Preprocessor.3 \
+		POE::Session.3 POE::Wheel.3 POE::Wheel::Curses.3 \
+		POE::Wheel::FollowTail.3 POE::Wheel::ListenAccept.3 \
+		POE::Wheel::ReadLine.3 POE::Wheel::ReadWrite.3 \
+		POE::Wheel::Run.3 POE::Wheel::SocketFactory.3
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/devel/p5-POE/distinfo b/devel/p5-POE/distinfo
index 7d2357c56f8f..11d70506f7e9 100644
--- a/devel/p5-POE/distinfo
+++ b/devel/p5-POE/distinfo
@@ -1 +1 @@
-MD5 (POE-0.17.tar.gz) = 5016cee5e64b967384f526cbb21f9aab
+MD5 (POE-0.18.tar.gz) = 665b40b16c90ba994214f9bafd577353
diff --git a/devel/p5-POE/pkg-descr b/devel/p5-POE/pkg-descr
index 6ed0007a5564..cae1ccab2110 100644
--- a/devel/p5-POE/pkg-descr
+++ b/devel/p5-POE/pkg-descr
@@ -1,8 +1,10 @@
-POE is a framework for building Perl programs that lends itself naturally
-to tasks which involve reacting to external data.
+POE is a general purpose multitasking and networking framework.
 
-POE does standard event loop things, cooperative multitasking,
-network clients and servers; includes a high level class library that takes
-care of event driven I/O; provides a framework for portable program components.
+POE does standard event loop things, cooperative multitasking, network
+clients and servers; includes a high level class library that takes care
+of event driven I/O; provides a framework for portable program components.
 
 WWW: http://poe.perl.org/
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/devel/p5-POE/pkg-plist b/devel/p5-POE/pkg-plist
index cbc357eb7613..6ee110216b1c 100644
--- a/devel/p5-POE/pkg-plist
+++ b/devel/p5-POE/pkg-plist
@@ -1,6 +1,7 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/POE.pm
 lib/perl5/site_perl/%%PERL_VER%%/POE/Component.pm
+lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client/TCP.pm
 lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Server/TCP.pm
 lib/perl5/site_perl/%%PERL_VER%%/POE/Driver.pm
 lib/perl5/site_perl/%%PERL_VER%%/POE/Driver/SysRW.pm
@@ -63,14 +64,14 @@ lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/SocketFactory.pm
 %%PORTDOCS%%share/examples/p5-POE/wheels.perl
 %%PORTDOCS%%share/examples/p5-POE/wheels2.perl
 %%PORTDOCS%%@dirrm share/examples/p5-POE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Server
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Component
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Server
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Driver
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Filter
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Filter
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Pipe
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true