Audit conditional deps that can be made declarative

2 files changed, 3 insertions, 4 deletions

diff --git a/Library/Formula/curl.rb b/Library/Formula/curl.rb
index 88469fab8..e7f8c408f 100644
--- a/Library/Formula/curl.rb
+++ b/Library/Formula/curl.rb
@@ -10,14 +10,13 @@ class Curl < Formula
             "The libcurl provided by Leopard is too old for CouchDB to use."
 
   option 'with-ssh', 'Build with scp and sftp support'
-  option 'with-libmetalink', 'Build with Metalink support'
   option 'with-ares', 'Build with C-Ares async DNS support'
   option 'with-ssl', 'Build with Homebrew OpenSSL instead of the system version'
   option 'with-darwinssl', 'Build with Secure Transport for SSL support'
 
   depends_on 'pkg-config' => :build
+  depends_on 'libmetalink' => :optional
   depends_on 'libssh2' if build.with? 'ssh'
-  depends_on 'libmetalink' if build.with? 'libmetalink'
   depends_on 'c-ares' if build.with? 'ares'
   depends_on 'openssl' if build.with? 'ssl'
 
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index d83f61d3c..1e48c65af 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -21,7 +21,7 @@ class Mapserver < Formula
   depends_on 'proj'
   depends_on 'gdal'
   depends_on 'geos' => :optional
-  depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.version >= :lion
+  depends_on 'postgresql' => :optional unless MacOS.version >= :lion
   depends_on 'fcgi' if build.include? 'with-fastcgi'
   depends_on 'cairo' => :optional
 
@@ -38,7 +38,7 @@ class Mapserver < Formula
     args << "--with-php=/usr/bin/php-config" if build.include? 'with-php'
     args << "--with-cairo" if build.with? 'cairo'
 
-    if build.include? 'with-postgresql'
+    if build.with? 'postgresql'
       if MacOS.version >= :lion # Lion ships with PostgreSQL libs
         args << "--with-postgis"
       else