4 files changed, 19 insertions, 31 deletions

diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
index 03d3f4c6d239..de344b7c2954 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/Makefile
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	POE-Component-Server-SimpleHTTP
-PORTVERSION=	1.58
+PORTVERSION=	2.0
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,20 +14,21 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl extension to serve HTTP requests in POE
 
-RUN_DEPENDS=	p5-Storable>0:${PORTSDIR}/devel/p5-Storable \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		p5-POE>=1.0000:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	p5-Moose>=0.81:${PORTSDIR}/devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-POE>=0.205:${PORTSDIR}/devel/p5-MooseX-POE \
+		p5-POE>=1.0000:${PORTSDIR}/devel/p5-POE \
+		p5-Storable>0:${PORTSDIR}/devel/p5-Storable \
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::Server::SimpleHTTP.3 \
 		POE::Component::Server::SimpleHTTP::Connection.3 \
-		POE::Component::Server::SimpleHTTP::PreFork.3 \
 		POE::Component::Server::SimpleHTTP::Response.3
 
 OPTIONS=	SSL "SSL support (POE::Component::SSLify)" on \
-		PREFORK "PreFork support (IRC::Shareable)" on
 
 .include <bsd.port.pre.mk>
 
@@ -35,8 +36,4 @@ OPTIONS=	SSL "SSL support (POE::Component::SSLify)" on \
 BUILD_DEPENDS+=	p5-POE-Component-SSLify>=0.04:${PORTSDIR}/security/p5-POE-Component-SSLify
 .endif
 
-.ifdef(WITH_PREFORK)
-BUILD_DEPENDS+=	p5-IPC-Shareable>0:${PORTSDIR}/devel/p5-IPC-Shareable
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/distinfo b/www/p5-POE-Component-Server-SimpleHTTP/distinfo
index 3019a04bf8e8..4b91ea214078 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/distinfo
+++ b/www/p5-POE-Component-Server-SimpleHTTP/distinfo
@@ -1,3 +1,3 @@
-MD5 (POE-Component-Server-SimpleHTTP-1.58.tar.gz) = 9c252b837cf11fb1ae23bcc052deba9e
-SHA256 (POE-Component-Server-SimpleHTTP-1.58.tar.gz) = d93a9b8e2c789052b954faa86cd85ddc27bd436d28a7aa120b6800142cbf3aed
-SIZE (POE-Component-Server-SimpleHTTP-1.58.tar.gz) = 51842
+MD5 (POE-Component-Server-SimpleHTTP-2.0.tar.gz) = 8c711a208427e6d556aa7e082858f455
+SHA256 (POE-Component-Server-SimpleHTTP-2.0.tar.gz) = 1bb5e8f27daef7122e26ec8151ffae3cded5dd21f41d9809d65f31051c900a58
+SIZE (POE-Component-Server-SimpleHTTP-2.0.tar.gz) = 56736
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL b/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL
index 7a433b8101f3..9faa24067da2 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL
+++ b/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL
@@ -1,8 +1,8 @@
---- ./Makefile.PL.orig	2009-03-17 10:45:12.000000000 +0100
-+++ ./Makefile.PL	2009-03-17 10:46:05.000000000 +0100
-@@ -20,28 +20,6 @@ requires    'Socket'           =>    0;
- requires    'HTTP::Request'    =>    0;
- requires    'HTTP::Response'   =>    0;
+--- ./Makefile.PL.orig	2009-09-08 10:45:38.000000000 +0200
++++ ./Makefile.PL	2009-09-08 10:46:38.000000000 +0200
+@@ -24,19 +24,6 @@ requires    'Moose'	       =>    0.81;
+ requires    'MooseX::AttributeHelpers' => 0;
+ requires    'MooseX::POE'      =>    0.205;
  
 -build_requires   'Test::More'                   => 0.47;
 -build_requires	 'POE::Filter::HTTP::Parser'	=> 0.02;
@@ -17,15 +17,6 @@
 -# Add to the prereqs PoCo::SSLify?
 -requires 'POE::Component::SSLify' => '0.04' if $value =~ /^Y$/i;
 -
--# Ask users if they want PreFork support
--$value = prompt( 'Do you want PreFork support ( requires IPC::Shareable ) [y/N]?', 'N' );
--
--# Add to the prereqs IPC::Shareable?
--if ( $value =~ /^Y$/i ) {
--   requires 'IPC::Shareable' => '0';
--   build_requires   'POE::Component::Client::HTTP' => 0.82;
--}
--
- # Sanity check
- eval { require IPC::Shareable; };
- build_requires 'POE::Component::Client::HTTP' => 0.82 unless $@;
+ # Thanks to Matt Trout for this tip
+ #makemaker_args(dist => { PREOP => "$^X ./tools/svn-log.perl > ./Changes" });
+ makemaker_args(dist => { PREOP => "git --no-pager log --tags > ./Changes" });
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
index c82ca1d50391..5cc7e9ff9ac0 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
+++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP.pm
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Connection.pm
-%%SITE_PERL%%/POE/Component/Server/SimpleHTTP/PreFork.pm
 %%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Response.pm
+%%SITE_PERL%%/POE/Component/Server/SimpleHTTP/State.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP
 @dirrm %%SITE_PERL%%/POE/Component/Server/SimpleHTTP