3 files changed, 57 insertions, 75 deletions

diff --git a/www/p5-HTML-FormHandler/Makefile b/www/p5-HTML-FormHandler/Makefile
index 57aecf5e9bb6..65d67ef78368 100644
--- a/www/p5-HTML-FormHandler/Makefile
+++ b/www/p5-HTML-FormHandler/Makefile
@@ -5,7 +5,7 @@
 # Generated with portupload. Do not edit directly, please
 
 PORTNAME=	HTML-FormHandler
-PORTVERSION=	0.30
+PORTVERSION=	0.31002
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
@@ -16,85 +16,57 @@ COMMENT=	Form handler written in Moose
 
 BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
 		p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Class-Load>=0.05:${PORTSDIR}/devel/p5-Class-Load \
 		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
+		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-MooseX-Traits>=0:${PORTSDIR}/devel/p5-MooseX-Traits \
 		p5-MooseX-Getopt>=0.16:${PORTSDIR}/devel/p5-MooseX-Getopt \
 		p5-MooseX-Types>=0.20:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
 		p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	5.8.0+
-MAN3=	HTML::FormHandler.3 \
-    HTML::FormHandler::BuildFields.3 \
-    HTML::FormHandler::Field.3 \
-    HTML::FormHandler::TraitFor::I18N.3 \
-    HTML::FormHandler::Render::WithTT.3 \
-    HTML::FormHandler::Field::NoValue.3 \
-    HTML::FormHandler::Field::Boolean.3 \
-    HTML::FormHandler::Field::Checkbox.3 \
-    HTML::FormHandler::Field::Compound.3 \
-    HTML::FormHandler::Field::Date.3 \
-    HTML::FormHandler::Field::DateMDY.3 \
-    HTML::FormHandler::Field::DateTime.3 \
-    HTML::FormHandler::Field::Display.3 \
-    HTML::FormHandler::Field::Duration.3 \
-    HTML::FormHandler::Field::Email.3 \
-    HTML::FormHandler::Field::Hidden.3 \
-    HTML::FormHandler::Field::Hour.3 \
-    HTML::FormHandler::Field::HtmlArea.3 \
-    HTML::FormHandler::Field::IntRange.3 \
-    HTML::FormHandler::Field::Integer.3 \
-    HTML::FormHandler::Field::Minute.3 \
-    HTML::FormHandler::Field::Money.3 \
-    HTML::FormHandler::Field::Month.3 \
-    HTML::FormHandler::Field::MonthDay.3 \
-    HTML::FormHandler::Field::MonthName.3 \
-    HTML::FormHandler::Field::Multiple.3 \
-    HTML::FormHandler::Field::Nested.3 \
-    HTML::FormHandler::Field::Password.3 \
-    HTML::FormHandler::Field::PasswordConf.3 \
-    HTML::FormHandler::Field::PosInteger.3 \
-    HTML::FormHandler::Field::PrimaryKey.3 \
-    HTML::FormHandler::Field::Radio.3 \
-    HTML::FormHandler::Field::Repeatable.3 \
-    HTML::FormHandler::Field::Repeatable::Instance.3 \
-    HTML::FormHandler::Field::Reset.3 \
-    HTML::FormHandler::Field::Result.3 \
-    HTML::FormHandler::Field::Second.3 \
-    HTML::FormHandler::Field::Select.3 \
-    HTML::FormHandler::Field::Submit.3 \
-    HTML::FormHandler::Field::Text.3 \
-    HTML::FormHandler::Field::TextArea.3 \
-    HTML::FormHandler::Field::Upload.3 \
-    HTML::FormHandler::Field::Weekday.3 \
-    HTML::FormHandler::Field::Year.3 \
-    HTML::FormHandler::Fields.3 \
-    HTML::FormHandler::InitResult.3 \
-    HTML::FormHandler::Manual.3 \
-    HTML::FormHandler::Manual::Catalyst.3 \
-    HTML::FormHandler::Manual::Cookbook.3 \
-    HTML::FormHandler::Manual::Intro.3 \
-    HTML::FormHandler::Manual::Reference.3 \
-    HTML::FormHandler::Manual::Rendering.3 \
-    HTML::FormHandler::Manual::Templates.3 \
-    HTML::FormHandler::Manual::Tutorial.3 \
-    HTML::FormHandler::Meta::Role.3 \
-    HTML::FormHandler::Model.3 \
-    HTML::FormHandler::Model::CDBI.3 \
-    HTML::FormHandler::Moose.3 \
-    HTML::FormHandler::Moose::Role.3 \
-    HTML::FormHandler::Render::Simple.3 \
-    HTML::FormHandler::Render::Table.3 \
-    HTML::FormHandler::Result.3 \
-    HTML::FormHandler::Result::Role.3 \
-    HTML::FormHandler::Types.3 \
-    HTML::FormHandler::Validate.3 \
-    HTML::FormHandler::Validate::Actions.3 \
-    HTML::FormHandler::Widget::Form::Simple.3 \
-    HTML::FormHandler::Widget::Form::Table.3 \
-    HTML::FormHandler::Widget::Wrapper::Simple.3
+MAN3=	HTML::FormHandler.3 HTML::FormHandler::BuildFields.3 \
+	HTML::FormHandler::Field.3 HTML::FormHandler::TraitFor::I18N.3 \
+	HTML::FormHandler::Render::WithTT.3 HTML::FormHandler::Field::NoValue.3 \
+	HTML::FormHandler::Field::Boolean.3 HTML::FormHandler::Field::Checkbox.3 \
+	HTML::FormHandler::Field::Compound.3 HTML::FormHandler::Field::Date.3 \
+	HTML::FormHandler::Field::DateMDY.3 HTML::FormHandler::Field::DateTime.3 \
+	HTML::FormHandler::Field::Display.3 HTML::FormHandler::Field::Duration.3 \
+	HTML::FormHandler::Field::Email.3 HTML::FormHandler::Field::Hidden.3 \
+	HTML::FormHandler::Field::Hour.3 HTML::FormHandler::Field::HtmlArea.3 \
+	HTML::FormHandler::Field::IntRange.3 HTML::FormHandler::Field::Integer.3 \
+	HTML::FormHandler::Field::Minute.3 HTML::FormHandler::Field::Money.3 \
+	HTML::FormHandler::Field::Month.3 HTML::FormHandler::Field::MonthDay.3 \
+	HTML::FormHandler::Field::MonthName.3 HTML::FormHandler::Field::Multiple.3 \
+	HTML::FormHandler::Field::Nested.3 HTML::FormHandler::Field::Password.3 \
+	HTML::FormHandler::Field::PasswordConf.3 HTML::FormHandler::Field::PosInteger.3 \
+	HTML::FormHandler::Field::PrimaryKey.3 HTML::FormHandler::Field::Radio.3 \
+	HTML::FormHandler::Field::Repeatable.3 \
+	HTML::FormHandler::Field::Repeatable::Instance.3 \
+	HTML::FormHandler::Field::Reset.3 \
+	HTML::FormHandler::Field::Result.3 \
+	HTML::FormHandler::Field::Second.3 HTML::FormHandler::Field::Select.3 \
+	HTML::FormHandler::Field::Submit.3 HTML::FormHandler::Field::Text.3 \
+	HTML::FormHandler::Field::TextArea.3 HTML::FormHandler::Field::Upload.3 \
+	HTML::FormHandler::Field::Weekday.3 HTML::FormHandler::Field::Year.3 \
+	HTML::FormHandler::Fields.3 HTML::FormHandler::InitResult.3 \
+	HTML::FormHandler::Manual.3 HTML::FormHandler::Manual::Catalyst.3 \
+	HTML::FormHandler::Manual::Cookbook.3 HTML::FormHandler::Manual::Intro.3 \
+	HTML::FormHandler::Manual::Reference.3 \
+	HTML::FormHandler::Manual::Rendering.3 \
+	HTML::FormHandler::Manual::Templates.3 \
+	HTML::FormHandler::Manual::Tutorial.3 HTML::FormHandler::Meta::Role.3 \
+	HTML::FormHandler::Model.3 HTML::FormHandler::Model::CDBI.3 \
+	HTML::FormHandler::Moose.3 HTML::FormHandler::Field::Captcha.3 \
+	HTML::FormHandler::Moose::Role.3 HTML::FormHandler::Render::Simple.3 \
+	HTML::FormHandler::Render::Table.3 HTML::FormHandler::Result.3 \
+	HTML::FormHandler::Result::Role.3 HTML::FormHandler::Types.3 \
+	HTML::FormHandler::Validate.3 HTML::FormHandler::Validate::Actions.3 \
+	HTML::FormHandler::Widget::Form::Simple.3 \
+	HTML::FormHandler::Widget::Form::Table.3 \
+	HTML::FormHandler::Widget::Wrapper::Simple.3 \
+	HTML::FormHandler::TraitFor::Captcha.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-FormHandler/distinfo b/www/p5-HTML-FormHandler/distinfo
index ac061ed91d93..5874f47ced1a 100644
--- a/www/p5-HTML-FormHandler/distinfo
+++ b/www/p5-HTML-FormHandler/distinfo
@@ -1,3 +1,3 @@
-MD5 (HTML-FormHandler-0.30.tar.gz) = 799c42460bd1264e6014c471282486ef
-SHA256 (HTML-FormHandler-0.30.tar.gz) = a218cd99aa14902f27423c63e16a5ca6dd1e015aa6424d690ced7642dbb613bb
-SIZE (HTML-FormHandler-0.30.tar.gz) = 141817
+MD5 (HTML-FormHandler-0.31002.tar.gz) = ac24292c9e79f6ec58ae1b41e529a6c9
+SHA256 (HTML-FormHandler-0.31002.tar.gz) = 0906d8a546eef4e120f315f1c22f5be5a21a8d5acd6ac18e00794794b33b92a8
+SIZE (HTML-FormHandler-0.31002.tar.gz) = 154072
diff --git a/www/p5-HTML-FormHandler/pkg-plist b/www/p5-HTML-FormHandler/pkg-plist
index 3973ae0bb43a..39e9bfbd20fa 100644
--- a/www/p5-HTML-FormHandler/pkg-plist
+++ b/www/p5-HTML-FormHandler/pkg-plist
@@ -19,6 +19,7 @@
 %%SITE_PERL%%/HTML/FormHandler/Field.pm
 %%SITE_PERL%%/HTML/FormHandler/Field/Boolean.pm
 %%SITE_PERL%%/HTML/FormHandler/Field/Checkbox.pm
+%%SITE_PERL%%/HTML/FormHandler/Field/Captcha.pm
 %%SITE_PERL%%/HTML/FormHandler/Field/Compound.pm
 %%SITE_PERL%%/HTML/FormHandler/Field/Date.pm
 %%SITE_PERL%%/HTML/FormHandler/Field/NoValue.pm
@@ -61,6 +62,9 @@
 %%SITE_PERL%%/HTML/FormHandler/I18N/en_us.pm
 %%SITE_PERL%%/HTML/FormHandler/I18N/de_de.pm
 %%SITE_PERL%%/HTML/FormHandler/I18N/tr_tr.pm
+%%SITE_PERL%%/HTML/FormHandler/I18N/ua_ua.pm
+%%SITE_PERL%%/HTML/FormHandler/I18N/ru_ru.pm
+%%SITE_PERL%%/HTML/FormHandler/I18N/hu_hu.pm
 %%SITE_PERL%%/HTML/FormHandler/InitResult.pm
 %%SITE_PERL%%/HTML/FormHandler/Manual.pod
 %%SITE_PERL%%/HTML/FormHandler/Manual/Catalyst.pod
@@ -85,6 +89,7 @@
 %%SITE_PERL%%/HTML/FormHandler/Types.pm
 %%SITE_PERL%%/HTML/FormHandler/Validate.pm
 %%SITE_PERL%%/HTML/FormHandler/TraitFor/I18N.pm
+%%SITE_PERL%%/HTML/FormHandler/TraitFor/Captcha.pm
 %%SITE_PERL%%/HTML/FormHandler/Validate/Actions.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/ApplyRole.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Field/Checkbox.pm
@@ -102,12 +107,15 @@
 %%SITE_PERL%%/HTML/FormHandler/Widget/Field/Upload.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Form/Simple.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Form/Table.pm
+%%SITE_PERL%%/HTML/FormHandler/Widget/Field/Role/HTMLAttributes.pm
+%%SITE_PERL%%/HTML/FormHandler/Widget/Field/Role/SelectedOption.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper/Base.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper/None.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper/Simple.pm
 %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper/Table.pm
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Wrapper
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Form
+@dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Field/Role
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget/Field
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler/Widget
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler/Validate
@@ -125,4 +133,6 @@
 @dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler/templates
 @dirrmtry %%SITE_PERL%%/auto/share/dist/HTML-FormHandler
 @dirrmtry %%SITE_PERL%%/HTML/FormHandler
+@dirrmtry %%SITE_PERL%%/HTML
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FormHandler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML