3 files changed, 25 insertions, 16 deletions

diff --git a/www/p5-Squatting/Makefile b/www/p5-Squatting/Makefile
index 1900ffb069ed..19832ea763d5 100644
--- a/www/p5-Squatting/Makefile
+++ b/www/p5-Squatting/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Squatting
-PORTVERSION=	0.70
+PORTVERSION=	0.81
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEPPU
@@ -15,32 +15,38 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A Camping-inspired Web Microframework for Perl
 
-BUILD_DEPENDS=	p5-Continuity>=0.991:${PORTSDIR}/www/p5-Continuity \
+COMMON_DEPENDS=	p5-Continuity>=0.991:${PORTSDIR}/www/p5-Continuity \
 		p5-Class-C3-Componentised>0:${PORTSDIR}/devel/p5-Class-C3-Componentised \
 		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
 		p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
 		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
 		p5-Shell-Perl>0:${PORTSDIR}/shells/p5-Shell-Perl \
 		p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
+		p5-HTTP-Daemon>0:${PORTSDIR}/www/p5-HTTP-Daemon \
+		p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message
+BUILD_DEPENDS=	${COMMON_DEPENDS}
+RUN_DEPENDS=	${COMMON_DEPENDS}
 
-PERL_CONFIGURE=	5.8.0+
+PERL_CONFIGURE=	yes
 
 MAN1=	squatting.1
-MAN3=	Squatting.3 \
+MAN3=	\
+	Squatting.3 \
 	Squatting::Controller.3 \
-	Squatting::Cookbook.3 \
 	Squatting::H.3 \
 	Squatting::Mapper.3 \
-	Squatting::On::Catalyst.3 \
 	Squatting::On::CGI.3 \
+	Squatting::On::Catalyst.3 \
 	Squatting::On::Continuity.3 \
 	Squatting::On::MP13.3 \
 	Squatting::On::MP20.3 \
 	Squatting::View.3 \
 	Squatting::With::AccessTrace.3 \
 	Squatting::With::Coro::Debug.3 \
-	Squatting::With::Log.3
+	Squatting::With::Log.3 \
+	Squatting::With::MockRequest.3 \
+	Squatting::With::Mount.3 \
+	Squatting::With::PerHostConfig.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-Squatting/distinfo b/www/p5-Squatting/distinfo
index 48f761425c6f..31bb6e5df476 100644
--- a/www/p5-Squatting/distinfo
+++ b/www/p5-Squatting/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Squatting-0.70.tar.gz) = d3739e004cffbd157a174435a77248e37451a05ecbdf6b5fb8e139535103fd91
-SIZE (Squatting-0.70.tar.gz) = 114840
+SHA256 (Squatting-0.81.tar.gz) = 034e4eaa42911fb0278e03f2fc690743696ba6ef00b54fcfd482139201a284e6
+SIZE (Squatting-0.81.tar.gz) = 109322
diff --git a/www/p5-Squatting/pkg-plist b/www/p5-Squatting/pkg-plist
index aa44246273bb..d0c8676a89cb 100644
--- a/www/p5-Squatting/pkg-plist
+++ b/www/p5-Squatting/pkg-plist
@@ -1,22 +1,25 @@
 bin/squatting
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/.packlist
 %%SITE_PERL%%/Squatting.pm
 %%SITE_PERL%%/Squatting/Controller.pm
-%%SITE_PERL%%/Squatting/Cookbook.pod
 %%SITE_PERL%%/Squatting/H.pm
 %%SITE_PERL%%/Squatting/Mapper.pm
-%%SITE_PERL%%/Squatting/On/Catalyst.pm
 %%SITE_PERL%%/Squatting/On/CGI.pm
+%%SITE_PERL%%/Squatting/On/Catalyst.pm
 %%SITE_PERL%%/Squatting/On/Continuity.pm
 %%SITE_PERL%%/Squatting/On/MP13.pm
 %%SITE_PERL%%/Squatting/On/MP20.pm
+%%SITE_PERL%%/Squatting/On/Squatting.pm
 %%SITE_PERL%%/Squatting/View.pm
 %%SITE_PERL%%/Squatting/With/AccessTrace.pm
 %%SITE_PERL%%/Squatting/With/Coro/Debug.pm
 %%SITE_PERL%%/Squatting/With/Log.pm
+%%SITE_PERL%%/Squatting/With/MockRequest.pm
+%%SITE_PERL%%/Squatting/With/Mount.pm
+%%SITE_PERL%%/Squatting/With/PerHostConfig.pm
 %%SITE_PERL%%/squatting.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting
-@dirrmtry %%SITE_PERL%%/Squatting/On
 @dirrmtry %%SITE_PERL%%/Squatting/With/Coro
 @dirrmtry %%SITE_PERL%%/Squatting/With
+@dirrmtry %%SITE_PERL%%/Squatting/On
 @dirrmtry %%SITE_PERL%%/Squatting
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Squatting