4 files changed, 58 insertions, 15 deletions

diff --git a/www/p5-Jifty/Makefile b/www/p5-Jifty/Makefile
index 0120607bc3a7..e3f0f67aae30 100644
--- a/www/p5-Jifty/Makefile
+++ b/www/p5-Jifty/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Jifty
-PORTVERSION=	0.60912
+PORTVERSION=	0.70117
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Jifty
@@ -17,7 +17,7 @@ COMMENT=	Jifty -- Just Do It -- Yet another web framework
 
 BUILD_DEPENDS=	\
 		p5-App-CLI>=0.03:${PORTSDIR}/devel/p5-App-CLI \
-		p5-CGI.pm>0:${PORTSDIR}/www/p5-CGI.pm \
+		p5-CGI.pm>=3.19:${PORTSDIR}/www/p5-CGI.pm \
 		p5-CGI-Cookie-Splitter>=0:${PORTSDIR}/www/p5-CGI-Cookie-Splitter \
 		p5-CSS-Squish>=0.05:${PORTSDIR}/textproc/p5-CSS-Squish \
 		p5-Cache-Cache>0:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -31,6 +31,7 @@ BUILD_DEPENDS=	\
 		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
 		p5-DBD-SQLite>=1.11:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
+		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
 		p5-Date-Manip>0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
 		p5-Devel-Cover>=0:${PORTSDIR}/devel/p5-Devel-Cover \
@@ -45,40 +46,44 @@ BUILD_DEPENDS=	\
 		p5-ExtUtils-Command>=0:${PORTSDIR}/devel/p5-ExtUtils-Command \
 		p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
 		p5-File-MMagic>0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
+		p5-File-ShareDir>=0.04:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-HTML-Lint>0:${PORTSDIR}/www/p5-HTML-Lint \
 		p5-HTML-Mason>=1.31.0.1:${PORTSDIR}/www/p5-HTML-Mason \
 		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTTP-Server-Simple-Recorder>0:${PORTSDIR}/www/p5-HTTP-Server-Simple-Recorder \
-		p5-HTTP-Server-Simple>=0.10:${PORTSDIR}/www/p5-HTTP-Server-Simple \
+		p5-HTTP-Server-Simple>=0.26:${PORTSDIR}/www/p5-HTTP-Server-Simple \
 		p5-Hash-Merge>0:${PORTSDIR}/textproc/p5-Hash-Merge \
 		p5-Hook-LexWrap>0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Jifty-DBI>=0.16:${PORTSDIR}/databases/p5-Jifty-DBI \
+		p5-IPC-PubSub>=0.22:${PORTSDIR}/devel/p5-IPC-PubSub \
+		p5-Jifty-DBI>=0.30:${PORTSDIR}/databases/p5-Jifty-DBI \
 		p5-Locale-Maketext-Lexicon>=0.60:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
 		p5-Module-CoreList>0:${PORTSDIR}/devel/p5-Module-CoreList \
 		p5-Module-Install>=0.50:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Module-Pluggable>=2.95:${PORTSDIR}/devel/p5-Module-Pluggable \
+		p5-Module-Pluggable>=3.1:${PORTSDIR}/devel/p5-Module-Pluggable \
 		p5-Module-Refresh>=0.09:${PORTSDIR}/devel/p5-Module-Refresh \
 		p5-Object-Declare>=0.13:${PORTSDIR}/devel/p5-Object-Declare \
 		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-PerlIO-gzip>=0:${PORTSDIR}/archivers/p5-PerlIO-gzip \
 		p5-Pod-Simple>0:${PORTSDIR}/textproc/p5-Pod-Simple \
 		p5-Scalar-Defer>=0.06:${PORTSDIR}/devel/p5-Scalar-Defer \
+		p5-SQL-ReservedWords>0:${PORTSDIR}/databases/p5-SQL-ReservedWords \
 		p5-String-Koremutake>0:${PORTSDIR}/textproc/p5-String-Koremutake \
 		p5-Test-Base>=0.44:${PORTSDIR}/devel/p5-Test-Base \
 		p5-Test-HTTP-Server-Simple>=0.02:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
+		p5-Test-MockModule>=0.05:${PORTSDIR}/devel/p5-Test-MockModule \
+		p5-Test-MockObject>=1.07:${PORTSDIR}/devel/p5-Test-MockObject \
 		p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
 		p5-Test-Simple>=0.62:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
+		p5-Test-WWW-Mechanize>=1.04:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
 		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
 		p5-URI>0:${PORTSDIR}/net/p5-URI \
 		p5-WWW-Mechanize>=1.12:${PORTSDIR}/www/p5-WWW-Mechanize \
 		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>0:${PORTSDIR}/textproc/p5-XML-Writer \
+		p5-XML-Writer>0.601:${PORTSDIR}/textproc/p5-XML-Writer \
 		p5-XML-XPath>0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-YAML-Syck>=0.44:${PORTSDIR}/textproc/p5-YAML-Syck \
+		p5-YAML-Syck>=0.71:${PORTSDIR}/textproc/p5-YAML-Syck \
 		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		p5-version>0:${PORTSDIR}/devel/p5-version
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Jifty/Makefile.man b/www/p5-Jifty/Makefile.man
index e6ec015a4bed..11f5f056a517 100644
--- a/www/p5-Jifty/Makefile.man
+++ b/www/p5-Jifty/Makefile.man
@@ -20,6 +20,8 @@ MAN3+=	Jifty::Continuation.3
 MAN3+=	Jifty::CurrentUser.3
 MAN3+=	Jifty::DateTime.3
 MAN3+=	Jifty::Dispatcher.3
+MAN3+=	Jifty::Event.3
+MAN3+=	Jifty::Event::Model.3
 MAN3+=	Jifty::Everything.3
 MAN3+=	Jifty::Filter::DateTime.3
 MAN3+=	Jifty::Handle.3
@@ -37,19 +39,24 @@ MAN3+=	Jifty::Manual::Glossary.3
 MAN3+=	Jifty::Manual::Models.3
 MAN3+=	Jifty::Manual::ObjectModel.3
 MAN3+=	Jifty::Manual::PageRegions.3
+MAN3+=	Jifty::Manual::RequestHandling.3
 MAN3+=	Jifty::Manual::Style.3
 MAN3+=	Jifty::Manual::Tutorial.3
+MAN3+=	Jifty::Manual::Tutorial_de.3
 MAN3+=	Jifty::Manual::Tutorial_ja.3
 MAN3+=	Jifty::Manual::Upgrading.3
+MAN3+=	Jifty::Manual::UsingCSSandJS.3
 MAN3+=	Jifty::Mason::Halo.3
 MAN3+=	Jifty::Model::Metadata.3
 MAN3+=	Jifty::Model::Session.3
+MAN3+=	Jifty::Module::Pluggable.3
 MAN3+=	Jifty::Notification.3
 MAN3+=	Jifty::Object.3
 MAN3+=	Jifty::Param.3
 MAN3+=	Jifty::Param::Schema.3
 MAN3+=	Jifty::Plugin.3
 MAN3+=	Jifty::Plugin::ClassLoader.3
+MAN3+=	Jifty::Plugin::REST.3
 MAN3+=	Jifty::Record.3
 MAN3+=	Jifty::Request.3
 MAN3+=	Jifty::Request::Mapper.3
@@ -66,6 +73,8 @@ MAN3+=	Jifty::Script::Po.3
 MAN3+=	Jifty::Script::Schema.3
 MAN3+=	Jifty::Script::Server.3
 MAN3+=	Jifty::Server.3
+MAN3+=	Jifty::Subs.3
+MAN3+=	Jifty::Subs::Render.3
 MAN3+=	Jifty::Test.3
 MAN3+=	Jifty::Test::WWW::Mechanize.3
 MAN3+=	Jifty::TestServer.3
@@ -77,6 +86,7 @@ MAN3+=	Jifty::Web.3
 MAN3+=	Jifty::Web::Form::Clickable.3
 MAN3+=	Jifty::Web::Form::Element.3
 MAN3+=	Jifty::Web::Form::Field.3
+MAN3+=	Jifty::Web::Form::Field::Button.3
 MAN3+=	Jifty::Web::Form::Field::Text.3
 MAN3+=	Jifty::Web::Form::Field::Upload.3
 MAN3+=	Jifty::Web::Form::Link.3
diff --git a/www/p5-Jifty/distinfo b/www/p5-Jifty/distinfo
index 3fda7193991e..cf70bb16da58 100644
--- a/www/p5-Jifty/distinfo
+++ b/www/p5-Jifty/distinfo
@@ -1,3 +1,3 @@
-MD5 (Jifty-0.60912.tar.gz) = 9c489e7749711b27e8a929aa6ee5c30b
-SHA256 (Jifty-0.60912.tar.gz) = 2e96d3d042bc22fc0309d4a17a1094d11fb84d9f391cde3df019ceff2fa778b0
-SIZE (Jifty-0.60912.tar.gz) = 532495
+MD5 (Jifty-0.70117.tar.gz) = 8cc50a53a48c6b729ac13d124729aa22
+SHA256 (Jifty-0.70117.tar.gz) = 0b3f8728edbbfb58b0ce9cf940062d8f1a9596e4d08f882e6e3d9316438de538
+SIZE (Jifty-0.70117.tar.gz) = 787025
diff --git a/www/p5-Jifty/pkg-plist b/www/p5-Jifty/pkg-plist
index 32fd8e64e243..49aa59e3063a 100644
--- a/www/p5-Jifty/pkg-plist
+++ b/www/p5-Jifty/pkg-plist
@@ -20,6 +20,8 @@ bin/jifty
 %%SITE_PERL%%/Jifty/CurrentUser.pm
 %%SITE_PERL%%/Jifty/DateTime.pm
 %%SITE_PERL%%/Jifty/Dispatcher.pm
+%%SITE_PERL%%/Jifty/Event.pm
+%%SITE_PERL%%/Jifty/Event/Model.pm
 %%SITE_PERL%%/Jifty/Everything.pm
 %%SITE_PERL%%/Jifty/Filter/DateTime.pm
 %%SITE_PERL%%/Jifty/Handle.pm
@@ -36,21 +38,27 @@ bin/jifty
 %%SITE_PERL%%/Jifty/Manual/Glossary.pod
 %%SITE_PERL%%/Jifty/Manual/Models.pod
 %%SITE_PERL%%/Jifty/Manual/ObjectModel.pod
-%%SITE_PERL%%/Jifty/Manual/PageRegions.pm
+%%SITE_PERL%%/Jifty/Manual/PageRegions.pod
+%%SITE_PERL%%/Jifty/Manual/RequestHandling.pod
 %%SITE_PERL%%/Jifty/Manual/Style.pod
 %%SITE_PERL%%/Jifty/Manual/Tutorial.pod
+%%SITE_PERL%%/Jifty/Manual/Tutorial_de.pod
 %%SITE_PERL%%/Jifty/Manual/Tutorial_ja.pod
 %%SITE_PERL%%/Jifty/Manual/Upgrading.pod
+%%SITE_PERL%%/Jifty/Manual/UsingCSSandJS.pod
 %%SITE_PERL%%/Jifty/Mason/Halo.pm
 %%SITE_PERL%%/Jifty/Model/Metadata.pm
 %%SITE_PERL%%/Jifty/Model/Session.pm
 %%SITE_PERL%%/Jifty/Model/SessionCollection.pm
+%%SITE_PERL%%/Jifty/Module/Pluggable.pm
 %%SITE_PERL%%/Jifty/Notification.pm
 %%SITE_PERL%%/Jifty/Object.pm
 %%SITE_PERL%%/Jifty/Param.pm
 %%SITE_PERL%%/Jifty/Param/Schema.pm
 %%SITE_PERL%%/Jifty/Plugin.pm
 %%SITE_PERL%%/Jifty/Plugin/ClassLoader.pm
+%%SITE_PERL%%/Jifty/Plugin/REST.pm
+%%SITE_PERL%%/Jifty/Plugin/REST/Dispatcher.pm
 %%SITE_PERL%%/Jifty/Record.pm
 %%SITE_PERL%%/Jifty/Request.pm
 %%SITE_PERL%%/Jifty/Request/Mapper.pm
@@ -69,6 +77,8 @@ bin/jifty
 %%SITE_PERL%%/Jifty/Script/Schema.pm
 %%SITE_PERL%%/Jifty/Script/Server.pm
 %%SITE_PERL%%/Jifty/Server.pm
+%%SITE_PERL%%/Jifty/Subs.pm
+%%SITE_PERL%%/Jifty/Subs/Render.pm
 %%SITE_PERL%%/Jifty/Test.pm
 %%SITE_PERL%%/Jifty/Test/WWW/Mechanize.pm
 %%SITE_PERL%%/Jifty/TestServer.pm
@@ -76,8 +86,6 @@ bin/jifty
 %%SITE_PERL%%/Jifty/Upgrade/Internal.pm
 %%SITE_PERL%%/Jifty/Util.pm
 %%SITE_PERL%%/Jifty/View/Mason/Handler.pm
-%%SITE_PERL%%/Jifty/View/Mason/Handler.pm.orig
-%%SITE_PERL%%/Jifty/View/Mason/Handler.pm.rej
 %%SITE_PERL%%/Jifty/View/Static/Handler.pm
 %%SITE_PERL%%/Jifty/Web.pm
 %%SITE_PERL%%/Jifty/Web/Form.pm
@@ -109,7 +117,10 @@ bin/jifty
 %%SITE_PERL%%/auto/Jifty/dtd/xhtml-symbol.ent
 %%SITE_PERL%%/auto/Jifty/dtd/xhtml1-strict.dtd
 %%SITE_PERL%%/auto/Jifty/po/en.po
+%%SITE_PERL%%/auto/Jifty/po/fr.po
 %%SITE_PERL%%/auto/Jifty/po/ja.po
+%%SITE_PERL%%/auto/Jifty/po/zh_cn.po
+%%SITE_PERL%%/auto/Jifty/po/zh_tw.po
 %%SITE_PERL%%/auto/Jifty/web/static/css/app-base.css
 %%SITE_PERL%%/auto/Jifty/web/static/css/app.css
 %%SITE_PERL%%/auto/Jifty/web/static/css/autocomplete.css
@@ -125,7 +136,11 @@ bin/jifty
 %%SITE_PERL%%/auto/Jifty/web/static/css/nav.css
 %%SITE_PERL%%/auto/Jifty/web/static/css/notices.css
 %%SITE_PERL%%/auto/Jifty/web/static/css/yui/calendar/calendar.css
+%%SITE_PERL%%/auto/Jifty/web/static/css/yui/tabview/border_tabs.css
+%%SITE_PERL%%/auto/Jifty/web/static/css/yui/tabview/tabs.css
 %%SITE_PERL%%/auto/Jifty/web/static/favicon.ico
+%%SITE_PERL%%/auto/Jifty/web/static/images/css/bullet_arrow_down.png
+%%SITE_PERL%%/auto/Jifty/web/static/images/css/bullet_arrow_up.png
 %%SITE_PERL%%/auto/Jifty/web/static/images/css/fieldbg-autocomplete.gif
 %%SITE_PERL%%/auto/Jifty/web/static/images/css/fieldbg.gif
 %%SITE_PERL%%/auto/Jifty/web/static/images/pony.jpg
@@ -158,10 +173,12 @@ bin/jifty
 %%SITE_PERL%%/auto/Jifty/web/static/js/halo.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jifty.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jifty_smoothscroll.js
+%%SITE_PERL%%/auto/Jifty/web/static/js/jifty_subs.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jifty_utils.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsTrace.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsan/DOM/Events.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsan/JSAN.js
+%%SITE_PERL%%/auto/Jifty/web/static/js/jsan/Push.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsan/Upgrade.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsan/Upgrade/Array/push.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/jsan/Upgrade/Function/apply.js
@@ -178,12 +195,16 @@ bin/jifty
 %%SITE_PERL%%/auto/Jifty/web/static/js/scriptaculous/unittest.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/setup_jsan.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/yui/calendar.js
+%%SITE_PERL%%/auto/Jifty/web/static/js/yui/container.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/yui/dom.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/yui/event.js
+%%SITE_PERL%%/auto/Jifty/web/static/js/yui/tabview.js
 %%SITE_PERL%%/auto/Jifty/web/static/js/yui/yahoo.js
+%%SITE_PERL%%/auto/Jifty/web/templates/=/subs
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/_elements/nav
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/action/dhandler
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/autohandler
+%%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/fragments/list/header
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/fragments/list/list
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/fragments/list/new_item
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/fragments/list/search
@@ -207,6 +228,7 @@ bin/jifty
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/online_docs/index.html
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/online_docs/toc.html
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/validator.xml
+%%SITE_PERL%%/auto/Jifty/web/templates/__jifty/webservices/json
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/webservices/xml
 %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/webservices/yaml
 %%SITE_PERL%%/auto/Jifty/web/templates/_elements/header
@@ -235,6 +257,7 @@ bin/jifty
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin/_elements
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/templates/__jifty/admin
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/templates/__jifty
+@dirrmtry %%SITE_PERL%%/auto/Jifty/web/templates/=
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/templates
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/js/yui
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/js/scriptaculous
@@ -253,6 +276,7 @@ bin/jifty
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/images/silk
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/images/css
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/images
+@dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/css/yui/tabview
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/css/yui/calendar
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/css/yui
 @dirrmtry %%SITE_PERL%%/auto/Jifty/web/static/css
@@ -271,14 +295,18 @@ bin/jifty
 @dirrmtry %%SITE_PERL%%/Jifty/Upgrade
 @dirrmtry %%SITE_PERL%%/Jifty/Test/WWW
 @dirrmtry %%SITE_PERL%%/Jifty/Test
+@dirrmtry %%SITE_PERL%%/Jifty/Subs
 @dirrmtry %%SITE_PERL%%/Jifty/Script
 @dirrmtry %%SITE_PERL%%/Jifty/Request
+@dirrmtry %%SITE_PERL%%/Jifty/Plugin/REST
 @dirrmtry %%SITE_PERL%%/Jifty/Plugin
 @dirrmtry %%SITE_PERL%%/Jifty/Param
+@dirrmtry %%SITE_PERL%%/Jifty/Module
 @dirrmtry %%SITE_PERL%%/Jifty/Model
 @dirrmtry %%SITE_PERL%%/Jifty/Mason
 @dirrmtry %%SITE_PERL%%/Jifty/Manual
 @dirrmtry %%SITE_PERL%%/Jifty/Filter
+@dirrmtry %%SITE_PERL%%/Jifty/Event
 @dirrmtry %%SITE_PERL%%/Jifty/Action/Record
 @dirrmtry %%SITE_PERL%%/Jifty/Action
 @dirrmtry %%SITE_PERL%%/Jifty