Rename p5-Mojo to p5-Mojolicious to reflect distname in CPAN.

Approved by:	maintainer

7 files changed, 4 insertions, 246 deletions

diff --git a/www/Makefile b/www/Makefile
index 64052cee220b..d6cc00ac38c4 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1088,7 +1088,7 @@
     SUBDIR += p5-Maypole-Component
     SUBDIR += p5-MediaWiki
     SUBDIR += p5-MediaWiki-API
-    SUBDIR += p5-Mojo
+    SUBDIR += p5-Mojolicious
     SUBDIR += p5-MojoMojo
     SUBDIR += p5-Net-Akismet
     SUBDIR += p5-Net-Amazon-AWIS
diff --git a/www/p5-AnyEvent-Mojo/Makefile b/www/p5-AnyEvent-Mojo/Makefile
index ccfabfa5d4a4..ef77474facdd 100644
--- a/www/p5-AnyEvent-Mojo/Makefile
+++ b/www/p5-AnyEvent-Mojo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	AnyEvent-Mojo
 PORTVERSION=	0.8003
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,7 +18,7 @@ COMMENT=	Perl extension to start async Mojo servers easily
 RUN_DEPENDS=	\
 	p5-AnyEvent>=5.201:${PORTSDIR}/devel/p5-AnyEvent \
 	p5-AnyEvent-HTTP>=1.43:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-	p5-Mojo>=0.991251:${PORTSDIR}/www/p5-Mojo
+	p5-Mojolicious>=0.991251:${PORTSDIR}/www/p5-Mojolicious
 #	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
 #	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Mojo/Makefile b/www/p5-Mojo/Makefile
deleted file mode 100644
index ebf00d614680..000000000000
--- a/www/p5-Mojo/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# New ports collection makefile for:	p5-Mojo
-# Date created:		2008-12-29
-# Whom:			Murilo Opsfelder <mopsfelder@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Mojo
-PORTVERSION=	0.999941
-CATEGORIES=	www perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Mojolicious
-PKGNAMEPREFIX=	p5-
-DISTNAME=	Mojolicious-${PORTVERSION}
-
-MAINTAINER=	mopsfelder@gmail.com
-COMMENT=	A high level MVC web framework written in Perl
-
-PERL_CONFIGURE=	yes
-
-MAN1=		mojo.1
-MAN3=		Mojo.3 \
-		Mojo::Asset.3 \
-		Mojo::Asset::File.3 \
-		Mojo::Asset::Memory.3 \
-		Mojo::Base.3 \
-		Mojo::ByteStream.3 \
-		Mojo::Client.3 \
-		Mojo::Command.3 \
-		Mojo::Content.3 \
-		Mojo::Content::MultiPart.3 \
-		Mojo::Content::Single.3 \
-		Mojo::Cookie.3 \
-		Mojo::Cookie::Request.3 \
-		Mojo::Cookie::Response.3 \
-		Mojo::CookieJar.3 \
-		Mojo::DOM.3 \
-		Mojo::Date.3 \
-		Mojo::Exception.3 \
-		Mojo::Headers.3 \
-		Mojo::HelloWorld.3 \
-		Mojo::Home.3 \
-		Mojo::IOLoop.3 \
-		Mojo::JSON.3 \
-		Mojo::Loader.3 \
-		Mojo::Log.3 \
-		Mojo::Message.3 \
-		Mojo::Message::Request.3 \
-		Mojo::Message::Response.3 \
-		Mojo::Parameters.3 \
-		Mojo::Path.3 \
-		Mojo::Server.3 \
-		Mojo::Server::CGI.3 \
-		Mojo::Server::Daemon.3 \
-		Mojo::Server::FastCGI.3 \
-		Mojo::Server::PSGI.3 \
-		Mojo::Template.3 \
-		Mojo::Transaction.3 \
-		Mojo::Transaction::HTTP.3 \
-		Mojo::Transaction::WebSocket.3 \
-		Mojo::URL.3 \
-		Mojo::Upload.3 \
-		Mojo::Util.3 \
-		Mojolicious.3 \
-		Mojolicious::Command::Cgi.3 \
-		Mojolicious::Command::Daemon.3 \
-		Mojolicious::Command::Fastcgi.3 \
-		Mojolicious::Command::Generate.3 \
-		Mojolicious::Command::Generate::App.3 \
-		Mojolicious::Command::Generate::Gitignore.3 \
-		Mojolicious::Command::Generate::LiteApp.3 \
-		Mojolicious::Command::Generate::Makefile.3 \
-		Mojolicious::Command::Get.3 \
-		Mojolicious::Command::Inflate.3 \
-		Mojolicious::Command::Psgi.3 \
-		Mojolicious::Command::Routes.3 \
-		Mojolicious::Command::Test.3 \
-		Mojolicious::Command::Version.3 \
-		Mojolicious::Commands.3 \
-		Mojolicious::Controller.3 \
-		Mojolicious::Guides.3 \
-		Mojolicious::Guides::Cheatsheet.3 \
-		Mojolicious::Guides::CodingGuidelines.3 \
-		Mojolicious::Guides::Cookbook.3 \
-		Mojolicious::Guides::FAQ.3 \
-		Mojolicious::Guides::Rendering.3 \
-		Mojolicious::Guides::Routing.3 \
-		Mojolicious::Lite.3 \
-		Mojolicious::Plugin.3 \
-		Mojolicious::Plugin::AgentCondition.3 \
-		Mojolicious::Plugin::Charset.3 \
-		Mojolicious::Plugin::DefaultHelpers.3 \
-		Mojolicious::Plugin::EpRenderer.3 \
-		Mojolicious::Plugin::EplRenderer.3 \
-		Mojolicious::Plugin::HeaderCondition.3 \
-		Mojolicious::Plugin::I18n.3 \
-		Mojolicious::Plugin::JsonConfig.3 \
-		Mojolicious::Plugin::PodRenderer.3 \
-		Mojolicious::Plugin::PoweredBy.3 \
-		Mojolicious::Plugin::RequestTimer.3 \
-		Mojolicious::Plugin::TagHelpers.3 \
-		Mojolicious::Plugins.3 \
-		Mojolicious::Renderer.3 \
-		Mojolicious::Routes.3 \
-		Mojolicious::Routes::Match.3 \
-		Mojolicious::Routes::Pattern.3 \
-		Mojolicious::Session.3 \
-		Mojolicious::Static.3 \
-		Mojolicious::Types.3 \
-		Test::Mojo.3 \
-		README.3 \
-		ojo.3
-
-.include <bsd.port.mk>
diff --git a/www/p5-Mojo/distinfo b/www/p5-Mojo/distinfo
deleted file mode 100644
index ee40d110301c..000000000000
--- a/www/p5-Mojo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Mojolicious-0.999941.tar.gz) = ca859091911d015216fd87fd0ebf9559678b19a253184cc888d76665cc843f3f
-SIZE (Mojolicious-0.999941.tar.gz) = 278601
diff --git a/www/p5-Mojo/pkg-descr b/www/p5-Mojo/pkg-descr
deleted file mode 100644
index c28dbbbeeba1..000000000000
--- a/www/p5-Mojo/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A next generation web framework for the Perl programming language.
-The core of Mojolicious is a new implementation of the famous Routes
-concept, utilizing some advanced techniques from Catalyst.
-You can find help via mailing list http://lists.kraih.com/ or via
-IRC irc://irc.perl.org/#mojo
-
-WWW:	http://mojolicious.org/
diff --git a/www/p5-Mojo/pkg-plist b/www/p5-Mojo/pkg-plist
deleted file mode 100644
index 15755a5dec56..000000000000
--- a/www/p5-Mojo/pkg-plist
+++ /dev/null
@@ -1,119 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/.packlist
-%%SITE_PERL%%/Mojo.pm
-%%SITE_PERL%%/Mojo/Asset.pm
-%%SITE_PERL%%/Mojo/Asset/File.pm
-%%SITE_PERL%%/Mojo/Asset/Memory.pm
-%%SITE_PERL%%/Mojo/Base.pm
-%%SITE_PERL%%/Mojo/ByteStream.pm
-%%SITE_PERL%%/Mojo/Client.pm
-%%SITE_PERL%%/Mojo/Command.pm
-%%SITE_PERL%%/Mojo/Content.pm
-%%SITE_PERL%%/Mojo/Content/MultiPart.pm
-%%SITE_PERL%%/Mojo/Content/Single.pm
-%%SITE_PERL%%/Mojo/Cookie.pm
-%%SITE_PERL%%/Mojo/Cookie/Request.pm
-%%SITE_PERL%%/Mojo/Cookie/Response.pm
-%%SITE_PERL%%/Mojo/CookieJar.pm
-%%SITE_PERL%%/Mojo/DOM.pm
-%%SITE_PERL%%/Mojo/Date.pm
-%%SITE_PERL%%/Mojo/Exception.pm
-%%SITE_PERL%%/Mojo/Headers.pm
-%%SITE_PERL%%/Mojo/HelloWorld.pm
-%%SITE_PERL%%/Mojo/Home.pm
-%%SITE_PERL%%/Mojo/IOLoop.pm
-%%SITE_PERL%%/Mojo/JSON.pm
-%%SITE_PERL%%/Mojo/Loader.pm
-%%SITE_PERL%%/Mojo/Log.pm
-%%SITE_PERL%%/Mojo/Message.pm
-%%SITE_PERL%%/Mojo/Message/Request.pm
-%%SITE_PERL%%/Mojo/Message/Response.pm
-%%SITE_PERL%%/Mojo/Parameters.pm
-%%SITE_PERL%%/Mojo/Path.pm
-%%SITE_PERL%%/Mojo/Server.pm
-%%SITE_PERL%%/Mojo/Server/CGI.pm
-%%SITE_PERL%%/Mojo/Server/Daemon.pm
-%%SITE_PERL%%/Mojo/Server/FastCGI.pm
-%%SITE_PERL%%/Mojo/Server/PSGI.pm
-%%SITE_PERL%%/Mojo/Template.pm
-%%SITE_PERL%%/Mojo/Transaction.pm
-%%SITE_PERL%%/Mojo/Transaction/HTTP.pm
-%%SITE_PERL%%/Mojo/Transaction/WebSocket.pm
-%%SITE_PERL%%/Mojo/URL.pm
-%%SITE_PERL%%/Mojo/Upload.pm
-%%SITE_PERL%%/Mojo/Util.pm
-%%SITE_PERL%%/Mojolicious.pm
-%%SITE_PERL%%/Mojolicious/Command/Cgi.pm
-%%SITE_PERL%%/Mojolicious/Command/Daemon.pm
-%%SITE_PERL%%/Mojolicious/Command/Fastcgi.pm
-%%SITE_PERL%%/Mojolicious/Command/Generate.pm
-%%SITE_PERL%%/Mojolicious/Command/Generate/App.pm
-%%SITE_PERL%%/Mojolicious/Command/Generate/Gitignore.pm
-%%SITE_PERL%%/Mojolicious/Command/Generate/LiteApp.pm
-%%SITE_PERL%%/Mojolicious/Command/Generate/Makefile.pm
-%%SITE_PERL%%/Mojolicious/Command/Get.pm
-%%SITE_PERL%%/Mojolicious/Command/Inflate.pm
-%%SITE_PERL%%/Mojolicious/Command/Psgi.pm
-%%SITE_PERL%%/Mojolicious/Command/Routes.pm
-%%SITE_PERL%%/Mojolicious/Command/Test.pm
-%%SITE_PERL%%/Mojolicious/Command/Version.pm
-%%SITE_PERL%%/Mojolicious/Commands.pm
-%%SITE_PERL%%/Mojolicious/Controller.pm
-%%SITE_PERL%%/Mojolicious/Guides.pod
-%%SITE_PERL%%/Mojolicious/Guides/Cheatsheet.pod
-%%SITE_PERL%%/Mojolicious/Guides/CodingGuidelines.pod
-%%SITE_PERL%%/Mojolicious/Guides/Cookbook.pod
-%%SITE_PERL%%/Mojolicious/Guides/FAQ.pod
-%%SITE_PERL%%/Mojolicious/Guides/Rendering.pod
-%%SITE_PERL%%/Mojolicious/Guides/Routing.pod
-%%SITE_PERL%%/Mojolicious/Lite.pm
-%%SITE_PERL%%/Mojolicious/Plugin.pm
-%%SITE_PERL%%/Mojolicious/Plugin/AgentCondition.pm
-%%SITE_PERL%%/Mojolicious/Plugin/Charset.pm
-%%SITE_PERL%%/Mojolicious/Plugin/DefaultHelpers.pm
-%%SITE_PERL%%/Mojolicious/Plugin/EpRenderer.pm
-%%SITE_PERL%%/Mojolicious/Plugin/EplRenderer.pm
-%%SITE_PERL%%/Mojolicious/Plugin/HeaderCondition.pm
-%%SITE_PERL%%/Mojolicious/Plugin/I18n.pm
-%%SITE_PERL%%/Mojolicious/Plugin/JsonConfig.pm
-%%SITE_PERL%%/Mojolicious/Plugin/PodRenderer.pm
-%%SITE_PERL%%/Mojolicious/Plugin/PoweredBy.pm
-%%SITE_PERL%%/Mojolicious/Plugin/RequestTimer.pm
-%%SITE_PERL%%/Mojolicious/Plugin/TagHelpers.pm
-%%SITE_PERL%%/Mojolicious/Plugins.pm
-%%SITE_PERL%%/Mojolicious/Renderer.pm
-%%SITE_PERL%%/Mojolicious/Routes.pm
-%%SITE_PERL%%/Mojolicious/Routes/Match.pm
-%%SITE_PERL%%/Mojolicious/Routes/Pattern.pm
-%%SITE_PERL%%/Mojolicious/Session.pm
-%%SITE_PERL%%/Mojolicious/Static.pm
-%%SITE_PERL%%/Mojolicious/Types.pm
-%%SITE_PERL%%/README.pod
-%%SITE_PERL%%/Test/Mojo.pm
-%%SITE_PERL%%/ojo.pm
-bin/mojo
-@dirrmtry %%SITE_PERL%%/Test
-@dirrmtry %%SITE_PERL%%/Mojolicious/Routes
-@dirrmtry %%SITE_PERL%%/Mojolicious/Plugin
-@dirrmtry %%SITE_PERL%%/Mojolicious/Guides
-@dirrmtry %%SITE_PERL%%/Mojolicious/Command/Generate
-@dirrmtry %%SITE_PERL%%/Mojolicious/Command
-@dirrmtry %%SITE_PERL%%/Mojolicious
-@dirrmtry %%SITE_PERL%%/MojoX/Session/Cookie
-@dirrmtry %%SITE_PERL%%/MojoX/Session
-@dirrmtry %%SITE_PERL%%/MojoX/Routes
-@dirrmtry %%SITE_PERL%%/MojoX/Dispatcher/Routes
-@dirrmtry %%SITE_PERL%%/MojoX/Dispatcher
-@dirrmtry %%SITE_PERL%%/MojoX
-@dirrmtry %%SITE_PERL%%/Mojo/Transaction
-@dirrmtry %%SITE_PERL%%/Mojo/Template
-@dirrmtry %%SITE_PERL%%/Mojo/Server/Daemon
-@dirrmtry %%SITE_PERL%%/Mojo/Server
-@dirrmtry %%SITE_PERL%%/Mojo/Message
-@dirrmtry %%SITE_PERL%%/Mojo/Filter
-@dirrmtry %%SITE_PERL%%/Mojo/Cookie
-@dirrmtry %%SITE_PERL%%/Mojo/Content
-@dirrmtry %%SITE_PERL%%/Mojo/Command/Generate
-@dirrmtry %%SITE_PERL%%/Mojo/Command
-@dirrmtry %%SITE_PERL%%/Mojo/Asset
-@dirrmtry %%SITE_PERL%%/Mojo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index ebf00d614680..9817a0a5d2d0 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Mojo
+PORTNAME=	Mojolicious
 PORTVERSION=	0.999941
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Mojolicious
 PKGNAMEPREFIX=	p5-
-DISTNAME=	Mojolicious-${PORTVERSION}
 
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	A high level MVC web framework written in Perl