4 files changed, 30 insertions, 32 deletions

diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile
index 4d7ef36c2661..7ea5494b7c8b 100644
--- a/www/elixir-phoenix/Makefile
+++ b/www/elixir-phoenix/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	phoenix
-PORTVERSION=	0.14.0
+PORTVERSION=	0.15.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	elixir-
 
diff --git a/www/elixir-phoenix/distinfo b/www/elixir-phoenix/distinfo
index 581e2f5ba963..64ca077e8252 100644
--- a/www/elixir-phoenix/distinfo
+++ b/www/elixir-phoenix/distinfo
@@ -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
diff --git a/www/elixir-phoenix/files/patch-mix.exs b/www/elixir-phoenix/files/patch-mix.exs
index 710f736fb6d3..ccef134c77f7 100644
--- a/www/elixir-phoenix/files/patch-mix.exs
+++ b/www/elixir-phoenix/files/patch-mix.exs
@@ -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",
diff --git a/www/elixir-phoenix/pkg-plist b/www/elixir-phoenix/pkg-plist
index a281ec3b65ec..0a8c17de57a0 100644
--- a/www/elixir-phoenix/pkg-plist
+++ b/www/elixir-phoenix/pkg-plist
@@ -11,6 +11,7 @@ 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
@@ -49,9 +50,11 @@ 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
@@ -60,12 +63,13 @@ 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
@@ -73,6 +77,7 @@ 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
@@ -88,7 +93,9 @@ 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
@@ -147,6 +154,8 @@ 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
@@ -155,11 +164,12 @@ 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