- Upgrade to 6.10.

3 files changed, 83 insertions, 25 deletions

diff --git a/www/p5-Amon2/Makefile b/www/p5-Amon2/Makefile
index 1ca1dd26ef2b..a228449a8b40 100644
--- a/www/p5-Amon2/Makefile
+++ b/www/p5-Amon2/Makefile
@@ -1,27 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	Amon2
-PORTVERSION=	3.85
+PORTVERSION=	6.10
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
-COMMENT=	Perl extension for/to lightweight web application framework
+COMMENT=	Perl extension for lightweight web application framework
+
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
+	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
+	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
+	p5-HTML-FillInForm-Lite>0:${PORTSDIR}/www/p5-HTML-FillInForm-Lite \
+	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
+	p5-HTTP-Session2>0:${PORTSDIR}/www/p5-HTTP-Session2 \
+	p5-Hash-MultiValue>0:${PORTSDIR}/devel/p5-Hash-MultiValue \
+	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
+	p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
+	p5-Module-CPANfile>=0.9020:${PORTSDIR}/devel/p5-Module-CPANfile \
 	p5-Plack>=0.9982:${PORTSDIR}/www/p5-Plack \
 	p5-Plack-Middleware-Session>0:${PORTSDIR}/www/p5-Plack-Middleware-Session \
-	p5-Router-Simple>=0.14:${PORTSDIR}/www/p5-Router-Simple \
-	p5-Router-Simple-Sinatraish>=0.02:${PORTSDIR}/www/p5-Router-Simple-Sinatraish \
-	p5-Text-Xslate>=1.6001:${PORTSDIR}/textproc/p5-Text-Xslate \
+	p5-Router-Boom>=0.07:${PORTSDIR}/www/p5-Router-Boom \
+	p5-Text-Xslate>=2.0010:${PORTSDIR}/textproc/p5-Text-Xslate \
 	p5-Try-Tiny>=0.06:${PORTSDIR}/lang/p5-Try-Tiny \
 	p5-URI>=1.54:${PORTSDIR}/net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
-TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
 
 USES=	perl5
 USE_PERL5=	modbuild
+NO_ARCH=	YES
 
 .include <bsd.port.mk>
diff --git a/www/p5-Amon2/distinfo b/www/p5-Amon2/distinfo
index 64ae53b9bf30..0655124840dc 100644
--- a/www/p5-Amon2/distinfo
+++ b/www/p5-Amon2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Amon2-3.85.tar.gz) = 509fd9bcfc8510c30b1c36625ba15536e9aec043f95d221c2478bbf06e20d480
-SIZE (Amon2-3.85.tar.gz) = 207466
+SHA256 (Amon2-6.10.tar.gz) = 8bb2483052c836c5cf0383b4202e5b49024b19ee21815b71aac6b3eb115fd89d
+SIZE (Amon2-6.10.tar.gz) = 348881
diff --git a/www/p5-Amon2/pkg-plist b/www/p5-Amon2/pkg-plist
index d12cd30f1301..6777669eba93 100644
--- a/www/p5-Amon2/pkg-plist
+++ b/www/p5-Amon2/pkg-plist
@@ -2,9 +2,7 @@ bin/amon2-setup.pl
 %%PERL5_MAN3%%/Amon2.3.gz
 %%PERL5_MAN3%%/Amon2::Config::Simple.3.gz
 %%PERL5_MAN3%%/Amon2::Declare.3.gz
-%%PERL5_MAN3%%/Amon2::Plugin::Web::CSRFDefender.3.gz
 %%PERL5_MAN3%%/Amon2::Plugin::Web::FillInFormLite.3.gz
-%%PERL5_MAN3%%/Amon2::Plugin::Web::HTTPSession.3.gz
 %%PERL5_MAN3%%/Amon2::Plugin::Web::JSON.3.gz
 %%PERL5_MAN3%%/Amon2::Plugin::Web::NoCache.3.gz
 %%PERL5_MAN3%%/Amon2::Plugin::Web::PlackSession.3.gz
@@ -18,19 +16,21 @@ bin/amon2-setup.pl
 %%PERL5_MAN3%%/Amon2::Util.3.gz
 %%PERL5_MAN3%%/Amon2::Web.3.gz
 %%PERL5_MAN3%%/Amon2::Web::Dispatcher::Lite.3.gz
+%%PERL5_MAN3%%/Amon2::Web::Dispatcher::RouterBoom.3.gz
 %%PERL5_MAN3%%/Amon2::Web::Dispatcher::RouterSimple.3.gz
 %%PERL5_MAN3%%/Amon2::Web::Request.3.gz
 %%PERL5_MAN3%%/Amon2::Web::Response.3.gz
 %%PERL5_MAN3%%/Amon2::Web::Response::Callback.3.gz
 %%PERL5_MAN3%%/Amon2::Web::WebSocket.3.gz
+%%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Basic::lib::__PATH__.3.gz
+%%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Basic::lib::__PATH__::Web::Plugin::Session.3.gz
+%%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Minimum::lib::__PATH__.3.gz
 man/man1/amon2-setup.pl.1.gz
 %%SITE_PERL%%/Amon2.pm
 %%SITE_PERL%%/Amon2/Config/Simple.pm
 %%SITE_PERL%%/Amon2/ContextGuard.pm
 %%SITE_PERL%%/Amon2/Declare.pm
-%%SITE_PERL%%/Amon2/Plugin/Web/CSRFDefender.pm
 %%SITE_PERL%%/Amon2/Plugin/Web/FillInFormLite.pm
-%%SITE_PERL%%/Amon2/Plugin/Web/HTTPSession.pm
 %%SITE_PERL%%/Amon2/Plugin/Web/JSON.pm
 %%SITE_PERL%%/Amon2/Plugin/Web/NoCache.pm
 %%SITE_PERL%%/Amon2/Plugin/Web/PlackSession.pm
@@ -39,12 +39,13 @@ man/man1/amon2-setup.pl.1.gz
 %%SITE_PERL%%/Amon2/Setup/Asset/Blueprint.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/Bootstrap.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/ES5Shim.pm
+%%SITE_PERL%%/Amon2/Setup/Asset/MicroDispatcherJS.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/MicroLocationJS.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/MicroTemplateJS.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/SprintfJS.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/StrftimeJS.pm
+%%SITE_PERL%%/Amon2/Setup/Asset/XSRFTokenJS.pm
 %%SITE_PERL%%/Amon2/Setup/Asset/jQuery.pm
-%%SITE_PERL%%/Amon2/Setup/Asset/MicroDispatcherJS.pm
 %%SITE_PERL%%/Amon2/Setup/Flavor.pm
 %%SITE_PERL%%/Amon2/Setup/Flavor/Basic.pm
 %%SITE_PERL%%/Amon2/Setup/Flavor/Large.pm
@@ -54,19 +55,66 @@ man/man1/amon2-setup.pl.1.gz
 %%SITE_PERL%%/Amon2/Util.pm
 %%SITE_PERL%%/Amon2/Web.pm
 %%SITE_PERL%%/Amon2/Web/Dispatcher/Lite.pm
+%%SITE_PERL%%/Amon2/Web/Dispatcher/RouterBoom.pm
 %%SITE_PERL%%/Amon2/Web/Dispatcher/RouterSimple.pm
 %%SITE_PERL%%/Amon2/Web/Request.pm
 %%SITE_PERL%%/Amon2/Web/Response.pm
 %%SITE_PERL%%/Amon2/Web/Response/Callback.pm
 %%SITE_PERL%%/Amon2/Web/WebSocket.pm
-@dirrm %%SITE_PERL%%/Amon2/Web/Response
-@dirrm %%SITE_PERL%%/Amon2/Web/Dispatcher
-@dirrm %%SITE_PERL%%/Amon2/Web
-@dirrm %%SITE_PERL%%/Amon2/Setup/VC
-@dirrm %%SITE_PERL%%/Amon2/Setup/Flavor
-@dirrm %%SITE_PERL%%/Amon2/Setup/Asset
-@dirrm %%SITE_PERL%%/Amon2/Setup
-@dirrm %%SITE_PERL%%/Amon2/Plugin/Web
-@dirrm %%SITE_PERL%%/Amon2/Plugin
-@dirrm %%SITE_PERL%%/Amon2/Config
-@dirrm %%SITE_PERL%%/Amon2
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/config/__ENV__.pl
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/db/dot.gitignore
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/dot.gitignore
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/dot.proverc
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/DB.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/DB/Row.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/DB/Schema.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/Web.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/Web/Dispatcher.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/lib/__PATH__/Web/Plugin/Session.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/script/server.pl
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/sql/mysql.sql
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/sql/sqlite.sql
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/static/__STATUS__.html
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/static/css/main.css
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/static/js/main.js
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/t/00_compile.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/t/03_assets.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/t/06_jshint.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/t/Util.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/tmpl/include/layout.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/tmpl/include/pager.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/tmpl/index.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Basic/xt/02_perlcritic.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/lib/__PATH__/Web/C/Account.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/lib/__PATH__/__MONIKER__.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/lib/__PATH__/__MONIKER__/C/Root.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/lib/__PATH__/__MONIKER__/Dispatcher.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/lib/__PATH__/__MONIKER__/ViewFunctions.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/script/admin.pl
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/script/web.pl
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/sql/mysql.sql
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/sql/sqlite.sql
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/static/admin/css/admin.css
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/t/00_compile.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/t/04_admin.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/t/07_mech_links.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/tmpl/admin/error.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/tmpl/admin/include/layout.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/tmpl/admin/include/sidebar.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/tmpl/admin/index.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Large/tmpl/web/error.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/Build.PL
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/builder/MyBuilder.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/lib/__PATH__.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/lib/__PATH__/Web.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/lib/__PATH__/Web/View.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/lib/__PATH__/Web/ViewFunctions.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/minil.toml
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/script/server.pl
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/t/00_compile.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/t/01_root.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/t/02_mech.t
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/t/Util.pm
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/tmpl/index.tx
+%%SITE_PERL%%/auto/share/dist/Amon2/flavor/Minimum/xt/01_pod.t