5 files changed, 47 insertions, 45 deletions

diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile
index 26f750328bd5..90132e9c5223 100644
--- a/lang/elixir/Makefile
+++ b/lang/elixir/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	elixir
-PORTVERSION=	1.6.6
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.7.0
 CATEGORIES=	lang
 MASTER_SITES+=	https://github.com/elixir-lang/elixir/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/:doc
 DISTFILES=	Docs.zip:doc
diff --git a/lang/elixir/distinfo b/lang/elixir/distinfo
index 5b9b632d0c98..0d07df038a8c 100644
--- a/lang/elixir/distinfo
+++ b/lang/elixir/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1529504090
-SHA256 (elixir/1.6.6/Docs.zip) = 7ca22157333aff0426536b6f28124a12db10574b64422bf475bbed42d00ca21a
-SIZE (elixir/1.6.6/Docs.zip) = 1493023
-SHA256 (elixir/1.6.6/elixir-lang-elixir-v1.6.6_GH0.tar.gz) = 74507b0646bf485ee3af0e7727e3fdab7123f1c5ecf2187a52a928ad60f93831
-SIZE (elixir/1.6.6/elixir-lang-elixir-v1.6.6_GH0.tar.gz) = 2078742
+TIMESTAMP = 1532592678
+SHA256 (elixir/1.7.0/Docs.zip) = 01378a61dbc5d97baf97ce3a9cc7ff258405dca0a653b88060bcea0a058cd56e
+SIZE (elixir/1.7.0/Docs.zip) = 1628750
+SHA256 (elixir/1.7.0/elixir-lang-elixir-v1.7.0_GH0.tar.gz) = 791f726f7e3bb05a4620beb6191f2d758332ea7a169861b03580a16022c49a75
+SIZE (elixir/1.7.0/elixir-lang-elixir-v1.7.0_GH0.tar.gz) = 2139214
diff --git a/lang/elixir/files/patch-Makefile b/lang/elixir/files/patch-Makefile
index 20cf4a7f812b..bda921dbf561 100644
--- a/lang/elixir/files/patch-Makefile
+++ b/lang/elixir/files/patch-Makefile
@@ -1,14 +1,13 @@
---- Makefile.orig	2018-01-17 20:01:47 UTC
+--- Makefile.orig	2018-07-26 08:21:35 UTC
 +++ Makefile
-@@ -1,6 +1,7 @@
- REBAR ?= "$(CURDIR)/rebar"
+@@ -1,5 +1,6 @@
  PREFIX ?= /usr/local
  SHARE_PREFIX ?= $(PREFIX)/share
 +MAN_PREFIX ?= $(PREFIX)/man
- CANONICAL := v1.6/
+ CANONICAL := v1.7/
  ELIXIRC := bin/elixirc --verbose --ignore-module-conflict
  ERLC := erlc -I lib/elixir/include
-@@ -260,9 +261,9 @@ clean_man:
+@@ -279,9 +280,9 @@ clean_man:
  	rm -f man/iex.1.bak
  
  install_man: build_man
@@ -17,9 +16,9 @@
 -	$(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1
 -	$(Q) $(INSTALL_DATA) man/iex.1     $(DESTDIR)$(SHARE_PREFIX)/man/man1
 -	$(Q) $(INSTALL_DATA) man/mix.1     $(DESTDIR)$(SHARE_PREFIX)/man/man1
-+	$(Q) mkdir -p $(DESTDIR)$(MAN_PREFIX)/man/man1
-+	$(Q) $(INSTALL_DATA) man/elixir.1  $(DESTDIR)$(MAN_PREFIX)/man/man1
-+	$(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(MAN_PREFIX)/man/man1
-+	$(Q) $(INSTALL_DATA) man/iex.1     $(DESTDIR)$(MAN_PREFIX)/man/man1
-+	$(Q) $(INSTALL_DATA) man/mix.1     $(DESTDIR)$(MAN_PREFIX)/man/man1
++	$(Q) mkdir -p $(DESTDIR)$(MAN_PREFIX)/man1
++	$(Q) $(INSTALL_DATA) man/elixir.1  $(DESTDIR)$(MAN_PREFIX)/man1
++	$(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(MAN_PREFIX)/man1
++	$(Q) $(INSTALL_DATA) man/iex.1     $(DESTDIR)$(MAN_PREFIX)/man1
++	$(Q) $(INSTALL_DATA) man/mix.1     $(DESTDIR)$(MAN_PREFIX)/man1
  	$(MAKE) clean_man
diff --git a/lang/elixir/files/patch-bin_elixir b/lang/elixir/files/patch-bin_elixir
index 231282d0eabc..012e2536f95a 100644
--- a/lang/elixir/files/patch-bin_elixir
+++ b/lang/elixir/files/patch-bin_elixir
@@ -1,7 +1,7 @@
---- bin/elixir.orig	2018-01-17 18:20:24 UTC
+--- bin/elixir.orig	2018-07-26 08:21:44 UTC
 +++ bin/elixir
-@@ -124,4 +124,16 @@ if [ -z "$ERL_PATH" ]; then
-   fi
+@@ -120,4 +120,16 @@ if [ -z "$ERL_PATH" ]; then
+   ERL_PATH="$ERL_EXEC"
  fi
  
 -exec "$ERL_PATH" -pa "$SCRIPT_PATH"/../lib/*/ebin $ELIXIR_ERL_OPTIONS $ERL -extra "$@"
diff --git a/lang/elixir/pkg-plist b/lang/elixir/pkg-plist
index 9cdcdc48b5d4..a7c9c7ef839d 100644
--- a/lang/elixir/pkg-plist
+++ b/lang/elixir/pkg-plist
@@ -39,6 +39,7 @@ lib/elixir/lib/elixir/ebin/Elixir.CaseClauseError.beam
 lib/elixir/lib/elixir/ebin/Elixir.Code.Formatter.beam
 lib/elixir/lib/elixir/ebin/Elixir.Code.Identifier.beam
 lib/elixir/lib/elixir/ebin/Elixir.Code.LoadError.beam
+lib/elixir/lib/elixir/ebin/Elixir.Code.Typespec.beam
 lib/elixir/lib/elixir/ebin/Elixir.Code.beam
 lib/elixir/lib/elixir/ebin/Elixir.Collectable.BitString.beam
 lib/elixir/lib/elixir/ebin/Elixir.Collectable.File.Stream.beam
@@ -82,6 +83,7 @@ lib/elixir/lib/elixir/ebin/Elixir.File.Stream.beam
 lib/elixir/lib/elixir/ebin/Elixir.File.beam
 lib/elixir/lib/elixir/ebin/Elixir.Float.beam
 lib/elixir/lib/elixir/ebin/Elixir.FunctionClauseError.beam
+lib/elixir/lib/elixir/ebin/Elixir.Function.beam
 lib/elixir/lib/elixir/ebin/Elixir.GenEvent.Stream.beam
 lib/elixir/lib/elixir/ebin/Elixir.GenEvent.beam
 lib/elixir/lib/elixir/ebin/Elixir.GenServer.beam
@@ -265,6 +267,7 @@ lib/elixir/lib/elixir/ebin/elixir_utils.beam
 %%SRC%%lib/elixir/lib/elixir/lib/code.ex
 %%SRC%%lib/elixir/lib/elixir/lib/code/formatter.ex
 %%SRC%%lib/elixir/lib/elixir/lib/code/identifier.ex
+%%SRC%%lib/elixir/lib/elixir/lib/code/typespec.ex
 %%SRC%%lib/elixir/lib/elixir/lib/collectable.ex
 %%SRC%%lib/elixir/lib/elixir/lib/dict.ex
 %%SRC%%lib/elixir/lib/elixir/lib/dynamic_supervisor.ex
@@ -274,6 +277,7 @@ lib/elixir/lib/elixir/ebin/elixir_utils.beam
 %%SRC%%lib/elixir/lib/elixir/lib/file/stat.ex
 %%SRC%%lib/elixir/lib/elixir/lib/file/stream.ex
 %%SRC%%lib/elixir/lib/elixir/lib/float.ex
+%%SRC%%lib/elixir/lib/elixir/lib/function.ex
 %%SRC%%lib/elixir/lib/elixir/lib/gen_event.ex
 %%SRC%%lib/elixir/lib/elixir/lib/gen_event/stream.ex
 %%SRC%%lib/elixir/lib/elixir/lib/gen_server.ex
@@ -346,6 +350,7 @@ lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.DocTest.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.DuplicateDescribeError.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.DuplicateTestError.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.EventManager.beam
+lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.FailuresManifest.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.Filters.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.Formatter.beam
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.MultiError.beam
@@ -371,6 +376,7 @@ lib/elixir/lib/ex_unit/ebin/ex_unit.app
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/diff.ex
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/doc_test.ex
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/event_manager.ex
+%%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/failures_manifest.ex
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/filters.ex
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/formatter.ex
 %%SRC%%lib/elixir/lib/ex_unit/lib/ex_unit/on_exit_handler.ex
@@ -447,8 +453,6 @@ lib/elixir/lib/mix/ebin/Elixir.Mix.CLI.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Compilers.Elixir.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Compilers.Erlang.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Compilers.Test.beam
-lib/elixir/lib/mix/ebin/Elixir.Mix.Config.Agent.beam
-lib/elixir/lib/mix/ebin/Elixir.Mix.Config.LoadError.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Config.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Dep.Converger.beam
 lib/elixir/lib/mix/ebin/Elixir.Mix.Dep.ElixirSCM.beam
@@ -541,7 +545,6 @@ lib/elixir/lib/mix/ebin/mix.app
 %%SRC%%lib/elixir/lib/mix/lib/mix/compilers/erlang.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/compilers/test.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/config.ex
-%%SRC%%lib/elixir/lib/mix/lib/mix/config/agent.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/dep.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/dep/converger.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/dep/elixir_scm.ex
@@ -619,10 +622,10 @@ lib/elixir/lib/mix/ebin/mix.app
 %%SRC%%lib/elixir/lib/mix/lib/mix/tasks/xref.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/tasks_server.ex
 %%SRC%%lib/elixir/lib/mix/lib/mix/utils.ex
-man/man/man1/elixir.1.gz
-man/man/man1/elixirc.1.gz
-man/man/man1/iex.1.gz
-man/man/man1/mix.1.gz
+man/man1/elixir.1.gz
+man/man1/elixirc.1.gz
+man/man1/iex.1.gz
+man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/eex/404.html
 %%PORTDOCS%%%%DOCSDIR%%/eex/EEx.Engine.html
 %%PORTDOCS%%%%DOCSDIR%%/eex/EEx.SmartEngine.html
@@ -630,9 +633,9 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/eex/EEx.html
 %%PORTDOCS%%%%DOCSDIR%%/eex/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/eex/assets/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/eex/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/eex/dist/app-9bd040e5e5.js
-%%PORTDOCS%%%%DOCSDIR%%/eex/dist/sidebar_items-3d8aba096e.js
+%%PORTDOCS%%%%DOCSDIR%%/eex/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/eex/dist/app-a0c90688fa.js
+%%PORTDOCS%%%%DOCSDIR%%/eex/dist/sidebar_items-b44f37d3d1.js
 %%PORTDOCS%%%%DOCSDIR%%/eex/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/eex/fonts/icomoon.svg
 %%PORTDOCS%%%%DOCSDIR%%/eex/fonts/icomoon.ttf
@@ -680,6 +683,7 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/elixir/File.Stream.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/File.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/Float.html
+%%PORTDOCS%%%%DOCSDIR%%/elixir/Function.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/FunctionClauseError.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/GenEvent.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/GenServer.html
@@ -748,15 +752,16 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/elixir/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/assets/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/elixir/compatibility-and-deprecations.html
-%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/app-9bd040e5e5.js
-%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/sidebar_items-981721abf5.js
+%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/app-a0c90688fa.js
+%%PORTDOCS%%%%DOCSDIR%%/elixir/dist/sidebar_items-cdf4e58b19.js
 %%PORTDOCS%%%%DOCSDIR%%/elixir/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/elixir/fonts/icomoon.svg
 %%PORTDOCS%%%%DOCSDIR%%/elixir/fonts/icomoon.ttf
 %%PORTDOCS%%%%DOCSDIR%%/elixir/fonts/icomoon.woff
 %%PORTDOCS%%%%DOCSDIR%%/elixir/guards.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/index.html
+%%PORTDOCS%%%%DOCSDIR%%/elixir/library-guidelines.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/naming-conventions.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/operators.html
 %%PORTDOCS%%%%DOCSDIR%%/elixir/search.html
@@ -785,9 +790,9 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/ExUnit.html
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/assets/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/app-9bd040e5e5.js
-%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/sidebar_items-dad54ee519.js
+%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/app-a0c90688fa.js
+%%PORTDOCS%%%%DOCSDIR%%/ex_unit/dist/sidebar_items-ca7df477cf.js
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/fonts/icomoon.svg
 %%PORTDOCS%%%%DOCSDIR%%/ex_unit/fonts/icomoon.ttf
@@ -801,9 +806,9 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/iex/IEx.html
 %%PORTDOCS%%%%DOCSDIR%%/iex/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/iex/assets/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/iex/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/iex/dist/app-9bd040e5e5.js
-%%PORTDOCS%%%%DOCSDIR%%/iex/dist/sidebar_items-0fe817f50a.js
+%%PORTDOCS%%%%DOCSDIR%%/iex/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/iex/dist/app-a0c90688fa.js
+%%PORTDOCS%%%%DOCSDIR%%/iex/dist/sidebar_items-6ccc90797b.js
 %%PORTDOCS%%%%DOCSDIR%%/iex/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/iex/fonts/icomoon.svg
 %%PORTDOCS%%%%DOCSDIR%%/iex/fonts/icomoon.ttf
@@ -816,8 +821,8 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/logger/Logger.html
 %%PORTDOCS%%%%DOCSDIR%%/logger/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/logger/assets/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/logger/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/logger/dist/app-9bd040e5e5.js
+%%PORTDOCS%%%%DOCSDIR%%/logger/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/logger/dist/app-a0c90688fa.js
 %%PORTDOCS%%%%DOCSDIR%%/logger/dist/sidebar_items-17aeec0e2f.js
 %%PORTDOCS%%%%DOCSDIR%%/logger/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/logger/fonts/icomoon.svg
@@ -826,7 +831,6 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/logger/index.html
 %%PORTDOCS%%%%DOCSDIR%%/logger/search.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/404.html
-%%PORTDOCS%%%%DOCSDIR%%/mix/Mix.Config.LoadError.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/Mix.Config.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/Mix.ElixirVersionError.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/Mix.Error.html
@@ -893,9 +897,9 @@ man/man/man1/mix.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/mix/Mix.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/api-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/mix/assets/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/mix/dist/app-480ffdc169.css
-%%PORTDOCS%%%%DOCSDIR%%/mix/dist/app-9bd040e5e5.js
-%%PORTDOCS%%%%DOCSDIR%%/mix/dist/sidebar_items-4651b5ba74.js
+%%PORTDOCS%%%%DOCSDIR%%/mix/dist/app-4b38423804.css
+%%PORTDOCS%%%%DOCSDIR%%/mix/dist/app-a0c90688fa.js
+%%PORTDOCS%%%%DOCSDIR%%/mix/dist/sidebar_items-0c0044e6e4.js
 %%PORTDOCS%%%%DOCSDIR%%/mix/fonts/icomoon.eot
 %%PORTDOCS%%%%DOCSDIR%%/mix/fonts/icomoon.svg
 %%PORTDOCS%%%%DOCSDIR%%/mix/fonts/icomoon.ttf