imagemagick: fix options, test and pango/openmp errors.

1 files changed, 38 insertions, 40 deletions

diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index f0c8f7397..513f65c43 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -2,7 +2,7 @@
 require 'formula'
 
 def ghostscript_srsly?
-  ARGV.include? '--with-ghostscript'
+  build.include? 'with-ghostscript'
 end
 
 def ghostscript_fonts?
@@ -19,20 +19,36 @@ class Imagemagick < Formula
   head 'https://www.imagemagick.org/subversion/ImageMagick/trunk',
     :using => UnsafeSubversionDownloadStrategy
 
+  option 'with-ghostscript', 'Compile against ghostscript (not recommended.)'
+  option 'use-tiff', 'Compile with libtiff support.'
+  option 'use-cms', 'Compile with little-cms support.'
+  option 'use-jpeg2000', 'Compile with jasper support.'
+  option 'use-wmf', 'Compile with libwmf support.'
+  option 'use-rsvg', 'Compile with librsvg support.'
+  option 'use-lqr', 'Compile with liblqr support.'
+  option 'use-exr', 'Compile with openexr support.'
+  option 'enable-openmp', 'Enable OpenMP (not supported on Leopard or with Clang).'
+  option 'disable-opencl', 'Disable OpenCL.'
+  option 'enable-hdri', 'Compile with HDRI support enabled'
+  option 'without-magick-plus-plus', "Don't compile C++ interface."
+  option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'
+  option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'
+  option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'
+
   depends_on 'pkg-config' => :build
 
-  depends_on 'jpeg'
+  depends_on 'jpeg' => :recommended
   depends_on :libpng
 
-  depends_on 'ghostscript' => :recommended if ghostscript_srsly?
+  depends_on 'ghostscript' => :optional if ghostscript_srsly?
 
-  depends_on 'libtiff' if ARGV.include? '--use-tiff'
-  depends_on 'little-cms' if ARGV.include? '--use-cms'
-  depends_on 'jasper' if ARGV.include? '--use-jpeg2000'
-  depends_on 'libwmf' if ARGV.include? '--use-wmf'
-  depends_on 'librsvg' if ARGV.include? '--use-rsvg'
-  depends_on 'liblqr' if ARGV.include? '--use-lqr'
-  depends_on 'openexr' if ARGV.include? '--use-exr'
+  depends_on 'libtiff' => :optional if build.include? 'use-tiff'
+  depends_on 'little-cms' => :optional if build.include? 'use-cms'
+  depends_on 'jasper' => :optional if build.include? 'use-jpeg2000'
+  depends_on 'libwmf' => :optional if build.include? 'use-wmf'
+  depends_on 'librsvg' => :optional if build.include? 'use-rsvg'
+  depends_on 'liblqr' => :optional if build.include? 'use-lqr'
+  depends_on 'openexr' => :optional if build.include? 'use-exr'
 
   bottle do
     version 1
@@ -52,26 +68,6 @@ class Imagemagick < Formula
     DATA
   end
 
-  def options
-    [
-      ['--with-ghostscript', 'Compile against ghostscript (not recommended.)'],
-      ['--use-tiff', 'Compile with libtiff support.'],
-      ['--use-cms', 'Compile with little-cms support.'],
-      ['--use-jpeg2000', 'Compile with jasper support.'],
-      ['--use-wmf', 'Compile with libwmf support.'],
-      ['--use-rsvg', 'Compile with librsvg support.'],
-      ['--use-lqr', 'Compile with liblqr support.'],
-      ['--use-exr', 'Compile with openexr support.'],
-      ['--disable-openmp', 'Disable OpenMP.'],
-      ['--disable-opencl', 'Disable OpenCL.'],
-      ['--enable-hdri', 'Compile with HDRI support enabled'],
-      ['--without-magick-plus-plus', "Don't compile C++ interface."],
-      ['--with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'],
-      ['--with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'],
-      ['--with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'],
-    ]
-  end
-
   def install
     args = [ "--disable-osx-universal-binary",
              "--without-perl", # I couldn't make this compile
@@ -79,26 +75,27 @@ class Imagemagick < Formula
              "--disable-dependency-tracking",
              "--enable-shared",
              "--disable-static",
+             "--without-pango",
              "--with-modules"]
 
-    args << "--disable-openmp" if MacOS.leopard? or ARGV.include? '--disable-openmp'
-    args << "--disable-opencl" if ARGV.include? '--disable-opencl'
-    args << "--without-gslib" unless ARGV.include? '--with-ghostscript'
+    args << "--disable-openmp" unless build.include? 'enable-openmp'
+    args << "--disable-opencl" if build.include? 'disable-opencl'
+    args << "--without-gslib" unless build.include? 'with-ghostscript'
     args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
                 unless ghostscript_srsly? or ghostscript_fonts?
-    args << "--without-magick-plus-plus" if ARGV.include? '--without-magick-plus-plus'
-    args << "--enable-hdri=yes" if ARGV.include? '--enable-hdri'
+    args << "--without-magick-plus-plus" if build.include? 'without-magick-plus-plus'
+    args << "--enable-hdri=yes" if build.include? 'enable-hdri'
 
-    if ARGV.include? '--with-quantum-depth-32'
+    if build.include? 'with-quantum-depth-32'
       quantum_depth = 32
-    elsif ARGV.include? '--with-quantum-depth-16'
+    elsif build.include? 'with-quantum-depth-16'
       quantum_depth = 16
-    elsif ARGV.include? '--with-quantum-depth-8'
+    elsif build.include? 'with-quantum-depth-8'
       quantum_depth = 8
     end
 
     args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
-    args << "--with-rsvg" if ARGV.include? '--use-rsvg'
+    args << "--with-rsvg" if build.include? 'use-rsvg'
 
     # versioned stuff in main tree is pointless for us
     inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
@@ -116,7 +113,8 @@ class Imagemagick < Formula
   end
 
   def test
-    system "#{bin}/identify", "/Library/Application Support/Apple/iChat Icons/Flags/Argentina.*"
+    system "#{bin}/identify", \
+      "/System/Library/Frameworks/SecurityInterface.framework/Versions/A/Resources/Key_Large.png"
   end
 end