- drop now unneeded patches which patched away the {deps} blocks of rebar.config.

rebar wants to download missing dependencies on the fly, but that won't work out
too good in the ports tree, so erlang.port.mk now removes those dependency declaration
sections.
This commit is contained in:
jasper 2013-03-10 19:57:39 +00:00
parent f701be9f16
commit b5abfc3d49
11 changed files with 6 additions and 147 deletions

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:01:22 jasper Exp $
--- rebar.config.orig Tue Mar 5 09:06:21 2013
+++ rebar.config Tue Mar 5 09:06:41 2013
@@ -4,16 +4,3 @@
{application, ["couchbeam"]}
]}.
-{deps, [
- %% ejson for JSON and header parsing
- {ejson, ".*", {git,"http://github.com/benoitc/ejson.git",
- "master"}},
-
- %% erlang-oauth for oauth authentification
- {oauth, ".*", {git,"git://github.com/benoitc/erlang-oauth.git",
- "master"}},
-
- %% ibrowse for doing HTTP requests
- {ibrowse, ".*", {git, "git://github.com/cmullaparthi/ibrowse.git",
- "master"}}
-]}.

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 10:56:57 jasper Exp $
Don't let rebar handle dependency management since it'll download and
build the dependencies in-place.
--- rebar.config.orig Mon Feb 25 10:04:08 2013
+++ rebar.config Mon Feb 25 10:04:17 2013
@@ -3,18 +3,6 @@
{erl_opts, [debug_info, warnings_as_errors]}.
{erl_first_files, ["src/sqerl_client.erl"]}.
-{deps, [%% we have a patch to emysql pending merging
- {emysql, ".*", {git, "git://github.com/opscode/Emysql.git", {tag, "0.2.13.14"}}},
-
- %% This is until a patch of ours gets merged into the main epgsql repo
- {epgsql, ".*",
- {git, "git://github.com/opscode/epgsql.git", "master"}},
-
- {automeck, ".*",
- {git, "git://github.com/opscode/automeck.git", {branch, "master"}}},
- {pooler, ".*",
- {git, "git://github.com/seth/pooler.git", {tag, "0.0.2"}}}]}.
-
{eunit_opts,
[verbose,
{report,{eunit_surefire,[{dir,"."}]}}]}.

View File

@ -1,7 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 11:52:42 jasper Exp $
--- rebar.config.orig Mon Mar 4 14:26:24 2013
+++ rebar.config Mon Mar 4 14:26:29 2013
@@ -1,3 +1,2 @@
{erl_opts, [debug_info, warnings_as_errors]}.
-{deps, [{meck, ".*", {git, "git://github.com/eproxus/meck.git", {branch, "master"}}}]}.

View File

@ -1,21 +1,16 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 11:54:39 jasper Exp $
$OpenBSD: patch-rebar_config,v 1.2 2013/03/10 19:57:39 jasper Exp $
WARNING: deprecated port_envs option used
Option 'port_envs' has been deprecated
in favor of 'port_env'.
'port_envs' will be removed soon.
--- rebar.config.orig Wed May 23 18:19:19 2012
+++ rebar.config Tue Feb 26 13:21:33 2013
@@ -2,12 +2,7 @@
--- rebar.config.orig Sun Mar 10 20:48:02 2013
+++ rebar.config Sun Mar 10 20:48:08 2013
@@ -7,7 +7,7 @@
"1.5.1"}}}
]}.
{so_name, "ejson.so"}.
-{deps, [
- {mochiweb, ".*", {git, "git://github.com/mochi/mochiweb.git", {tag,
- "1.5.1"}}}
-]}.
-
-{port_envs, [
+{port_env, [
%% Make sure to link -lstdc++ on linux or solaris

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 11:57:32 jasper Exp $
--- rebar.config.orig Mon Mar 4 19:31:22 2013
+++ rebar.config Mon Mar 4 19:31:27 2013
@@ -1,9 +1,6 @@
{sub_dirs, ["deps"]}.
-{deps, [
- {'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.1.3"}}},
- {meck, ".*", {git, "git://github.com/eproxus/meck", "master"}}
-]}.
+
{erl_opts, [debug_info]}.
{cover_enabled, true}.

View File

@ -1,7 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:02:38 jasper Exp $
--- rebar.config.orig Tue Mar 5 08:55:36 2013
+++ rebar.config Tue Mar 5 08:55:39 2013
@@ -1,3 +0,0 @@
-{deps, [{rabbit_common, ".*",
- {git, "git://github.com/seth/rabbit_common.git", "master"}}
- ]}.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:03:04 jasper Exp $
--- rebar.config.orig Tue Mar 5 09:43:37 2013
+++ rebar.config Tue Mar 5 09:44:15 2013
@@ -1,10 +1,4 @@
% -*- mode: erlang -*-
-{deps, [{meck, ".*",
- {git, "git://github.com/esl/meck.git", "master"}},
- {amqp_client, ".*",
- {git, "git://github.com/seth/amqp_client.git", "master"}},
- {rabbit_common, ".*",
- {git, "git://github.com/seth/rabbit_common.git", "master"}}]}.
{cover_enabled, true}.
{erl_opts, [debug_info]}.
{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:03:56 jasper Exp $
--- rebar.config.orig Mon Feb 25 11:42:35 2013
+++ rebar.config Mon Feb 25 11:42:40 2013
@@ -1,5 +1 @@
-{deps, [
- {ibrowse, ".*", {git, "git://github.com/opscode/ibrowse",
- {tag, "v4.0.1.1"}}}
- ]}.
{erl_opts, [warnings_as_errors, debug_info]}.

View File

@ -1,8 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:05:16 jasper Exp $
--- rebar.config.orig Tue Feb 26 18:10:38 2013
+++ rebar.config Tue Feb 26 18:10:43 2013
@@ -1,4 +0,0 @@
-{deps, [
- {gen_server2, "1.0.0",
- {git, "git://github.com/mdaguete/gen_server2.git", "master"}}
- ]}.

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:09:13 jasper Exp $
--- rebar.config.orig Mon Feb 25 16:27:33 2013
+++ rebar.config Mon Feb 25 16:27:39 2013
@@ -1,15 +1,6 @@
%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
%% ex: ts=4 sw=4 ft=erlang et
-{deps, [
-
- {meck, ".*",
- {git, "git://github.com/eproxus/meck.git", {branch, "master"}}},
-
- {edown, ".*",
- {git, "git://github.com/seth/edown.git", {branch, "master"}}}
- ]}.
-
{cover_enabled, true}.
{edoc_opts, [{doclet, edown_doclet},

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:13:48 jasper Exp $
--- rebar.config.orig Tue Feb 26 19:40:48 2013
+++ rebar.config Tue Feb 26 19:40:56 2013
@@ -2,8 +2,3 @@
{erl_opts, [warnings_as_errors]}.
{cover_enabled, true}.
{edoc_opts, [{preprocess, true}]}.
-
-{deps, [
- {mochiweb, "1.5.1*", {git, "git://github.com/basho/mochiweb",
- {tag, "1.5.1p3"}}}
- ]}.