From f666f54cf8eb6316792564e80f39acb5a3caa6c9 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 18 Mar 2013 15:35:59 -0500 Subject: [PATCH] couchdb: depend on homebrew/versions/erlang-r15 --- Formula/couchdb.rb | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/Formula/couchdb.rb b/Formula/couchdb.rb index 5e9e081672c..990bf7e5d5a 100644 --- a/Formula/couchdb.rb +++ b/Formula/couchdb.rb @@ -1,35 +1,5 @@ require 'formula' -class Erlang16Incompat < Requirement - fatal true - - def version - Formula.factory('erlang').version - end - - satisfy do - version =~ /R(\d{2})B/ - $1.to_i > 15 - end - - def message; <<-EOS.undent - Erlang <= R15B03-1 is required to install. - - You have a erlang version #{version} - - The work-around is: - - brew unlink erlang - cd #{HOMEBREW_REPOSITORY} - git checkout 168742f Library/Formula/erlang.rb - brew install erlang - brew install couchdb - - EOS - end -end - - class Couchdb < Formula homepage "http://couchdb.apache.org/" url 'http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.2.1/apache-couchdb-1.2.1.tar.gz' @@ -37,11 +7,10 @@ class Couchdb < Formula head 'http://git-wip-us.apache.org/repos/asf/couchdb.git' - depends_on Erlang16Incompat depends_on 'help2man' => :build depends_on 'spidermonkey' depends_on 'icu4c' - depends_on 'erlang' + depends_on 'homebrew/versions/erlang-r15' depends_on 'curl' if MacOS.version == :leopard def install