3 files changed, 28 insertions, 25 deletions

diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 0dad9b4c0c16..e82bdbf3997d 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	HTML-Mason
-PORTVERSION=	1.05
+PORTVERSION=	1.11
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
@@ -14,8 +14,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dsh@vlink.ru
 
-BUILD_DEPENDS=	${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
-		${SITE_PERL}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
+		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
+		${SITE_PERL}/Class/Container.pm:${PORTSDIR}/devel/p5-Class-Container
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -24,10 +26,16 @@ SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 MAN3=		Bundle::HTML::Mason.3 HTML::Mason.3 HTML::Mason::Admin.3 \
-		HTML::Mason::ApacheHandler.3 HTML::Mason::Commands.3 \
-		HTML::Mason::Component.3 HTML::Mason::Components.3 \
-		HTML::Mason::Devel.3 HTML::Mason::Interp.3 \
-		HTML::Mason::MethodMaker.3 HTML::Mason::Parser.3 \
-		HTML::Mason::Request.3 HTML::Mason::Tests.3
+		HTML::Mason::ApacheHandler.3 HTML::Mason::Buffer.3 \
+		HTML::Mason::CGIHandler.3 HTML::Mason::Compiler.3 \
+		HTML::Mason::Compiler::ToObject.3 HTML::Mason::Component.3 \
+		HTML::Mason::ComponentSource.3 HTML::Mason::Devel.3 \
+		HTML::Mason::Exceptions.3 HTML::Mason::Interp.3 \
+		HTML::Mason::Lexer.3 HTML::Mason::MethodMaker.3 \
+		HTML::Mason::Params.3 HTML::Mason::Parser.3 \
+		HTML::Mason::Request.3 HTML::Mason::Resolver.3 \
+		HTML::Mason::Resolver::File.3 HTML::Mason::Resolver::Null.3 \
+		HTML::Mason::Subclassing.3 HTML::Mason::Tests.3 \
+		HTML::Mason::Tools.3 HTML::Mason::Utils.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Mason/distinfo b/www/p5-HTML-Mason/distinfo
index 65818b821866..fb6710f8c261 100644
--- a/www/p5-HTML-Mason/distinfo
+++ b/www/p5-HTML-Mason/distinfo
@@ -1 +1 @@
-MD5 (HTML-Mason-1.05.tar.gz) = 9a523dba9ebc376295425768f3e41f1a
+MD5 (HTML-Mason-1.11.tar.gz) = aa690f4dd833036c3f57c94a122f2c29
diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist
index b3abdca881f6..e027b8bc3763 100644
--- a/www/p5-HTML-Mason/pkg-plist
+++ b/www/p5-HTML-Mason/pkg-plist
@@ -1,36 +1,31 @@
 lib/perl5/site_perl/%%PERL_VER%%/Apache/Mason.pm
 lib/perl5/site_perl/%%PERL_VER%%/Bundle/HTML/Mason.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Admin.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/ApacheHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/ApacheHandler.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Commands.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Commands.pod
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Buffer.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/CGIHandler.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Compiler.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Compiler/ToObject.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component/FileBased.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component/Subcomponent.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Components.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/ComponentSource.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Devel.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Error.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/FakeApache.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Exceptions.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Interp.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Interp.pod
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Lexer.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/MethodMaker.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Params.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Parser.pod
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Preview.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Request.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Resolver.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Resolver/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Resolver/Null.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Subclassing.pod
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Tests.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Tools.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Mason/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Mason
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Compiler
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Resolver
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason