diff --git a/www/p5-HTML-Widget/Makefile b/www/p5-HTML-Widget/Makefile
index 6e78608d1671..f54aaa706111 100644
--- a/www/p5-HTML-Widget/Makefile
+++ b/www/p5-HTML-Widget/Makefile
@@ -1,88 +1,94 @@
 # New ports collection makefile for:	www/p5-HTML-Widget
 # Date created:				Jan 11 2006
 # Whom:					Lars Balker Rasmussen <lbr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	HTML-Widget
-PORTVERSION=	1.08
+PORTVERSION=	1.10
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/C/CF/CFRANKS
+MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	HTML Widget And Validation Framework
 
 RUN_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
 		p5-Class-Data-Accessor>=0:${PORTSDIR}/devel/p5-Class-Data-Accessor \
 		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-Module-Pluggable-Fast>=0:${PORTSDIR}/devel/p5-Module-Pluggable-Fast \
 		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
 		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	HTML::Widget.3 \
 	HTML::Widget::Accessor.3 \
+	HTML::Widget::BlockContainer.3 \
 	HTML::Widget::Constraint.3 \
 	HTML::Widget::Constraint::ASCII.3 \
 	HTML::Widget::Constraint::All.3 \
 	HTML::Widget::Constraint::AllOrNone.3 \
 	HTML::Widget::Constraint::Any.3 \
 	HTML::Widget::Constraint::Callback.3 \
+	HTML::Widget::Constraint::CallbackOnce.3 \
 	HTML::Widget::Constraint::Date.3 \
 	HTML::Widget::Constraint::DateTime.3 \
 	HTML::Widget::Constraint::DependOn.3 \
 	HTML::Widget::Constraint::Email.3 \
 	HTML::Widget::Constraint::Equal.3 \
 	HTML::Widget::Constraint::HTTP.3 \
 	HTML::Widget::Constraint::In.3 \
 	HTML::Widget::Constraint::Integer.3 \
 	HTML::Widget::Constraint::Length.3 \
 	HTML::Widget::Constraint::Maybe.3 \
 	HTML::Widget::Constraint::Number.3 \
 	HTML::Widget::Constraint::Printable.3 \
 	HTML::Widget::Constraint::Range.3 \
 	HTML::Widget::Constraint::Regex.3 \
 	HTML::Widget::Constraint::String.3 \
 	HTML::Widget::Constraint::Time.3 \
 	HTML::Widget::Container.3 \
 	HTML::Widget::Element.3 \
+	HTML::Widget::Element::Block.3 \
 	HTML::Widget::Element::Button.3 \
 	HTML::Widget::Element::Checkbox.3 \
+	HTML::Widget::Element::Fieldset.3 \
 	HTML::Widget::Element::Hidden.3 \
+	HTML::Widget::Element::NullContainer.3 \
 	HTML::Widget::Element::Password.3 \
 	HTML::Widget::Element::Radio.3 \
 	HTML::Widget::Element::RadioGroup.3 \
 	HTML::Widget::Element::Reset.3 \
 	HTML::Widget::Element::Select.3 \
 	HTML::Widget::Element::Span.3 \
 	HTML::Widget::Element::Submit.3 \
 	HTML::Widget::Element::Textarea.3 \
 	HTML::Widget::Element::Textfield.3 \
 	HTML::Widget::Element::Upload.3 \
 	HTML::Widget::Error.3 \
 	HTML::Widget::Filter.3 \
 	HTML::Widget::Filter::Callback.3 \
 	HTML::Widget::Filter::HTMLEscape.3 \
 	HTML::Widget::Filter::HTMLStrip.3 \
 	HTML::Widget::Filter::LowerCase.3 \
 	HTML::Widget::Filter::TrimEdges.3 \
 	HTML::Widget::Filter::UpperCase.3 \
 	HTML::Widget::Filter::Whitespace.3 \
+	HTML::Widget::Manual::Developer.3 \
 	HTML::Widget::Result.3
 
 post-extract:
 	@${PERL} -i.bak -ne 'print unless m,Test::,' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} < 500801
 IGNORE=	requires Perl 5.8.1. Install lang/perl5.8, and try again
 .endif
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Widget/distinfo b/www/p5-HTML-Widget/distinfo
index 0435bfe7454d..fb7957295874 100644
--- a/www/p5-HTML-Widget/distinfo
+++ b/www/p5-HTML-Widget/distinfo
@@ -1,3 +1,3 @@
-MD5 (HTML-Widget-1.08.tar.gz) = 0187a960a96c3ee3b0a2ca9f1e1a8d6c
-SHA256 (HTML-Widget-1.08.tar.gz) = ada6d2329f9182d390138171a4a0ae4d2a534cceb211848b429527b9188c714b
-SIZE (HTML-Widget-1.08.tar.gz) = 57421
+MD5 (HTML-Widget-1.10.tar.gz) = d37b747cc7fd02772689c89c9ca763cc
+SHA256 (HTML-Widget-1.10.tar.gz) = f158997da5e92df9415f07bb49778337fc298b0ce6cb532e9416ae78af47c1b4
+SIZE (HTML-Widget-1.10.tar.gz) = 70170
diff --git a/www/p5-HTML-Widget/pkg-plist b/www/p5-HTML-Widget/pkg-plist
index 4e1256586cc9..16d582420f47 100644
--- a/www/p5-HTML-Widget/pkg-plist
+++ b/www/p5-HTML-Widget/pkg-plist
@@ -1,58 +1,65 @@
 @comment $FreeBSD$                                                             
 %%SITE_PERL%%/HTML/Widget.pm
 %%SITE_PERL%%/HTML/Widget/Accessor.pm
+%%SITE_PERL%%/HTML/Widget/BlockContainer.pm
 %%SITE_PERL%%/HTML/Widget/Constraint.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/ASCII.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/All.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/AllOrNone.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Any.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Callback.pm
+%%SITE_PERL%%/HTML/Widget/Constraint/CallbackOnce.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Date.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/DateTime.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/DependOn.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Email.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Equal.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/HTTP.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/In.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Integer.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Length.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Maybe.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Number.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Printable.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Range.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Regex.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/String.pm
 %%SITE_PERL%%/HTML/Widget/Constraint/Time.pm
 %%SITE_PERL%%/HTML/Widget/Container.pm
 %%SITE_PERL%%/HTML/Widget/Element.pm
+%%SITE_PERL%%/HTML/Widget/Element/Block.pm
 %%SITE_PERL%%/HTML/Widget/Element/Button.pm
 %%SITE_PERL%%/HTML/Widget/Element/Checkbox.pm
+%%SITE_PERL%%/HTML/Widget/Element/Fieldset.pm
 %%SITE_PERL%%/HTML/Widget/Element/Hidden.pm
+%%SITE_PERL%%/HTML/Widget/Element/NullContainer.pm
 %%SITE_PERL%%/HTML/Widget/Element/Password.pm
 %%SITE_PERL%%/HTML/Widget/Element/Radio.pm
 %%SITE_PERL%%/HTML/Widget/Element/RadioGroup.pm
 %%SITE_PERL%%/HTML/Widget/Element/Reset.pm
 %%SITE_PERL%%/HTML/Widget/Element/Select.pm
 %%SITE_PERL%%/HTML/Widget/Element/Span.pm
 %%SITE_PERL%%/HTML/Widget/Element/Submit.pm
 %%SITE_PERL%%/HTML/Widget/Element/Textarea.pm
 %%SITE_PERL%%/HTML/Widget/Element/Textfield.pm
 %%SITE_PERL%%/HTML/Widget/Element/Upload.pm
 %%SITE_PERL%%/HTML/Widget/Error.pm
 %%SITE_PERL%%/HTML/Widget/Filter.pm
 %%SITE_PERL%%/HTML/Widget/Filter/Callback.pm
 %%SITE_PERL%%/HTML/Widget/Filter/HTMLEscape.pm
 %%SITE_PERL%%/HTML/Widget/Filter/HTMLStrip.pm
 %%SITE_PERL%%/HTML/Widget/Filter/LowerCase.pm
 %%SITE_PERL%%/HTML/Widget/Filter/TrimEdges.pm
 %%SITE_PERL%%/HTML/Widget/Filter/UpperCase.pm
 %%SITE_PERL%%/HTML/Widget/Filter/Whitespace.pm
+%%SITE_PERL%%/HTML/Widget/Manual/Developer.pod
 %%SITE_PERL%%/HTML/Widget/Result.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
 @dirrmtry %%SITE_PERL%%/HTML/Widget/Constraint
 @dirrmtry %%SITE_PERL%%/HTML/Widget/Element
 @dirrmtry %%SITE_PERL%%/HTML/Widget/Filter
+@dirrmtry %%SITE_PERL%%/HTML/Widget/Manual
 @dirrmtry %%SITE_PERL%%/HTML/Widget
 @dirrmtry %%SITE_PERL%%/HTML