4 files changed, 34 insertions, 41 deletions

diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile
index 42c43a427abc..baa7b337e400 100644
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ecto
-PORTVERSION=	1.1.8
+PORTVERSION=	2.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 USES=		elixir
 USE_GITHUB=	yes
-GH_ACCOUNT=	elixir-lang
+GH_ACCOUNT=	elixir-ecto
 
 OPTIONS_DEFINE=	POSTGREX MARIAEX
 OPTIONS_SUB=	yes
diff --git a/databases/elixir-ecto/distinfo b/databases/elixir-ecto/distinfo
index 8b89d632793e..3440853fe96e 100644
--- a/databases/elixir-ecto/distinfo
+++ b/databases/elixir-ecto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464618454
-SHA256 (elixir-lang-ecto-v1.1.8_GH0.tar.gz) = db1f818b1ab803cfb73eec26f68228a9153c3a5d374ab7d9966f83fdb0a699dd
-SIZE (elixir-lang-ecto-v1.1.8_GH0.tar.gz) = 222625
+TIMESTAMP = 1467120235
+SHA256 (elixir-ecto-ecto-v2.0.2_GH0.tar.gz) = c891b7b1aa8ba1f50f7c520c11319f0cc7dd694af800268f347dcc6b71e14d07
+SIZE (elixir-ecto-ecto-v2.0.2_GH0.tar.gz) = 261355
diff --git a/databases/elixir-ecto/files/patch-mix.exs b/databases/elixir-ecto/files/patch-mix.exs
deleted file mode 100644
index 103339b416de..000000000000
--- a/databases/elixir-ecto/files/patch-mix.exs
+++ /dev/null
@@ -1,11 +0,0 @@
---- mix.exs.orig	2015-07-19 17:59:14 UTC
-+++ mix.exs
-@@ -9,7 +9,7 @@ defmodule Ecto.Mixfile do
-     [app: :ecto,
-      version: @version,
-      elixir: "~> 1.0",
--     deps: deps,
-+     deps: [],
-      build_per_environment: false,
-      test_paths: test_paths(Mix.env),
- 
diff --git a/databases/elixir-ecto/pkg-plist b/databases/elixir-ecto/pkg-plist
index 41a897fbd337..4a11d3ee3a3e 100644
--- a/databases/elixir-ecto/pkg-plist
+++ b/databases/elixir-ecto/pkg-plist
@@ -1,17 +1,20 @@
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Migration.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Storage.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Structure.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Transaction.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Connection.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Query.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Connection.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.Connection.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.Pool.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Application.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.BelongsTo.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.Has.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.HasThrough.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.ManyToMany.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.NotLoaded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.CastError.beam
@@ -20,6 +23,10 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.Relation.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.ConstraintError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Any.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.Date.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.DateTime.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.Time.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.List.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Utils.beam
@@ -28,6 +35,7 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Embedded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidChangesetError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidURLError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.LogEntry.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Constraint.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Index.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Reference.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Runner.beam
@@ -37,20 +45,12 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Table.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.MigrationError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migrator.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Callbacks.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.OptimisticLock.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Multi.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultipleResultsError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyFieldError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyValueError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoResultsError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pool.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.Poolboy.Worker.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.Poolboy.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.CoDel.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Timeout.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Worker.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.API.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Distinct.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Filter.beam
@@ -64,6 +64,7 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Preload.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Select.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Update.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.CastError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.CompileError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.JoinExpr.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Planner.beam
@@ -75,6 +76,7 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.QueryError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Atom.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.BitString.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.Query.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.SubQuery.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Tuple.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Assoc.beam
@@ -85,13 +87,15 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Supervisor.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.Metadata.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.StaleModelError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Storage.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.StaleEntryError.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.SubQuery.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.SubQueryError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Time.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Type.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.UUID.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Association.NotLoaded.beam
+lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Changeset.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Query.beam
@@ -100,11 +104,16 @@ lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Time.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Ecto.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Create.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Drop.beam
+lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Dump.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Gen.Migration.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Gen.Repo.beam
+lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Load.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Migrate.beam
+lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Migrations.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Rollback.beam
+lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.beam
 lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Decimal.beam
+lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Association.NotLoaded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Time.beam
@@ -116,15 +125,15 @@ lib/elixir/lib/ecto/lib/ecto.ex
 lib/elixir/lib/ecto/lib/ecto/adapter.ex
 lib/elixir/lib/ecto/lib/ecto/adapter/migration.ex
 lib/elixir/lib/ecto/lib/ecto/adapter/storage.ex
+lib/elixir/lib/ecto/lib/ecto/adapter/structure.ex
 lib/elixir/lib/ecto/lib/ecto/adapter/transaction.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/connection.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/mysql.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/mysql/connection.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/postgres.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/postgres/connection.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/postgres/datetime.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/sql.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/sql/query.ex
+lib/elixir/lib/ecto/lib/ecto/adapters/sql/connection.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/sql/sandbox.ex
 lib/elixir/lib/ecto/lib/ecto/application.ex
 lib/elixir/lib/ecto/lib/ecto/association.ex
@@ -141,16 +150,8 @@ lib/elixir/lib/ecto/lib/ecto/migration/schema_migration.ex
 lib/elixir/lib/ecto/lib/ecto/migration/supervisor.ex
 lib/elixir/lib/ecto/lib/ecto/migrator.ex
 lib/elixir/lib/ecto/lib/ecto/model.ex
-lib/elixir/lib/ecto/lib/ecto/model/callbacks.ex
-lib/elixir/lib/ecto/lib/ecto/model/optimistic_lock.ex
+lib/elixir/lib/ecto/lib/ecto/multi.ex
 lib/elixir/lib/ecto/lib/ecto/poison.ex
-lib/elixir/lib/ecto/lib/ecto/pool.ex
-lib/elixir/lib/ecto/lib/ecto/pools/poolboy.ex
-lib/elixir/lib/ecto/lib/ecto/pools/poolboy/worker.ex
-lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker.ex
-lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/codel.ex
-lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/timeout.ex
-lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/worker.ex
 lib/elixir/lib/ecto/lib/ecto/query.ex
 lib/elixir/lib/ecto/lib/ecto/query/api.ex
 lib/elixir/lib/ecto/lib/ecto/query/builder.ex
@@ -175,14 +176,17 @@ lib/elixir/lib/ecto/lib/ecto/repo/queryable.ex
 lib/elixir/lib/ecto/lib/ecto/repo/schema.ex
 lib/elixir/lib/ecto/lib/ecto/repo/supervisor.ex
 lib/elixir/lib/ecto/lib/ecto/schema.ex
-lib/elixir/lib/ecto/lib/ecto/storage.ex
 lib/elixir/lib/ecto/lib/ecto/type.ex
 lib/elixir/lib/ecto/lib/ecto/uuid.ex
 lib/elixir/lib/ecto/lib/mix/ecto.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.create.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.drop.ex
+lib/elixir/lib/ecto/lib/mix/tasks/ecto.dump.ex
+lib/elixir/lib/ecto/lib/mix/tasks/ecto.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.gen.migration.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.gen.repo.ex
+lib/elixir/lib/ecto/lib/mix/tasks/ecto.load.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.migrate.ex
+lib/elixir/lib/ecto/lib/mix/tasks/ecto.migrations.ex
 lib/elixir/lib/ecto/lib/mix/tasks/ecto.rollback.ex
 %%PORTDOCS%%%%DOCSDIR%%/README.md