- Update to 2.19

- Use CPAN :id subdir macro
- Add LICENSE
- Use TEST_DEPENDS for test-only dependencies
- Sort MAN3 and PLIST
- Change WWW to CPAN
- Adjust pkg-descr

Changes:	http://search.cpan.org/dist/Mason/Changes
PR:		ports/168758
Submitted by:	sunpoet (myself)
Approved by:	maintainer (timeout, 27 days)

4 files changed, 132 insertions, 125 deletions

diff --git a/www/p5-Mason/Makefile b/www/p5-Mason/Makefile
index 344f7f7a461f..888cc560175f 100644
--- a/www/p5-Mason/Makefile
+++ b/www/p5-Mason/Makefile
@@ -6,64 +6,71 @@
 #
 
 PORTNAME=	Mason
-PORTVERSION=	2.17
-CATEGORIES=	www perl5
-MASTER_SITES=	CPAN/../by-authors/id/J/JS/JSWARTZ
+PORTVERSION=	2.19
+CATEGORIES=	www textproc perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:JSWARTZ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	High-performance, dynamic web site authoring system
 
-BUILD_DEPENDS=	p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Unload>0:${PORTSDIR}/devel/p5-Class-Unload \
-		p5-Devel-GlobalDestruction>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Guard>1:${PORTSDIR}/devel/p5-Guard \
-		p5-IPC-System-Simple>1:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-JSON>2:${PORTSDIR}/converters/p5-JSON \
-		p5-Method-Signatures-Simple>1:${PORTSDIR}/devel/p5-Method-Signatures-Simple \
-		p5-Moose>2:${PORTSDIR}/devel/p5-Moose \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
+		p5-Class-Unload>=0:${PORTSDIR}/devel/p5-Class-Unload \
+		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
+		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
+		p5-Guard>=0:${PORTSDIR}/devel/p5-Guard \
+		p5-IPC-System-Simple>=0:${PORTSDIR}/devel/p5-IPC-System-Simple \
+		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
+		p5-Method-Signatures-Simple>=0:${PORTSDIR}/devel/p5-Method-Signatures-Simple \
+		p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
+		p5-MooseX-HasDefaults>=0.03:${PORTSDIR}/devel/p5-MooseX-HasDefaults \
 		p5-MooseX-StrictConstructor>=0.13:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-Exception-Class>1:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Log-Any>0:${PORTSDIR}/devel/p5-Log-Any \
-		p5-MooseX-HasDefaults>0:${PORTSDIR}/devel/p5-MooseX-HasDefaults \
-		p5-Test-Class-Most>0:${PORTSDIR}/devel/p5-Test-Class-Most \
-		p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString
+		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Class-Most>=0:${PORTSDIR}/devel/p5-Test-Class-Most \
+		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
 
 PERL_CONFIGURE=	yes
 
-MAN3=		Mason::Manual::Filters.3 \
-		Mason::Plugin::LvalueAttributes.3 \
-		Mason::Manual::RequestDispatch.3 \
-		Mason::PluginBundle::Default.3 \
+MAN1=		mason.pl.1
+MAN3=		Mason.3 \
+		Mason::App.3 \
+		Mason::CodeCache.3 \
+		Mason::Compilation.3 \
+		Mason::Component.3 \
 		Mason::Component::ClassMeta.3 \
+		Mason::Component::Import.3 \
+		Mason::Component::Moose.3 \
 		Mason::Exceptions.3 \
-		Mason::Manual::UpgradingFromMason1.3 \
-		Mason::Manual::Tutorial.3 \
-		Mason.3 \
-		Mason::PluginRole.3 \
-		Mason::Plugin::Defer.3 \
-		Mason::Component.3 \
+		Mason::Filters::Standard.3 \
+		Mason::Interp.3 \
+		Mason::Manual.3 \
 		Mason::Manual::Components.3 \
-		Mason::Manual::Syntax.3 \
-		Mason::Manual::FAQ.3 \
-		Mason::Plugin::DollarDot.3 \
-		Mason::Manual::Admin.3 \
 		Mason::Manual::Cookbook.3 \
+		Mason::Manual::FAQ.3 \
+		Mason::Manual::Filters.3 \
+		Mason::Manual::Intro.3 \
+		Mason::Manual::Plugins.3 \
+		Mason::Manual::RequestDispatch.3 \
+		Mason::Manual::Setup.3 \
+		Mason::Manual::Subclasses.3 \
+		Mason::Manual::Syntax.3 \
+		Mason::Manual::Tutorial.3 \
+		Mason::Manual::UpgradingFromMason1.3 \
 		Mason::Moose.3 \
-		Mason::Compilation.3 \
-		Mason::Component::Moose.3 \
 		Mason::Moose::Role.3 \
-		Mason::App.3 \
-		Mason::Result.3 \
-		Mason::Component::Import.3 \
-		Mason::Filters::Standard.3 \
+		Mason::Plugin::Defer.3 \
+		Mason::Plugin::DollarDot.3 \
+		Mason::Plugin::LvalueAttributes.3 \
 		Mason::Plugin::TidyObjectFiles.3 \
-		Mason::Manual.3 \
-		Mason::Manual::Intro.3 \
-		Mason::CodeCache.3 \
-		Mason::Manual::Subclasses.3 \
-		Mason::Interp.3 \
-		Mason::Manual::Plugins.3 \
-		Mason::Request.3
+		Mason::PluginBundle::Default.3 \
+		Mason::PluginRole.3 \
+		Mason::Request.3 \
+		Mason::Result.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-Mason/distinfo b/www/p5-Mason/distinfo
index 2d44554a7a43..d980beb0a818 100644
--- a/www/p5-Mason/distinfo
+++ b/www/p5-Mason/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mason-2.17.tar.gz) = e36403b5afc0263c4e7e4ea12a12749c3af862185f71a4afeccd6689ad836c4b
-SIZE (Mason-2.17.tar.gz) = 97087
+SHA256 (Mason-2.19.tar.gz) = 3da26205cfc9af84832ed6b1321f6047bf2692c76a4b00dcac985109e6670e9b
+SIZE (Mason-2.19.tar.gz) = 90747
diff --git a/www/p5-Mason/pkg-descr b/www/p5-Mason/pkg-descr
index 176c40118455..897109c7e584 100644
--- a/www/p5-Mason/pkg-descr
+++ b/www/p5-Mason/pkg-descr
@@ -1,13 +1,14 @@
 Mason is a powerful Perl-based templating system, designed to generate dynamic
- content of all kinds.
+content of all kinds.
 
 Unlike many templating systems, Mason does not attempt to invent an alternate,
 "easier" syntax for templates. It provides a set of syntax and features specific
 to template creation, but underneath it is still clearly and proudly
 recognizable as Perl.
 
-Mason is most often used for generating web pages. It can handle web requests
-directly via PSGI, or act as the view layer for a web framework such as
-Catalyst or Dancer.
+Mason is most often used for generating web pages. It has a companion web
+framework, Poet, designed to take maximum advantage of its routing and content
+generation features. It can also be used as the templating layer for web
+frameworks such as Catalyst and Dancer.
 
-WWW: https://github.com/jonswar/perl-mason
+WWW: http://search.cpan.org/dist/Mason/
diff --git a/www/p5-Mason/pkg-plist b/www/p5-Mason/pkg-plist
index 80ae96329de4..96fd2dbe381d 100644
--- a/www/p5-Mason/pkg-plist
+++ b/www/p5-Mason/pkg-plist
@@ -1,103 +1,102 @@
 bin/mason.pl
-man/man1/mason.pl.1
-%%SITE_PERL%%/mach/auto/Mason/.packlist
-%%SITE_PERL%%/Mason/PluginBundle/Default.pm
-%%SITE_PERL%%/Mason/Types.pm
+%%SITE_PERL%%/Mason.pm
 %%SITE_PERL%%/Mason/App.pm
+%%SITE_PERL%%/Mason/CodeCache.pm
+%%SITE_PERL%%/Mason/Compilation.pm
 %%SITE_PERL%%/Mason/Component.pm
-%%SITE_PERL%%/Mason/Manual/Filters.pod
+%%SITE_PERL%%/Mason/Component/ClassMeta.pm
+%%SITE_PERL%%/Mason/Component/Import.pm
+%%SITE_PERL%%/Mason/Component/Moose.pm
+%%SITE_PERL%%/Mason/DynamicFilter.pm
+%%SITE_PERL%%/Mason/Exceptions.pm
+%%SITE_PERL%%/Mason/Filters/Standard.pm
+%%SITE_PERL%%/Mason/Interp.pm
+%%SITE_PERL%%/Mason/Manual.pod
 %%SITE_PERL%%/Mason/Manual/Components.pod
-%%SITE_PERL%%/Mason/Manual/Syntax.pod
-%%SITE_PERL%%/Mason/Manual/UpgradingFromMason1.pod
+%%SITE_PERL%%/Mason/Manual/Cookbook.pod
 %%SITE_PERL%%/Mason/Manual/FAQ.pod
+%%SITE_PERL%%/Mason/Manual/Filters.pod
+%%SITE_PERL%%/Mason/Manual/Intro.pod
 %%SITE_PERL%%/Mason/Manual/Plugins.pod
-%%SITE_PERL%%/Mason/Manual/Tutorial.pod
-%%SITE_PERL%%/Mason/Manual/Cookbook.pod
 %%SITE_PERL%%/Mason/Manual/RequestDispatch.pod
+%%SITE_PERL%%/Mason/Manual/Setup.pod
 %%SITE_PERL%%/Mason/Manual/Subclasses.pod
-%%SITE_PERL%%/Mason/Manual/Intro.pod
-%%SITE_PERL%%/Mason/Manual/Admin.pod
-%%SITE_PERL%%/Mason/Exceptions.pm
-%%SITE_PERL%%/Mason/Component/Import.pm
-%%SITE_PERL%%/Mason/Component/ClassMeta.pm
-%%SITE_PERL%%/Mason/Component/Moose.pm
-%%SITE_PERL%%/Mason/PluginRole.pm
-%%SITE_PERL%%/Mason/Result.pm
-%%SITE_PERL%%/Mason/Util.pm
+%%SITE_PERL%%/Mason/Manual/Syntax.pod
+%%SITE_PERL%%/Mason/Manual/Tutorial.pod
+%%SITE_PERL%%/Mason/Manual/UpgradingFromMason1.pod
+%%SITE_PERL%%/Mason/Moose.pm
 %%SITE_PERL%%/Mason/Moose/Role.pm
-%%SITE_PERL%%/Mason/Filters/Standard.pm
+%%SITE_PERL%%/Mason/Plugin.pm
+%%SITE_PERL%%/Mason/Plugin/Defer.pm
 %%SITE_PERL%%/Mason/Plugin/Defer/Filters.pm
 %%SITE_PERL%%/Mason/Plugin/Defer/Request.pm
-%%SITE_PERL%%/Mason/Plugin/LvalueAttributes/Interp.pm
+%%SITE_PERL%%/Mason/Plugin/DollarDot.pm
 %%SITE_PERL%%/Mason/Plugin/DollarDot/Compilation.pm
-%%SITE_PERL%%/Mason/Plugin/Defer.pm
+%%SITE_PERL%%/Mason/Plugin/LvalueAttributes.pm
+%%SITE_PERL%%/Mason/Plugin/LvalueAttributes/Interp.pm
 %%SITE_PERL%%/Mason/Plugin/TidyObjectFiles.pm
-%%SITE_PERL%%/Mason/Plugin/DollarDot.pm
 %%SITE_PERL%%/Mason/Plugin/TidyObjectFiles/Interp.pm
-%%SITE_PERL%%/Mason/Plugin/LvalueAttributes.pm
-%%SITE_PERL%%/Mason/Request.pm
-%%SITE_PERL%%/Mason/CodeCache.pm
-%%SITE_PERL%%/Mason/Manual.pod
-%%SITE_PERL%%/Mason/Plugin.pm
-%%SITE_PERL%%/Mason/Compilation.pm
-%%SITE_PERL%%/Mason/TieHandle.pm
 %%SITE_PERL%%/Mason/PluginBundle.pm
+%%SITE_PERL%%/Mason/PluginBundle/Default.pm
+%%SITE_PERL%%/Mason/PluginManager.pm
+%%SITE_PERL%%/Mason/PluginRole.pm
+%%SITE_PERL%%/Mason/Request.pm
+%%SITE_PERL%%/Mason/Result.pm
+%%SITE_PERL%%/Mason/Test/Class.pm
 %%SITE_PERL%%/Mason/Test/Overrides/Component/StrictMoose.pm
-%%SITE_PERL%%/Mason/Test/RootClass/Compilation.pm
-%%SITE_PERL%%/Mason/Test/RootClass/Request.pm
-%%SITE_PERL%%/Mason/Test/RootClass/Component.pm
-%%SITE_PERL%%/Mason/Test/RootClass/Interp.pm
 %%SITE_PERL%%/Mason/Test/Plugins/Notify.pm
-%%SITE_PERL%%/Mason/Test/Plugins/Notify/Request.pm
 %%SITE_PERL%%/Mason/Test/Plugins/Notify/Compilation.pm
-%%SITE_PERL%%/Mason/Test/Plugins/Notify/Interp.pm
 %%SITE_PERL%%/Mason/Test/Plugins/Notify/Component.pm
+%%SITE_PERL%%/Mason/Test/Plugins/Notify/Interp.pm
+%%SITE_PERL%%/Mason/Test/Plugins/Notify/Request.pm
 %%SITE_PERL%%/Mason/Test/RootClass.pm
-%%SITE_PERL%%/Mason/Test/Class.pm
-%%SITE_PERL%%/Mason/t/ComponentMeta.pm
-%%SITE_PERL%%/Mason/t/Defer.pm
+%%SITE_PERL%%/Mason/Test/RootClass/Compilation.pm
+%%SITE_PERL%%/Mason/Test/RootClass/Component.pm
+%%SITE_PERL%%/Mason/Test/RootClass/Interp.pm
+%%SITE_PERL%%/Mason/Test/RootClass/Request.pm
+%%SITE_PERL%%/Mason/TieHandle.pm
+%%SITE_PERL%%/Mason/Types.pm
+%%SITE_PERL%%/Mason/Util.pm
 %%SITE_PERL%%/Mason/t/Autobase.pm
-%%SITE_PERL%%/Mason/t/ResolveURI.pm
-%%SITE_PERL%%/Mason/t/HTMLFilters.pm
-%%SITE_PERL%%/Mason/t/Util.pm
-%%SITE_PERL%%/Mason/t/StaticSource.pm
 %%SITE_PERL%%/Mason/t/Cache.pm
+%%SITE_PERL%%/Mason/t/CompCalls.pm
+%%SITE_PERL%%/Mason/t/Compilation.pm
+%%SITE_PERL%%/Mason/t/ComponentMeta.pm
+%%SITE_PERL%%/Mason/t/Defer.pm
+%%SITE_PERL%%/Mason/t/DollarDot.pm
 %%SITE_PERL%%/Mason/t/Errors.pm
-%%SITE_PERL%%/Mason/t/Sections.pm
-%%SITE_PERL%%/Mason/t/Reload.pm
+%%SITE_PERL%%/Mason/t/Filters.pm
+%%SITE_PERL%%/Mason/t/Globals.pm
+%%SITE_PERL%%/Mason/t/HTMLFilters.pm
+%%SITE_PERL%%/Mason/t/Interp.pm
+%%SITE_PERL%%/Mason/t/LvalueAttributes.pm
 %%SITE_PERL%%/Mason/t/Plugins.pm
-%%SITE_PERL%%/Mason/t/DollarDot.pm
+%%SITE_PERL%%/Mason/t/Reload.pm
+%%SITE_PERL%%/Mason/t/Request.pm
+%%SITE_PERL%%/Mason/t/ResolveURI.pm
 %%SITE_PERL%%/Mason/t/Sanity.pm
+%%SITE_PERL%%/Mason/t/Sections.pm
 %%SITE_PERL%%/Mason/t/Skel.pm
-%%SITE_PERL%%/Mason/t/Request.pm
-%%SITE_PERL%%/Mason/t/Filters.pm
-%%SITE_PERL%%/Mason/t/Interp.pm
-%%SITE_PERL%%/Mason/t/CompCalls.pm
-%%SITE_PERL%%/Mason/t/Compilation.pm
+%%SITE_PERL%%/Mason/t/StaticSource.pm
 %%SITE_PERL%%/Mason/t/Syntax.pm
-%%SITE_PERL%%/Mason/t/Globals.pm
-%%SITE_PERL%%/Mason/t/LvalueAttributes.pm
-%%SITE_PERL%%/Mason/Moose.pm
-%%SITE_PERL%%/Mason/PluginManager.pm
-%%SITE_PERL%%/Mason/DynamicFilter.pm
-%%SITE_PERL%%/Mason/Interp.pm
-%%SITE_PERL%%/Mason.pm
-@dirrm %%SITE_PERL%%/mach/auto/Mason
-@dirrm %%SITE_PERL%%/Mason/Test/RootClass
-@dirrm %%SITE_PERL%%/Mason/Test/Overrides/Component
-@dirrm %%SITE_PERL%%/Mason/Test/Overrides
-@dirrm %%SITE_PERL%%/Mason/Test/Plugins/Notify
-@dirrm %%SITE_PERL%%/Mason/Test/Plugins
-@dirrm %%SITE_PERL%%/Mason/Test
-@dirrm %%SITE_PERL%%/Mason/Filters
-@dirrm %%SITE_PERL%%/Mason/Moose
-@dirrm %%SITE_PERL%%/Mason/Component
-@dirrm %%SITE_PERL%%/Mason/PluginBundle
-@dirrm %%SITE_PERL%%/Mason/Plugin/Defer
-@dirrm %%SITE_PERL%%/Mason/Plugin/TidyObjectFiles
-@dirrm %%SITE_PERL%%/Mason/Plugin/DollarDot
-@dirrm %%SITE_PERL%%/Mason/Plugin/LvalueAttributes
-@dirrm %%SITE_PERL%%/Mason/Plugin
-@dirrm %%SITE_PERL%%/Mason/t
-@dirrm %%SITE_PERL%%/Mason/Manual
+%%SITE_PERL%%/Mason/t/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mason/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mason
+@dirrmtry %%SITE_PERL%%/Mason/t
+@dirrmtry %%SITE_PERL%%/Mason/Test/RootClass
+@dirrmtry %%SITE_PERL%%/Mason/Test/Plugins/Notify
+@dirrmtry %%SITE_PERL%%/Mason/Test/Plugins
+@dirrmtry %%SITE_PERL%%/Mason/Test/Overrides/Component
+@dirrmtry %%SITE_PERL%%/Mason/Test/Overrides
+@dirrmtry %%SITE_PERL%%/Mason/Test
+@dirrmtry %%SITE_PERL%%/Mason/PluginBundle
+@dirrmtry %%SITE_PERL%%/Mason/Plugin/TidyObjectFiles
+@dirrmtry %%SITE_PERL%%/Mason/Plugin/LvalueAttributes
+@dirrmtry %%SITE_PERL%%/Mason/Plugin/DollarDot
+@dirrmtry %%SITE_PERL%%/Mason/Plugin/Defer
+@dirrmtry %%SITE_PERL%%/Mason/Plugin
+@dirrmtry %%SITE_PERL%%/Mason/Moose
+@dirrmtry %%SITE_PERL%%/Mason/Manual
+@dirrmtry %%SITE_PERL%%/Mason/Filters
+@dirrmtry %%SITE_PERL%%/Mason/Component
 @dirrmtry %%SITE_PERL%%/Mason