2 files changed, 67 insertions, 0 deletions

diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile
index 58372ccd438b..93916d40e715 100644
--- a/www/elixir-phoenix/Makefile
+++ b/www/elixir-phoenix/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	phoenix
 PORTVERSION=	0.14.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	elixir-
 
@@ -29,6 +30,7 @@ COWBOY_RUN_DEPENDS=	erlang-cowboy>=0:${PORTSDIR}/www/erlang-cowboy
 
 do-build:
 	@cd ${WRKSRC} && LANG=en_US.UTF-8 MIX_ENV=prod mix compile
+	@cd ${WRKSRC}/installer && LANG=en_US.UTF-8 MIX_ENV=prod mix compile
 
 post-build:
 	@${LN} -s ${WRKSRC}/_build/prod/lib/${PORTNAME}/ebin ${WRKSRC}/ebin
@@ -38,8 +40,16 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/ebin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/installer
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/lib
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/priv
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/ebin
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/lib
+	cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/priv
+.for dir in lib templates
+	cd ${WRKSRC}/installer && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/installer
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/installer/_build/prod/lib/phoenix_new/ebin/* \
+		${STAGEDIR}${PREFIX}/lib/elixir/lib/${PORTNAME}/ebin
 
 .include <bsd.port.mk>
diff --git a/www/elixir-phoenix/pkg-plist b/www/elixir-phoenix/pkg-plist
index be01a28b3a95..a281ec3b65ec 100644
--- a/www/elixir-phoenix/pkg-plist
+++ b/www/elixir-phoenix/pkg-plist
@@ -5,6 +5,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.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
@@ -68,6 +69,42 @@ lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.WebSocket.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/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/page_view_test.exs
+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
@@ -124,4 +161,24 @@ lib/elixir/lib/phoenix/lib/phoenix/transports/long_poller/server.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/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