4 files changed, 40 insertions, 25 deletions

diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile
index 11e00107676b..d2000eb73dab 100644
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ecto
-PORTVERSION=	0.13.1
+PORTVERSION=	0.14.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
@@ -17,7 +17,9 @@ GH_ACCOUNT=	elixir-lang
 
 MIX_BUILD_NAME=	shared
 MIX_BUILD_DEPS=	devel/elixir-decimal \
+		devel/elixir-poison \
 		devel/erlang-poolboy
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
+MIX_REWRITE=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/elixir-ecto/distinfo b/databases/elixir-ecto/distinfo
index 111acfa9d159..cce40766f011 100644
--- a/databases/elixir-ecto/distinfo
+++ b/databases/elixir-ecto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elixir-lang-ecto-v0.13.1_GH0.tar.gz) = eb249bd014daaba554a51dd3b892c26c11ae478b59caf561245bf9786acfd98d
-SIZE (elixir-lang-ecto-v0.13.1_GH0.tar.gz) = 167480
+SHA256 (elixir-lang-ecto-v0.14.0_GH0.tar.gz) = 43d51ec70c1ee37f11d28c8d261d41e9bc281c8cd3a191cb92ce2a462c56c5da
+SIZE (elixir-lang-ecto-v0.14.0_GH0.tar.gz) = 189565
diff --git a/databases/elixir-ecto/files/patch-mix.exs b/databases/elixir-ecto/files/patch-mix.exs
index 72b35de8d6ec..103339b416de 100644
--- a/databases/elixir-ecto/files/patch-mix.exs
+++ b/databases/elixir-ecto/files/patch-mix.exs
@@ -1,18 +1,11 @@
---- mix.exs.orig	2015-07-02 10:32:17 UTC
+--- mix.exs.orig	2015-07-19 17:59:14 UTC
 +++ mix.exs
-@@ -33,14 +33,7 @@ defmodule Ecto.Mixfile do
-   end
+@@ -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),
  
-   defp deps do
--    [{:poolboy, "~> 1.4"},
--     {:decimal, "~> 1.0"},
--     {:postgrex, "~> 0.8.3", optional: true},
--     {:mariaex, "~> 0.3.0", optional: true},
--     {:poison, "~> 1.0", optional: true},
--     {:ex_doc, "~> 0.7", only: :docs},
--     {:earmark, "~> 0.1", only: :docs},
--     {:inch_ex, only: :docs}]
-+    []
-   end
- 
-   defp test_paths(adapter) when adapter in @adapters, do: ["integration_test/#{adapter}"]
diff --git a/databases/elixir-ecto/pkg-plist b/databases/elixir-ecto/pkg-plist
index 9f56df2f50df..5d695b06d241 100644
--- a/databases/elixir-ecto/pkg-plist
+++ b/databases/elixir-ecto/pkg-plist
@@ -4,9 +4,6 @@ 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.Pool.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Poolboy.Worker.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Poolboy.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.Sandbox.beam
@@ -22,6 +19,8 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Util.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.beam
+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.Index.beam
@@ -33,13 +32,22 @@ 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.MissingPrimaryKeyError.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Autogenerate.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Callbacks.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Dependent.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.OptimisticLock.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Timestamps.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultipleResultsError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyError.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.Builder.Distinct.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Filter.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.From.beam
@@ -91,6 +99,10 @@ 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.Migrate.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Rollback.beam
+lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Decimal.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
 lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.Time.beam
@@ -103,9 +115,6 @@ 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/pool.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/poolboy.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/poolboy/worker.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
@@ -115,6 +124,7 @@ lib/elixir/lib/ecto/lib/ecto/adapters/sql/sandbox.ex
 lib/elixir/lib/ecto/lib/ecto/association.ex
 lib/elixir/lib/ecto/lib/ecto/changeset.ex
 lib/elixir/lib/ecto/lib/ecto/datetime.ex
+lib/elixir/lib/ecto/lib/ecto/embedded.ex
 lib/elixir/lib/ecto/lib/ecto/exceptions.ex
 lib/elixir/lib/ecto/lib/ecto/log_entry.ex
 lib/elixir/lib/ecto/lib/ecto/migration.ex
@@ -122,9 +132,19 @@ lib/elixir/lib/ecto/lib/ecto/migration/runner.ex
 lib/elixir/lib/ecto/lib/ecto/migration/schema_migration.ex
 lib/elixir/lib/ecto/lib/ecto/migrator.ex
 lib/elixir/lib/ecto/lib/ecto/model.ex
+lib/elixir/lib/ecto/lib/ecto/model/autogenerate.ex
 lib/elixir/lib/ecto/lib/ecto/model/callbacks.ex
+lib/elixir/lib/ecto/lib/ecto/model/dependent.ex
 lib/elixir/lib/ecto/lib/ecto/model/optimistic_lock.ex
 lib/elixir/lib/ecto/lib/ecto/model/timestamps.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/builder.ex
 lib/elixir/lib/ecto/lib/ecto/query/builder/distinct.ex