3 files changed, 17 insertions, 9 deletions

diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 9f5d0fa1f4fe..f2398f35a48e 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	HTML-Mason
-PORTVERSION=	1.28
-PORTREVISION=	2
+PORTVERSION=	1.31.0.1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-1.3101
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	High-performance, dynamic web site authoring system
@@ -24,14 +24,13 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
 
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--no-prompts
+PERL_MODBUILD=	yes
+CONFIGURE_ARGS+=	--noprompts
 
 MAN3=		Bundle::HTML::Mason.3 \
 		HTML::Mason.3 \
 		HTML::Mason::Admin.3 \
 		HTML::Mason::ApacheHandler.3 \
-		HTML::Mason::Buffer.3 \
 		HTML::Mason::Cache::BaseCache.3 \
 		HTML::Mason::CGIHandler.3 \
 		HTML::Mason::Compiler.3 \
@@ -49,6 +48,8 @@ MAN3=		Bundle::HTML::Mason.3 \
 		HTML::Mason::MethodMaker.3 \
 		HTML::Mason::Params.3 \
 		HTML::Mason::Parser.3 \
+		HTML::Mason::Plugin.3 \
+		HTML::Mason::Plugin::Context.3 \
 		HTML::Mason::Request.3 \
 		HTML::Mason::Resolver.3 \
 		HTML::Mason::Resolver::File.3 \
@@ -62,6 +63,10 @@ OPTIONS=	MOD_PERL "with mod_perl dependency" off
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500600
+IGNORE=		Port requires perl 5.6.0 or later. Install lang/perl5.8 and try again
+.endif
+
 .if defined(WITH_MOD_PERL)
 .if defined(WITH_APACHE2)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq2
diff --git a/www/p5-HTML-Mason/distinfo b/www/p5-HTML-Mason/distinfo
index 894660fbb75f..b5744fdcecce 100644
--- a/www/p5-HTML-Mason/distinfo
+++ b/www/p5-HTML-Mason/distinfo
@@ -1,2 +1,2 @@
-MD5 (HTML-Mason-1.28.tar.gz) = 9d6d47349e8afe67f25539395a931ea6
-SIZE (HTML-Mason-1.28.tar.gz) = 335604
+MD5 (HTML-Mason-1.3101.tar.gz) = 4904681296efeb9c58bf0d9926d37407
+SIZE (HTML-Mason-1.3101.tar.gz) = 386074
diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist
index 489aaffcd6a6..7664ac9edcf1 100644
--- a/www/p5-HTML-Mason/pkg-plist
+++ b/www/p5-HTML-Mason/pkg-plist
@@ -3,9 +3,8 @@
 %%SITE_PERL%%/HTML/Mason.pm
 %%SITE_PERL%%/HTML/Mason/Admin.pod
 %%SITE_PERL%%/HTML/Mason/ApacheHandler.pm
-%%SITE_PERL%%/HTML/Mason/Buffer.pm
-%%SITE_PERL%%/HTML/Mason/Cache/BaseCache.pm
 %%SITE_PERL%%/HTML/Mason/CGIHandler.pm
+%%SITE_PERL%%/HTML/Mason/Cache/BaseCache.pm
 %%SITE_PERL%%/HTML/Mason/Compiler.pm
 %%SITE_PERL%%/HTML/Mason/Compiler/ToObject.pm
 %%SITE_PERL%%/HTML/Mason/Component.pm
@@ -16,11 +15,14 @@
 %%SITE_PERL%%/HTML/Mason/Escapes.pm
 %%SITE_PERL%%/HTML/Mason/Exceptions.pm
 %%SITE_PERL%%/HTML/Mason/FakeApache.pm
+%%SITE_PERL%%/HTML/Mason/Handler.pm
 %%SITE_PERL%%/HTML/Mason/Interp.pm
 %%SITE_PERL%%/HTML/Mason/Lexer.pm
 %%SITE_PERL%%/HTML/Mason/MethodMaker.pm
 %%SITE_PERL%%/HTML/Mason/Params.pod
 %%SITE_PERL%%/HTML/Mason/Parser.pm
+%%SITE_PERL%%/HTML/Mason/Plugin.pm
+%%SITE_PERL%%/HTML/Mason/Plugin/Context.pm
 %%SITE_PERL%%/HTML/Mason/Request.pm
 %%SITE_PERL%%/HTML/Mason/Resolver.pm
 %%SITE_PERL%%/HTML/Mason/Resolver/File.pm
@@ -33,6 +35,7 @@
 @dirrm %%SITE_PERL%%/HTML/Mason/Cache
 @dirrm %%SITE_PERL%%/HTML/Mason/Compiler
 @dirrm %%SITE_PERL%%/HTML/Mason/Component
+@dirrm %%SITE_PERL%%/HTML/Mason/Plugin
 @dirrm %%SITE_PERL%%/HTML/Mason/Resolver
 @dirrm %%SITE_PERL%%/HTML/Mason
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason