1 files changed, 34 insertions, 21 deletions
diff --git a/Library/Formula/curl.rb b/Library/Formula/curl.rb
index 4a84c4209..851b6c84f 100644
--- a/Library/Formula/curl.rb
+++ b/Library/Formula/curl.rb
@@ -1,10 +1,10 @@
-require 'formula'
+require "formula"
 
 class Curl < Formula
-  homepage 'http://curl.haxx.se/'
-  url 'http://curl.haxx.se/download/curl-7.39.0.tar.bz2'
-  mirror 'ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.39.0.tar.bz2'
-  sha256 'b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0'
+  homepage "http://curl.haxx.se/"
+  url "http://curl.haxx.se/download/curl-7.39.0.tar.bz2"
+  mirror "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.39.0.tar.bz2"
+  sha256 "b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0"
 
   bottle do
     cellar :any
@@ -15,12 +15,13 @@ class Curl < Formula
 
   keg_only :provided_by_osx
 
-  option 'with-libidn', 'Build with support for Internationalized Domain Names'
-  option 'with-rtmpdump', 'Build with RTMP support'
-  option 'with-libssh2', 'Build with scp and sftp support'
-  option 'with-c-ares', 'Build with C-Ares async DNS support'
-  option 'with-gssapi', 'Build with GSSAPI/Kerberos authentication support.'
-  option 'with-libmetalink', 'Build with libmetalink support.'
+  option "with-libidn", "Build with support for Internationalized Domain Names"
+  option "with-rtmpdump", "Build with RTMP support"
+  option "with-libssh2", "Build with scp and sftp support"
+  option "with-c-ares", "Build with C-Ares async DNS support"
+  option "with-gssapi", "Build with GSSAPI/Kerberos authentication support."
+  option "with-libmetalink", "Build with libmetalink support."
+  option "with-libressl", "Build with LibreSSL instead of Secure Transport or OpenSSL"
 
   deprecated_option "with-idn" => "with-libidn"
   deprecated_option "with-rtmp" => "with-rtmpdump"
@@ -28,20 +29,29 @@ class Curl < Formula
   deprecated_option "with-ares" => "with-c-ares"
 
   if MacOS.version >= :mountain_lion
-    option 'with-openssl', 'Build with OpenSSL instead of Secure Transport'
-    depends_on 'openssl' => :optional
+    option "with-openssl", "Build with OpenSSL instead of Secure Transport"
+    depends_on "openssl" => :optional
   else
-    depends_on 'openssl'
+    depends_on "openssl"
   end
 
-  depends_on 'pkg-config' => :build
-  depends_on 'libidn' => :optional
-  depends_on 'libmetalink' => :optional
-  depends_on 'libssh2' => :optional
-  depends_on 'c-ares' => :optional
-  depends_on 'rtmpdump' => :optional
+  depends_on "pkg-config" => :build
+  depends_on "libidn" => :optional
+  depends_on "libmetalink" => :optional
+  depends_on "c-ares" => :optional
+  depends_on "rtmpdump" => :optional
+  depends_on "libressl" => :optional
 
   def install
+    # Throw an error if someone actually tries to rock both SSL choices.
+    # Long-term, make this singular-ssl-option-only a requirement.
+    if build.with? "libressl" and build.with? "openssl"
+      ohai <<-EOS.undent
+      --with-openssl and --with-libressl are both specified and
+      curl can only use one at a time; proceeding with openssl.
+      EOS
+    end
+
     args = %W[
       --disable-debug
       --disable-dependency-tracking
@@ -51,6 +61,9 @@ class Curl < Formula
     if MacOS.version < :mountain_lion or build.with? "openssl"
       args << "--with-ssl=#{Formula["openssl"].opt_prefix}"
       args << "--with-ca-bundle=#{etc}/openssl/cert.pem"
+    elsif build.with? "libressl"
+      args << "--with-ssl=#{Formula["libressl"].opt_prefix}"
+      args << "--with-ca-bundle=#{etc}/libressl/cert.pem"
     else
       args << "--with-darwinssl"
     end
@@ -68,7 +81,7 @@ class Curl < Formula
     end
 
     system "./configure", *args
-    system "make install"
+    system "make", "install"
   end
 
   test do