From 8183d2d70218527e5fc89d6f90cc9fbd26b72a29 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Wed, 19 Mar 2014 11:12:30 -0500
Subject: tor: use Homebrew openssl

---
 Library/Formula/tor.rb | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb
index ea005ad0f..2cc524587 100644
--- a/Library/Formula/tor.rb
+++ b/Library/Formula/tor.rb
@@ -11,10 +11,8 @@ class Tor < Formula
     sha1 '80f4697dfc0473bf5ec642b074cee4ce95fd0fa6'
   end
 
-  option "with-brewed-openssl", "Build with Homebrew's OpenSSL instead of the system version" if MacOS.version > :leopard
-
   depends_on 'libevent'
-  depends_on 'openssl' if build.with?('brewed-openssl') || MacOS.version < :snow_leopard
+  depends_on 'openssl'
 
   def install
     # Fix the path to the control cookie.
@@ -23,14 +21,9 @@ class Tor < Formula
       'TOR_COOKIE="/var/lib/tor/data/control_auth_cookie"',
       'TOR_COOKIE="$HOME/.tor/control_auth_cookie"'
 
-    args = %W[
-      --disable-dependency-tracking
-      --prefix=#{prefix}
-    ]
-
-    args << "-with-ssl=#{Formula["openssl"].opt_prefix}" if build.with?("brewed-openssl") || MacOS.version < :snow_leopard
-
-    system "./configure", *args
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-openssl-dir=#{Formula["openssl"].opt_prefix}"
     system "make install"
 
     bin.install "contrib/tor-ctrl.sh" => "tor-ctrl"
-- 
cgit v1.2.3