From f6f009e3d7b75911fdcbc695745308ef6c14d4e8 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Tue, 22 Apr 2014 16:10:55 -0500
Subject: neon: always use Homebrew's openssl

We now always use Homebrew's openssl. Users can install certs by adding
.pem files to
  $(brew --prefix)/etc/openssl/certs
and then running
  $(brew --prefix openssl)/bin/c_rehash
---
 Library/Formula/neon.rb | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/neon.rb b/Library/Formula/neon.rb
index bb4ccc79e..f4b1d6a17 100644
--- a/Library/Formula/neon.rb
+++ b/Library/Formula/neon.rb
@@ -8,10 +8,9 @@ class Neon < Formula
   keg_only :provided_by_osx
 
   option :universal
-  option 'with-brewed-openssl', 'Include OpenSSL support via Homebrew'
 
   depends_on 'pkg-config' => :build
-  depends_on 'openssl' if build.with? 'brewed-openssl'
+  depends_on 'openssl'
 
   # Configure switch unconditionally adds the -no-cpp-precomp switch
   # to CPPFLAGS, which is an obsolete Apple-only switch that breaks
@@ -22,19 +21,13 @@ class Neon < Formula
   def install
     ENV.universal_binary if build.universal?
     ENV.enable_warnings
-    args = [
-      "--disable-debug",
-      "--prefix=#{prefix}",
-      "--enable-shared",
-      "--disable-static",
-      "--with-ca-bundle=/usr/share/curl/curl-ca-bundle.crt",
-      "--disable-nls",
-      "--with-ssl",
-    ]
-    if build.with? 'brewed-openssl'
-      args << "--with-libs=#{Formula['openssl'].opt_prefix}"
-    end
-    system "./configure", *args
+    system "./configure", "--disable-debug",
+                          "--prefix=#{prefix}",
+                          "--enable-shared",
+                          "--disable-static",
+                          "--disable-nls",
+                          "--with-ssl=openssl",
+                          "--with-libs=#{Formula["openssl"].opt_prefix}"
     system "make install"
   end
 end
-- 
cgit v1.2.3