Update to 0.25

4 files changed, 76 insertions, 64 deletions

diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 3593d2ef435a..0c75f355127f 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	POE
-PORTVERSION=	0.23
+PORTVERSION=	0.25
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} http://poe.perl.org/poedown/
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
+COMMENT=	Multitasking and networking framework for perl
 
 BUILD_DEPENDS=	\
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
+		${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	</dev/null
 
@@ -33,18 +33,21 @@ MAN3=		POE.3 POE::Component.3 POE::Component::Client::TCP.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::Filter::Stream.3 POE::Kernel.3 POE::Loop.3 \
+		POE::Loop::Event.3 POE::Loop::Gtk.3 POE::Loop::Poll.3 \
+		POE::Loop::Select.3 POE::Loop::Tk.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
+		POE::Queue.3 POE::Queue::Array.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)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/samples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-POE/distinfo b/devel/p5-POE/distinfo
index 5a3150d2d328..f0833fc90569 100644
--- a/devel/p5-POE/distinfo
+++ b/devel/p5-POE/distinfo
@@ -1 +1 @@
-MD5 (POE-0.23.tar.gz) = 91e8c1fd95f83c215d61651cd678ad66
+MD5 (POE-0.25.tar.gz) = 32345215739b58d44898a93a4060e528
diff --git a/devel/p5-POE/pkg-comment b/devel/p5-POE/pkg-comment
deleted file mode 100644
index 1246c5625b69..000000000000
--- a/devel/p5-POE/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multitasking and networking framework for perl
diff --git a/devel/p5-POE/pkg-plist b/devel/p5-POE/pkg-plist
index 95bbe2245c19..1a329136b724 100644
--- a/devel/p5-POE/pkg-plist
+++ b/devel/p5-POE/pkg-plist
@@ -1,41 +1,62 @@
-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
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Block.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Grep.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/HTTPD.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Line.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Map.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/RecordBlock.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Reference.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Stackable.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Filter/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel/Gtk.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel/Poll.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel/Tk.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Macro/UseBytes.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/NFA.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Pipe.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Pipe/OneWay.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Pipe/TwoWay.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Preprocessor.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/Curses.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/FollowTail.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/ListenAccept.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/ReadLine.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/ReadWrite.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/Run.pm
-lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/SocketFactory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/.packlist
+%%SITE_PERL%%/POE.pm
+%%SITE_PERL%%/POE/Component.pm
+%%SITE_PERL%%/POE/Component/Client/TCP.pm
+%%SITE_PERL%%/POE/Component/Server/TCP.pm
+%%SITE_PERL%%/POE/Driver.pm
+%%SITE_PERL%%/POE/Driver/SysRW.pm
+%%SITE_PERL%%/POE/Filter.pm
+%%SITE_PERL%%/POE/Filter/Block.pm
+%%SITE_PERL%%/POE/Filter/Grep.pm
+%%SITE_PERL%%/POE/Filter/HTTPD.pm
+%%SITE_PERL%%/POE/Filter/Line.pm
+%%SITE_PERL%%/POE/Filter/Map.pm
+%%SITE_PERL%%/POE/Filter/RecordBlock.pm
+%%SITE_PERL%%/POE/Filter/Reference.pm
+%%SITE_PERL%%/POE/Filter/Stackable.pm
+%%SITE_PERL%%/POE/Filter/Stream.pm
+%%SITE_PERL%%/POE/Kernel.pm
+%%SITE_PERL%%/POE/Kernel/Event.pm
+%%SITE_PERL%%/POE/Kernel/Gtk.pm
+%%SITE_PERL%%/POE/Kernel/Poll.pm
+%%SITE_PERL%%/POE/Kernel/Select.pm
+%%SITE_PERL%%/POE/Kernel/Tk.pm
+%%SITE_PERL%%/POE/Loop.pm
+%%SITE_PERL%%/POE/Loop/Event.pm
+%%SITE_PERL%%/POE/Loop/Gtk.pm
+%%SITE_PERL%%/POE/Loop/Poll.pm
+%%SITE_PERL%%/POE/Loop/Select.pm
+%%SITE_PERL%%/POE/Loop/Tk.pm
+%%SITE_PERL%%/POE/Macro/UseBytes.pm
+%%SITE_PERL%%/POE/NFA.pm
+%%SITE_PERL%%/POE/Pipe.pm
+%%SITE_PERL%%/POE/Pipe/OneWay.pm
+%%SITE_PERL%%/POE/Pipe/TwoWay.pm
+%%SITE_PERL%%/POE/Preprocessor.pm
+%%SITE_PERL%%/POE/Queue.pm
+%%SITE_PERL%%/POE/Queue/Array.pm
+%%SITE_PERL%%/POE/Session.pm
+%%SITE_PERL%%/POE/Wheel.pm
+%%SITE_PERL%%/POE/Wheel/Curses.pm
+%%SITE_PERL%%/POE/Wheel/FollowTail.pm
+%%SITE_PERL%%/POE/Wheel/ListenAccept.pm
+%%SITE_PERL%%/POE/Wheel/ReadLine.pm
+%%SITE_PERL%%/POE/Wheel/ReadWrite.pm
+%%SITE_PERL%%/POE/Wheel/Run.pm
+%%SITE_PERL%%/POE/Wheel/SocketFactory.pm
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@dirrm %%SITE_PERL%%/POE/Driver
+@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
+@dirrm %%SITE_PERL%%/POE/Kernel
+@dirrm %%SITE_PERL%%/POE/Loop
+@dirrm %%SITE_PERL%%/POE/Macro
+@dirrm %%SITE_PERL%%/POE/Pipe
+@dirrm %%SITE_PERL%%/POE/Queue
+@dirrm %%SITE_PERL%%/POE/Wheel
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
 %%PORTDOCS%%%%EXAMPLESDIR%%/create.perl
 %%PORTDOCS%%%%EXAMPLESDIR%%/fakelogin.perl
 %%PORTDOCS%%%%EXAMPLESDIR%%/filterchange.perl
@@ -66,14 +87,3 @@ lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel/SocketFactory.pm
 %%PORTDOCS%%%%EXAMPLESDIR%%/wheels.perl
 %%PORTDOCS%%%%EXAMPLESDIR%%/wheels2.perl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Server 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Driver
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Filter 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Kernel
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Macro
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Pipe
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/POE/Wheel
-@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