Update www/elixir-phoenix to version 1.2.0.

4 files changed, 20 insertions, 26 deletions

diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile
index 088d32225199..dedb9cf0a1e2 100644
--- a/www/elixir-phoenix/Makefile
+++ b/www/elixir-phoenix/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	phoenix
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	elixir-
@@ -24,9 +24,11 @@ COWBOY_RUN_DEPENDS=	erlang-cowboy>=0:www/erlang-cowboy
 .include <bsd.port.options.mk>
 
 MIX_BUILD_DEPS=	devel/elixir-plug \
-		devel/elixir-poison
+		devel/elixir-poison \
+		www/elixir-phoenix_pubsub
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_EXTRA_APPS=	installer
 MIX_EXTRA_DIRS=	installer/lib installer/templates
+MIX_REWRITE=	yes
 
 .include <bsd.port.mk>
diff --git a/www/elixir-phoenix/distinfo b/www/elixir-phoenix/distinfo
index d4c8e3698736..93c993c0b200 100644
--- a/www/elixir-phoenix/distinfo
+++ b/www/elixir-phoenix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465030312
-SHA256 (phoenixframework-phoenix-v1.1.6_GH0.tar.gz) = 2fbe4ce0debd9b33e950cc8d89a44e32c305f5466497549ca287ef37808e926b
-SIZE (phoenixframework-phoenix-v1.1.6_GH0.tar.gz) = 253106
+TIMESTAMP = 1466848854
+SHA256 (phoenixframework-phoenix-v1.2.0_GH0.tar.gz) = 4367da66a1693be8f00ac57e99f5cbad6dff83e2a9e9d8f6aab0eca1d3c4da64
+SIZE (phoenixframework-phoenix-v1.2.0_GH0.tar.gz) = 264177
diff --git a/www/elixir-phoenix/files/patch-mix.exs b/www/elixir-phoenix/files/patch-mix.exs
index 126e5188c086..202faadd8b6f 100644
--- a/www/elixir-phoenix/files/patch-mix.exs
+++ b/www/elixir-phoenix/files/patch-mix.exs
@@ -1,10 +1,10 @@
---- mix.exs.orig	2015-12-26 20:08:46 UTC
+--- mix.exs.orig	2016-07-07 13:08:02 UTC
 +++ mix.exs
 @@ -7,7 +7,6 @@ defmodule Phoenix.Mixfile do
      [app: :phoenix,
       version: @version,
-      elixir: "~> 1.0.2 or ~> 1.1",
--     deps: deps,
-      package: package,
+      elixir: "~> 1.2",
+-     deps: deps(),
+      package: package(),
  
       # Because we define protocols on the fly to test
diff --git a/www/elixir-phoenix/pkg-plist b/www/elixir-phoenix/pkg-plist
index 5a432cb3daf4..c9e606867fe7 100644
--- a/www/elixir-phoenix/pkg-plist
+++ b/www/elixir-phoenix/pkg-plist
@@ -6,6 +6,7 @@ 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.Gen.Presence.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Secret.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.New.beam
 lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Routes.beam
@@ -20,7 +21,6 @@ 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
@@ -33,21 +33,17 @@ 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.Logger.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.NotAcceptableError.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.GC.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.Local.beam
-lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.PubSub.LocalSupervisor.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.Presence.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
@@ -116,13 +112,12 @@ 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/brunch/socket.js
+lib/elixir/lib/phoenix/installer/templates/static/phoenix.css
 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
@@ -131,6 +126,7 @@ 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.gen.presence.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.secret.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.routes.ex
 lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.server.ex
@@ -142,7 +138,6 @@ 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
@@ -155,14 +150,10 @@ 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/logger.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/gc.ex
-lib/elixir/lib/phoenix/lib/phoenix/pubsub/local.ex
-lib/elixir/lib/phoenix/lib/phoenix/pubsub/local_supervisor.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/presence.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
@@ -208,4 +199,5 @@ lib/elixir/lib/phoenix/priv/templates/phoenix.gen.json/view.ex
 lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/migration.exs
 lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/model.ex
 lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/model_test.exs
+lib/elixir/lib/phoenix/priv/templates/phoenix.gen.presence/presence.ex
 %%PORTDOCS%%%%DOCSDIR%%/README.md