Index: head/www/elixir-phoenix/Makefile
===================================================================
--- head/www/elixir-phoenix/Makefile	(revision 392975)
+++ head/www/elixir-phoenix/Makefile	(revision 392976)
@@ -1,33 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	phoenix
-PORTVERSION=	0.14.0
+PORTVERSION=	0.15.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	elixir-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Web framework for Elixir
 
 LICENSE=	MIT
 
 USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	phoenixframework
 
 OPTIONS_DEFINE=	COWBOY
 COWBOY_DESC=	Use Cowboy library
 
 COWBOY_BUILD_DEPENDS=	erlang-cowboy>=0:${PORTSDIR}/www/erlang-cowboy
 COWBOY_RUN_DEPENDS=	erlang-cowboy>=0:${PORTSDIR}/www/erlang-cowboy
 
 .include <bsd.port.options.mk>
 
 MIX_BUILD_DEPS=	devel/elixir-plug \
 		devel/elixir-poison
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_EXTRA_APPS=	installer
 MIX_EXTRA_DIRS=	installer/lib installer/templates
 
 .include <bsd.port.mk>
Index: head/www/elixir-phoenix/distinfo
===================================================================
--- head/www/elixir-phoenix/distinfo	(revision 392975)
+++ head/www/elixir-phoenix/distinfo	(revision 392976)
@@ -1,2 +1,2 @@
-SHA256 (phoenixframework-phoenix-v0.14.0_GH0.tar.gz) = 2d1b7954c11e500b49497869c7da73ae16a1153e7856ca4f484e7dfd7793e4ec
-SIZE (phoenixframework-phoenix-v0.14.0_GH0.tar.gz) = 187118
+SHA256 (phoenixframework-phoenix-v0.15.0_GH0.tar.gz) = 5bf934cb725349e2f3662fc5bc4e8bf14d4a851ede105c102af620b7fb80c4ef
+SIZE (phoenixframework-phoenix-v0.15.0_GH0.tar.gz) = 196000
Index: head/www/elixir-phoenix/files/patch-mix.exs
===================================================================
--- head/www/elixir-phoenix/files/patch-mix.exs	(revision 392975)
+++ head/www/elixir-phoenix/files/patch-mix.exs	(revision 392976)
@@ -1,22 +1,11 @@
---- mix.exs.orig	2015-07-01 12:43:24 UTC
+--- mix.exs.orig	2015-07-27 12:54:35 UTC
 +++ mix.exs
-@@ -29,18 +29,7 @@ defmodule Phoenix.Mixfile do
-   end
- 
-   defp deps do
--    [{:cowboy, "~> 1.0", optional: true},
--     {:plug, "~> 0.13 or ~> 1.0"},
--     {:poison, "~> 1.3"},
--
--     # Docs dependencies
--     {:earmark, "~> 0.1", only: :docs},
--     {:ex_doc, "~> 0.7.1", only: :docs},
--     {:inch_ex, "~> 0.2", only: :docs},
--
--     # Test dependencies
--     {:phoenix_html, "~> 1.2", only: :test},
--     {:websocket_client, github: "jeremyong/websocket_client", only: :test}]
-+    []
-   end
- 
-   defp package do
+@@ -7,7 +7,7 @@ defmodule Phoenix.Mixfile do
+     [app: :phoenix,
+      version: @version,
+      elixir: "~> 1.0.2 or ~> 1.1-dev",
+-     deps: deps,
++     deps: [],
+      package: package,
+      docs: [source_ref: "v#{@version}", main: "Phoenix"],
+      name: "Phoenix",
Index: head/www/elixir-phoenix/pkg-plist
===================================================================
--- head/www/elixir-phoenix/pkg-plist	(revision 392975)
+++ head/www/elixir-phoenix/pkg-plist	(revision 392976)
@@ -1,184 +1,194 @@
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Phoenix.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Compile.Phoenix.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Digest.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Channel.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Html.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Json.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Model.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.New.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Routes.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Server.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.Server.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.Transport.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.ChannelTest.NoopSerializer.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.ChannelTest.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.CodeReloader.Proxy.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.CodeReloader.Server.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.CodeReloader.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Config.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.ConnTest.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Controller.Logger.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Controller.Pipeline.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Controller.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Digester.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Adapter.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.CowboyHandler.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.CowboyWebsocket.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.RenderErrors.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Server.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Watcher.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.MissingParamError.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Naming.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.Any.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.Atom.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.BitString.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.Integer.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.Map.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Param.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.BroadcastError.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.Local.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.PG2.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.PG2Server.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.ConsoleFormatter.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Helpers.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.NoRouteError.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Resource.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Route.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Scope.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Broadcast.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Helpers.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.InvalidMessageError.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Message.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Reply.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Router.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Supervisor.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.EExEngine.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.Engine.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.ExsEngine.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.HTML.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.UndefinedError.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.JSONSerializer.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoller.Server.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoller.Supervisor.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoller.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.Server.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.Supervisor.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPollSerializer.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.Serializer.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.WebSocket.beam
+lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.WebSocketSerializer.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.View.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.beam
 lib/elixir/lib/phoenix/ebin/phoenix.app
 lib/elixir/lib/phoenix/ebin/phoenix_new.app
 lib/elixir/lib/phoenix/installer/lib/phoenix_new.ex
 lib/elixir/lib/phoenix/installer/templates/ecto/model_case.ex
 lib/elixir/lib/phoenix/installer/templates/ecto/repo.ex
+lib/elixir/lib/phoenix/installer/templates/ecto/seeds.exs
 lib/elixir/lib/phoenix/installer/templates/new/README.md
 lib/elixir/lib/phoenix/installer/templates/new/config/config.exs
 lib/elixir/lib/phoenix/installer/templates/new/config/dev.exs
 lib/elixir/lib/phoenix/installer/templates/new/config/prod.exs
 lib/elixir/lib/phoenix/installer/templates/new/config/prod.secret.exs
 lib/elixir/lib/phoenix/installer/templates/new/config/test.exs
 lib/elixir/lib/phoenix/installer/templates/new/lib/application_name.ex
 lib/elixir/lib/phoenix/installer/templates/new/lib/application_name/endpoint.ex
 lib/elixir/lib/phoenix/installer/templates/new/mix.exs
 lib/elixir/lib/phoenix/installer/templates/new/priv/static/robots.txt
 lib/elixir/lib/phoenix/installer/templates/new/test/controllers/page_controller_test.exs
 lib/elixir/lib/phoenix/installer/templates/new/test/support/channel_case.ex
 lib/elixir/lib/phoenix/installer/templates/new/test/support/conn_case.ex
 lib/elixir/lib/phoenix/installer/templates/new/test/test_helper.exs
 lib/elixir/lib/phoenix/installer/templates/new/test/views/error_view_test.exs
+lib/elixir/lib/phoenix/installer/templates/new/test/views/layout_view_test.exs
 lib/elixir/lib/phoenix/installer/templates/new/test/views/page_view_test.exs
+lib/elixir/lib/phoenix/installer/templates/new/web/channels/user_socket.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/controllers/page_controller.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/router.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/templates/layout/app.html.eex
 lib/elixir/lib/phoenix/installer/templates/new/web/templates/page/index.html.eex
 lib/elixir/lib/phoenix/installer/templates/new/web/views/error_view.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/views/layout_view.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/views/page_view.ex
 lib/elixir/lib/phoenix/installer/templates/new/web/web.ex
 lib/elixir/lib/phoenix/installer/templates/static/app.css
 lib/elixir/lib/phoenix/installer/templates/static/bare/.gitignore
 lib/elixir/lib/phoenix/installer/templates/static/bare/app.js
 lib/elixir/lib/phoenix/installer/templates/static/brunch/.gitignore
 lib/elixir/lib/phoenix/installer/templates/static/brunch/app.js
 lib/elixir/lib/phoenix/installer/templates/static/brunch/brunch-config.js
 lib/elixir/lib/phoenix/installer/templates/static/brunch/package.json
 lib/elixir/lib/phoenix/installer/templates/static/robots.txt
 lib/elixir/lib/phoenix/lib/mix/phoenix.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/compile.phoenix.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.digest.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.channel.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.html.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.json.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.model.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.routes.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.server.ex
 lib/elixir/lib/phoenix/lib/phoenix.ex
 lib/elixir/lib/phoenix/lib/phoenix/channel.ex
 lib/elixir/lib/phoenix/lib/phoenix/channel/server.ex
 lib/elixir/lib/phoenix/lib/phoenix/channel/transport.ex
 lib/elixir/lib/phoenix/lib/phoenix/code_reloader.ex
 lib/elixir/lib/phoenix/lib/phoenix/code_reloader/proxy.ex
 lib/elixir/lib/phoenix/lib/phoenix/code_reloader/server.ex
 lib/elixir/lib/phoenix/lib/phoenix/config.ex
 lib/elixir/lib/phoenix/lib/phoenix/controller.ex
 lib/elixir/lib/phoenix/lib/phoenix/controller/logger.ex
 lib/elixir/lib/phoenix/lib/phoenix/controller/pipeline.ex
 lib/elixir/lib/phoenix/lib/phoenix/digester.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/adapter.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/cowboy_handler.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/cowboy_websocket.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/render_errors.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/server.ex
 lib/elixir/lib/phoenix/lib/phoenix/endpoint/watcher.ex
 lib/elixir/lib/phoenix/lib/phoenix/exceptions.ex
 lib/elixir/lib/phoenix/lib/phoenix/naming.ex
 lib/elixir/lib/phoenix/lib/phoenix/param.ex
 lib/elixir/lib/phoenix/lib/phoenix/pubsub.ex
 lib/elixir/lib/phoenix/lib/phoenix/pubsub/local.ex
 lib/elixir/lib/phoenix/lib/phoenix/pubsub/pg2.ex
 lib/elixir/lib/phoenix/lib/phoenix/pubsub/pg2_server.ex
 lib/elixir/lib/phoenix/lib/phoenix/router.ex
 lib/elixir/lib/phoenix/lib/phoenix/router/console_formatter.ex
 lib/elixir/lib/phoenix/lib/phoenix/router/helpers.ex
 lib/elixir/lib/phoenix/lib/phoenix/router/resource.ex
 lib/elixir/lib/phoenix/lib/phoenix/router/route.ex
 lib/elixir/lib/phoenix/lib/phoenix/router/scope.ex
 lib/elixir/lib/phoenix/lib/phoenix/socket.ex
+lib/elixir/lib/phoenix/lib/phoenix/socket/helpers.ex
+lib/elixir/lib/phoenix/lib/phoenix/socket/router.ex
 lib/elixir/lib/phoenix/lib/phoenix/supervisor.ex
 lib/elixir/lib/phoenix/lib/phoenix/template.ex
 lib/elixir/lib/phoenix/lib/phoenix/template/eex_engine.ex
 lib/elixir/lib/phoenix/lib/phoenix/template/engine.ex
 lib/elixir/lib/phoenix/lib/phoenix/template/exs_engine.ex
 lib/elixir/lib/phoenix/lib/phoenix/template/html.ex
 lib/elixir/lib/phoenix/lib/phoenix/test/channel_test.ex
 lib/elixir/lib/phoenix/lib/phoenix/test/conn_test.ex
-lib/elixir/lib/phoenix/lib/phoenix/transports/json_serializer.ex
-lib/elixir/lib/phoenix/lib/phoenix/transports/long_poller.ex
-lib/elixir/lib/phoenix/lib/phoenix/transports/long_poller/server.ex
+lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll.ex
+lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll/server.ex
+lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll_serializer.ex
 lib/elixir/lib/phoenix/lib/phoenix/transports/serializer.ex
 lib/elixir/lib/phoenix/lib/phoenix/transports/websocket.ex
+lib/elixir/lib/phoenix/lib/phoenix/transports/websocket_serializer.ex
 lib/elixir/lib/phoenix/lib/phoenix/view.ex
 lib/elixir/lib/phoenix/priv/static/favicon.ico
 lib/elixir/lib/phoenix/priv/static/phoenix.js
 lib/elixir/lib/phoenix/priv/static/phoenix.png
 lib/elixir/lib/phoenix/priv/templates/channel/channel.ex
 lib/elixir/lib/phoenix/priv/templates/channel/channel_test.exs
 lib/elixir/lib/phoenix/priv/templates/html/controller.ex
 lib/elixir/lib/phoenix/priv/templates/html/controller_test.exs
 lib/elixir/lib/phoenix/priv/templates/html/edit.html.eex
 lib/elixir/lib/phoenix/priv/templates/html/form.html.eex
 lib/elixir/lib/phoenix/priv/templates/html/index.html.eex
 lib/elixir/lib/phoenix/priv/templates/html/new.html.eex
 lib/elixir/lib/phoenix/priv/templates/html/show.html.eex
 lib/elixir/lib/phoenix/priv/templates/html/view.ex
 lib/elixir/lib/phoenix/priv/templates/json/changeset_view.ex
 lib/elixir/lib/phoenix/priv/templates/json/controller.ex
 lib/elixir/lib/phoenix/priv/templates/json/controller_test.exs
 lib/elixir/lib/phoenix/priv/templates/json/view.ex
 lib/elixir/lib/phoenix/priv/templates/model/migration.exs
 lib/elixir/lib/phoenix/priv/templates/model/model.ex
 lib/elixir/lib/phoenix/priv/templates/model/model_test.exs
 %%PORTDOCS%%%%DOCSDIR%%/README.md