3 files changed, 48 insertions, 13 deletions

diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index 0391938f0c76..a8f6c9b05a16 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MojoMojo
-PORTVERSION=	0.999042
-PORTREVISION=	1
+PORTVERSION=	1.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MR/MRAMBERG
@@ -61,6 +60,7 @@ RUN_DEPENDS=	\
 	p5-HTML-FormFu-Model-DBIC>=0:${PORTSDIR}/www/p5-HTML-FormFu-Model-DBIC \
 	p5-HTML-Strip>=1.04:${PORTSDIR}/www/p5-HTML-Strip \
 	p5-HTML-TagCloud>=0:${PORTSDIR}/www/p5-HTML-TagCloud \
+	p5-HTML-TOC>=0:${PORTSDIR}/www/p5-HTML-Toc \
 	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
 	p5-Image-Math-Constrain>=0:${PORTSDIR}/graphics/p5-Image-Math-Constrain \
@@ -83,12 +83,17 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
+LICENSE_COMB=	dual
+LICENSE=	ART20 GPLv1
+
 MAN1=	mojomojo_cgi.pl.1 \
 	mojomojo_create.pl.1 \
 	mojomojo_fastcgi.pl.1 \
 	mojomojo_fastcgi_manage.pl.1 \
 	mojomojo_server.pl.1 \
-	mojomojo_test.pl.1
+	mojomojo_spawn_db.pl.1 \
+	mojomojo_test.pl.1 \
+	mojomojo_update_db.pl.1
 
 MAN3=	MojoMojo.3 \
 	MojoMojo::Controller::Admin.3 \
@@ -96,6 +101,7 @@ MAN3=	MojoMojo.3 \
 	MojoMojo::Controller::Comment.3 \
 	MojoMojo::Controller::Export.3 \
 	MojoMojo::Controller::Gallery.3 \
+	MojoMojo::Controller::Image.3 \
 	MojoMojo::Controller::JSON.3 \
 	MojoMojo::Controller::Journal.3 \
 	MojoMojo::Controller::Jsrpc.3 \
@@ -105,14 +111,25 @@ MAN3=	MojoMojo.3 \
 	MojoMojo::Controller::Tag.3 \
 	MojoMojo::Controller::User.3 \
 	MojoMojo::Declaw.3 \
+	MojoMojo::Extension.3 \
+	MojoMojo::Extensions::Counter.3 \
 	MojoMojo::Formatter.3 \
 	MojoMojo::Formatter::Amazon.3 \
 	MojoMojo::Formatter::CPANHyperlink.3 \
 	MojoMojo::Formatter::Comment.3 \
 	MojoMojo::Formatter::Defang.3 \
+	MojoMojo::Formatter::Dir.3 \
 	MojoMojo::Formatter::DocBook.3 \
 	MojoMojo::Formatter::DocBook::Colorize.3 \
 	MojoMojo::Formatter::Emote.3 \
+	MojoMojo::Formatter::File.3 \
+	MojoMojo::Formatter::File::DocBook.3 \
+	MojoMojo::Formatter::File::Image.3 \
+	MojoMojo::Formatter::File::Pod.3 \
+	MojoMojo::Formatter::File::Text.3 \
+	MojoMojo::Formatter::GoogleSearch.3 \
+	MojoMojo::Formatter::GoogleCalendar.3 \
+	MojoMojo::Formatter::IDLink.3 \
 	MojoMojo::Formatter::IRCLog.3 \
 	MojoMojo::Formatter::Include.3 \
 	MojoMojo::Formatter::Main.3 \
@@ -122,8 +139,10 @@ MAN3=	MojoMojo.3 \
 	MojoMojo::Formatter::Redirect.3 \
 	MojoMojo::Formatter::SyntaxHighlight.3 \
 	MojoMojo::Formatter::TOC.3 \
+	MojoMojo::Formatter::Text.3 \
 	MojoMojo::Formatter::Textile.3 \
 	MojoMojo::Formatter::Wiki.3 \
+	MojoMojo::Formatter::WikipediaLink.3 \
 	MojoMojo::Formatter::YouTube.3 \
 	MojoMojo::I18N.3 \
 	MojoMojo::Installation.3 \
@@ -157,6 +176,7 @@ MAN3=	MojoMojo.3 \
 	MojoMojo::Schema::ResultSet::Person.3 \
 	MojoMojo::Schema::ResultSet::Role.3 \
 	MojoMojo::Schema::ResultSet::Tag.3 \
+	MojoMojo::View::Email.3 \
 	MojoMojo::View::JSON.3 \
 	MojoMojo::View::TT.3 \
 	MojoMojo::WordDiff.3 \
diff --git a/www/p5-MojoMojo/distinfo b/www/p5-MojoMojo/distinfo
index 6ef272142d9a..15a40ad4a99a 100644
--- a/www/p5-MojoMojo/distinfo
+++ b/www/p5-MojoMojo/distinfo
@@ -1,3 +1,2 @@
-MD5 (MojoMojo-0.999042.tar.gz) = 4db9c6aa6f6ac4ae493c28778b77a0d5
-SHA256 (MojoMojo-0.999042.tar.gz) = 86dec138c929735fd1561dbb79991ec0de88d80af432e8d54e9fac7629ad9afb
-SIZE (MojoMojo-0.999042.tar.gz) = 1231932
+SHA256 (MojoMojo-1.03.tar.gz) = 9da873f08b1b527c32c851468d7ddd0609eb368c546dcb8f68e56d3ffc4afeb0
+SIZE (MojoMojo-1.03.tar.gz) = 1264174
diff --git a/www/p5-MojoMojo/pkg-plist b/www/p5-MojoMojo/pkg-plist
index 86baa040ae92..629ea3b512c0 100644
--- a/www/p5-MojoMojo/pkg-plist
+++ b/www/p5-MojoMojo/pkg-plist
@@ -1,4 +1,3 @@
-bin/hash_passwords.pl
 bin/mojomojo_cgi.pl
 bin/mojomojo_create.pl
 bin/mojomojo_fastcgi.pl
@@ -7,14 +6,13 @@ bin/mojomojo_server.pl
 bin/mojomojo_spawn_db.pl
 bin/mojomojo_test.pl
 bin/mojomojo_update_db.pl
-bin/textile2markdown.pl
-bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo.pm
 %%SITE_PERL%%/MojoMojo/Controller/Admin.pm
 %%SITE_PERL%%/MojoMojo/Controller/Attachment.pm
 %%SITE_PERL%%/MojoMojo/Controller/Comment.pm
 %%SITE_PERL%%/MojoMojo/Controller/Export.pm
 %%SITE_PERL%%/MojoMojo/Controller/Gallery.pm
+%%SITE_PERL%%/MojoMojo/Controller/Image.pm
 %%SITE_PERL%%/MojoMojo/Controller/JSON.pm
 %%SITE_PERL%%/MojoMojo/Controller/Journal.pm
 %%SITE_PERL%%/MojoMojo/Controller/Jsrpc.pm
@@ -24,14 +22,25 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/Controller/Tag.pm
 %%SITE_PERL%%/MojoMojo/Controller/User.pm
 %%SITE_PERL%%/MojoMojo/Declaw.pm
+%%SITE_PERL%%/MojoMojo/Extensions/Counter.pm
+%%SITE_PERL%%/MojoMojo/Extension.pm
 %%SITE_PERL%%/MojoMojo/Formatter.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Amazon.pm
 %%SITE_PERL%%/MojoMojo/Formatter/CPANHyperlink.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Comment.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Defang.pm
+%%SITE_PERL%%/MojoMojo/Formatter/Dir.pm
 %%SITE_PERL%%/MojoMojo/Formatter/DocBook.pm
 %%SITE_PERL%%/MojoMojo/Formatter/DocBook/Colorize.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Emote.pm
+%%SITE_PERL%%/MojoMojo/Formatter/File.pm
+%%SITE_PERL%%/MojoMojo/Formatter/File/DocBook.pm
+%%SITE_PERL%%/MojoMojo/Formatter/File/Image.pm
+%%SITE_PERL%%/MojoMojo/Formatter/File/Pod.pm
+%%SITE_PERL%%/MojoMojo/Formatter/File/Text.pm
+%%SITE_PERL%%/MojoMojo/Formatter/GoogleSearch.pm
+%%SITE_PERL%%/MojoMojo/Formatter/GoogleCalendar.pm
+%%SITE_PERL%%/MojoMojo/Formatter/IDLink.pm
 %%SITE_PERL%%/MojoMojo/Formatter/IRCLog.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Include.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Main.pm
@@ -41,8 +50,10 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/Formatter/Redirect.pm
 %%SITE_PERL%%/MojoMojo/Formatter/SyntaxHighlight.pm
 %%SITE_PERL%%/MojoMojo/Formatter/TOC.pm
+%%SITE_PERL%%/MojoMojo/Formatter/Text.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Textile.pm
 %%SITE_PERL%%/MojoMojo/Formatter/Wiki.pm
+%%SITE_PERL%%/MojoMojo/Formatter/WikipediaLink.pm
 %%SITE_PERL%%/MojoMojo/Formatter/YouTube.pm
 %%SITE_PERL%%/MojoMojo/I18N.pm
 %%SITE_PERL%%/MojoMojo/I18N/ca.js.po
@@ -59,6 +70,7 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/I18N/it.po
 %%SITE_PERL%%/MojoMojo/I18N/ja.js.po
 %%SITE_PERL%%/MojoMojo/I18N/ja.po
+%%SITE_PERL%%/MojoMojo/I18N/ko.po
 %%SITE_PERL%%/MojoMojo/I18N/no.js.po
 %%SITE_PERL%%/MojoMojo/I18N/no.po
 %%SITE_PERL%%/MojoMojo/I18N/pl.js.po
@@ -122,6 +134,7 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/root/base/edithelp/markdown.tt
 %%SITE_PERL%%/MojoMojo/root/base/edithelp/textile.tt
 %%SITE_PERL%%/MojoMojo/root/base/export.tt
+%%SITE_PERL%%/MojoMojo/root/base/extensions/counter.tt
 %%SITE_PERL%%/MojoMojo/root/base/feeds.tt
 %%SITE_PERL%%/MojoMojo/root/base/footer.tt
 %%SITE_PERL%%/MojoMojo/root/base/gallery.tt
@@ -184,11 +197,11 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/root/base/user/register.tt
 %%SITE_PERL%%/MojoMojo/root/base/user/user_search.tt
 %%SITE_PERL%%/MojoMojo/root/base/user/validate.tt
+%%SITE_PERL%%/MojoMojo/root/forms/admin/delete.yml
 %%SITE_PERL%%/MojoMojo/root/forms/admin/role_form.yml
 %%SITE_PERL%%/MojoMojo/root/forms/admin/settings.yml
 %%SITE_PERL%%/MojoMojo/root/forms/comment/comment.yml
 %%SITE_PERL%%/MojoMojo/root/forms/defaults.yml
-%%SITE_PERL%%/MojoMojo/root/forms/pageadmin/delete.yml
 %%SITE_PERL%%/MojoMojo/root/forms/pageadmin/edit.yml
 %%SITE_PERL%%/MojoMojo/root/forms/user/editprofile.yml
 %%SITE_PERL%%/MojoMojo/root/forms/user/login.yml
@@ -281,7 +294,6 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/root/static/gfx/poweredby.png
 %%SITE_PERL%%/MojoMojo/root/static/gfx/uploadbutton.png
 %%SITE_PERL%%/MojoMojo/root/static/js/edit.js
-%%SITE_PERL%%/MojoMojo/root/static/js/fat.js
 %%SITE_PERL%%/MojoMojo/root/static/js/jquery.autocomplete.js
 %%SITE_PERL%%/MojoMojo/root/static/js/jquery.cookies.2.0.1.min.js
 %%SITE_PERL%%/MojoMojo/root/static/js/jquery.editinplace.js
@@ -302,12 +314,12 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/root/static/json/pl.po.json
 %%SITE_PERL%%/MojoMojo/root/static/json/ru.po.json
 %%SITE_PERL%%/MojoMojo/root/static/mm-logo.png
+%%SITE_PERL%%/MojoMojo/root/static/Crystal_Clear_action_stop.png
 %%SITE_PERL%%/MojoMojo/root/static/mojomojo.css
 %%SITE_PERL%%/MojoMojo/root/static/overrides.css
 %%SITE_PERL%%/MojoMojo/root/static/pod.css
 %%SITE_PERL%%/MojoMojo/root/static/reset.css
 %%SITE_PERL%%/MojoMojo/root/static/robots.txt
-%%SITE_PERL%%/MojoMojo/root/static/shrinkedhead.jpg
 %%SITE_PERL%%/MojoMojo/root/static/spinner.gif
 %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/generic.css
 %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/images/global/box_bg_gray.png
@@ -339,8 +351,9 @@ bin/wikispaces2markdown.pl
 %%SITE_PERL%%/MojoMojo/root/static/themes/catalyst/theme.css
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/config.rb
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/ie.css
+%%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/images/bg.gif
+%%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/images/catalyst_logo.png
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/images/grid.png
-%%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/images/mainbg.jpg
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/print.css
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/src/ie.sass
 %%SITE_PERL%%/MojoMojo/root/static/themes/catapulse/src/print.sass
@@ -458,6 +471,7 @@ bin/wikispaces2markdown.pl
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/static/gfx
 @dirrmtry %%SITE_PERL%%/MojoMojo/resources/logo
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/static/js
+@dirrmtry %%SITE_PERL%%/MojoMojo/root/base/extensions
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/base/rest
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/base/user
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/base/page
@@ -472,6 +486,8 @@ bin/wikispaces2markdown.pl
 @dirrmtry %%SITE_PERL%%/MojoMojo/resources
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MojoMojo
 @dirrmtry %%SITE_PERL%%/MojoMojo/root/base
+@dirrmtry %%SITE_PERL%%/MojoMojo/Extensions
+@dirrmtry %%SITE_PERL%%/MojoMojo/Formatter/File
 @dirrmtry %%SITE_PERL%%/MojoMojo/Formatter
 @dirrmtry %%SITE_PERL%%/MojoMojo/Schema
 @dirrmtry %%SITE_PERL%%/MojoMojo/Model