3 files changed, 23 insertions, 15 deletions

diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index ac3ce986ec8b..a21070c3e965 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MojoMojo
-PORTVERSION=	1.04
+PORTVERSION=	1.05
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
@@ -15,17 +15,21 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Catalyst & DBIx::Class powered Wiki
 
+LICENSE=	ART20 GPLv1
+LICENSE_COMB=	dual
+
 # Please keep order as in Makefile.PL
 RUN_DEPENDS=	\
+	p5-Plack>=0.9974:${PORTSDIR}/www/p5-Plack \
 	p5-Algorithm-Diff>=1.1901:${PORTSDIR}/devel/p5-Algorithm-Diff \
 	p5-Algorithm-Merge>=0:${PORTSDIR}/devel/p5-Algorithm-Merge \
 	p5-Archive-Zip>=1.14:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
 	p5-Cache-FastMmap>=1.31:${PORTSDIR}/devel/p5-Cache-FastMmap \
 	p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
 	p5-Catalyst-Action-RenderView>=0.07:${PORTSDIR}/www/p5-Catalyst-Action-RenderView \
 	p5-Catalyst-Authentication-Store-DBIx-Class>=0.101:${PORTSDIR}/www/p5-Catalyst-Authentication-Store-DBIx-Class \
 	p5-Catalyst-Controller-HTML-FormFu>=0.03007:${PORTSDIR}/www/p5-Catalyst-Controller-HTML-FormFu \
+	p5-Catalyst-Engine-PSGI>=0:${PORTSDIR}/www/p5-Catalyst-Engine-PSGI \
 	p5-Catalyst-Model-DBIC-Schema>=0.01:${PORTSDIR}/www/p5-Catalyst-Model-DBIC-Schema \
 	p5-Catalyst-Plugin-Authentication>=0.10005:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
 	p5-Catalyst-Plugin-Cache>=0.08:${PORTSDIR}/www/p5-Catalyst-Plugin-Cache \
@@ -51,7 +55,6 @@ RUN_DEPENDS=	\
 	p5-DBIx-Class-DateTime-Epoch>=0.04:${PORTSDIR}/databases/p5-DBIx-Class-DateTime-Epoch \
 	p5-DBIx-Class-EncodedColumn>=0:${PORTSDIR}/databases/p5-DBIx-Class-EncodedColumn \
 	p5-DBIx-Class-TimeStamp>=0.11:${PORTSDIR}/databases/p5-DBIx-Class-TimeStamp \
-	p5-Encode>=2.31:${PORTSDIR}/converters/p5-Encode \
 	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
 	p5-File-MMagic>=1.27:${PORTSDIR}/devel/p5-File-MMagic \
 	p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
@@ -68,8 +71,8 @@ RUN_DEPENDS=	\
 	p5-KinoSearch>=0.165:${PORTSDIR}/textproc/p5-KinoSearch \
 	p5-Module-Pluggable-Ordered>=1.4:${PORTSDIR}/devel/p5-Module-Pluggable-Ordered \
 	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
+	p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
 	p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
-	p5-parent>=0:${PORTSDIR}/devel/p5-parent \
 	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
 	p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
 	p5-Text-Context>=3.5:${PORTSDIR}/textproc/p5-Text-Context \
@@ -83,9 +86,6 @@ 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 \
@@ -94,7 +94,6 @@ MAN1=	mojomojo_cgi.pl.1 \
 	mojomojo_spawn_db.pl.1 \
 	mojomojo_test.pl.1 \
 	mojomojo_update_db.pl.1
-
 MAN3=	MojoMojo.3 \
 	MojoMojo::Controller::Admin.3 \
 	MojoMojo::Controller::Attachment.3 \
@@ -196,7 +195,7 @@ OPTIONS=	DEPLOY		"Automatic database deployment" Off \
 		AMAZON		"Amazon boxes"			Off \
 		EMOTICONS	"Emoticons"			Off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DEPLOY)
 RUN_DEPENDS+=	p5-SQL-Translator>=0.09006:${PORTSDIR}/databases/p5-SQL-Translator
@@ -223,8 +222,8 @@ RUN_DEPENDS+=	p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed
 .endif
 
 .if defined(WITH_DOCBOOK_FORMATTER)
-RUN_DEPENDS+=	p5-XML-LibXSLT>=1.66:${PORTSDIR}/textproc/p5-XML-LibXSLT
-RUN_DEPENDS+=	p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS+=	p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-XML-LibXSLT>=1.66:${PORTSDIR}/textproc/p5-XML-LibXSLT
 .endif
 
 .if defined(WITH_POD_FORMATTER)
@@ -232,8 +231,8 @@ RUN_DEPENDS+=	p5-Pod-Simple>=3.01:${PORTSDIR}/textproc/p5-Pod-Simple
 .endif
 
 .if defined(WITH_TRANSCLUSION)
-RUN_DEPENDS+=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS+=	p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch
+RUN_DEPENDS+=	p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 .endif
 
 .if defined(WITH_AMAZON)
@@ -244,4 +243,11 @@ RUN_DEPENDS+=	p5-Net-Amazon>=0:${PORTSDIR}/net/p5-Net-Amazon
 RUN_DEPENDS+=	p5-Text-Emoticon-MSN>=0:${PORTSDIR}/textproc/p5-Text-Emoticon-MSN
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+RUN_DEPENDS+=	p5-Encode>=2.31:${PORTSDIR}/converters/p5-Encode \
+		p5-parent>=0:${PORTSDIR}/devel/p5-parent
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/www/p5-MojoMojo/distinfo b/www/p5-MojoMojo/distinfo
index ecd49b00179f..0599cd7707e0 100644
--- a/www/p5-MojoMojo/distinfo
+++ b/www/p5-MojoMojo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MojoMojo-1.04.tar.gz) = 5a50df031818a90cd4875edf6443279affb2d7aa7cbc26501958537767cfe980
-SIZE (MojoMojo-1.04.tar.gz) = 1268959
+SHA256 (MojoMojo-1.05.tar.gz) = 0c036e07fe8a7d6a8a2878ed63feecd14610ec2a845fdfd7947b14d8b25c4377
+SIZE (MojoMojo-1.05.tar.gz) = 1270079
diff --git a/www/p5-MojoMojo/pkg-plist b/www/p5-MojoMojo/pkg-plist
index 6e2c04660420..cf34859030a5 100644
--- a/www/p5-MojoMojo/pkg-plist
+++ b/www/p5-MojoMojo/pkg-plist
@@ -114,6 +114,8 @@ bin/mojomojo_update_db.pl
 %%SITE_PERL%%/MojoMojo/View/JSON.pm
 %%SITE_PERL%%/MojoMojo/View/TT.pm
 %%SITE_PERL%%/MojoMojo/WordDiff.pm
+%%SITE_PERL%%/MojoMojo/app.psgi
+%%SITE_PERL%%/MojoMojo/dotcloud.yml
 %%SITE_PERL%%/MojoMojo/mojomojo.conf
 %%SITE_PERL%%/MojoMojo/resources/logo/mmlogovector.psd
 %%SITE_PERL%%/MojoMojo/root/base/admin/create_role.tt