1 files changed, 26 insertions, 18 deletions
diff --git a/Library/Formula/xplanet.rb b/Library/Formula/xplanet.rb
index 129912320..023142dd9 100644
--- a/Library/Formula/xplanet.rb
+++ b/Library/Formula/xplanet.rb
@@ -1,27 +1,35 @@
-require 'formula'
+require "formula"
 
 class Xplanet < Formula
-  homepage 'http://xplanet.sourceforge.net/'
-  url 'https://downloads.sourceforge.net/project/xplanet/xplanet/1.3.0/xplanet-1.3.0.tar.gz'
-  sha1 '7c5208b501b441a0184cbb334a5658d0309d7dac'
+  homepage "http://xplanet.sourceforge.net/"
+  url "https://downloads.sourceforge.net/project/xplanet/xplanet/1.3.0/xplanet-1.3.0.tar.gz"
+  sha1 "7c5208b501b441a0184cbb334a5658d0309d7dac"
+
   revision 1
 
   option "with-x", "Build for X11 instead of Aqua"
-  option "with-all", "Build with default Xplanet configuration dependencies except JPL CSPICE (manual install)"
+  option "with-all", "Build with default Xplanet configuration dependencies"
+  option "with-pango", "Build Xplanet to support Internationalized text library"
+  option "with-netpbm", "Build Xplanet with PNM graphic support"
+  option "with-cspice", "Build Xplanet with JPLs SPICE toolkit support"
 
-  depends_on 'pkg-config' => :build
-  depends_on "libpng"
-  depends_on 'jpeg'
-  depends_on 'giflib'
-  depends_on 'libtiff'
-  depends_on :x11
+  depends_on "pkg-config" => :build
+
+  depends_on "giflib" => :recommended
+  depends_on "jpeg" => :recommended
+  depends_on "libpng" => :recommended
+  depends_on "libtiff" => :recommended
 
-  if build.with? "all"
-    depends_on "netpbm"
-    depends_on "freetype"
+  depends_on "netpbm" if build.with?("netpbm") || build.with?("all")
+
+  if build.with?("pango") || build.with?("all")
     depends_on "pango"
+    depends_on "cspice"
   end
 
+  depends_on :freetype
+  depends_on :x11
+
   def install
     args = %W[
       --disable-dependency-tracking
@@ -33,13 +41,13 @@ class Xplanet < Formula
       args << "--with-aqua" << "--without-x"
     end
 
-    if build.with? "all"
+    if build.with?("netpbm") || build.with?("all")
       netpbm = Formula["netpbm"].opt_prefix
-      ENV.append 'CPPFLAGS', "-I#{netpbm}/include/netpbm"
-      ENV.append 'LDFLAGS', "-L#{netpbm}/lib"
+      ENV.append "CPPFLAGS", "-I#{netpbm}/include/netpbm"
+      ENV.append "LDFLAGS", "-L#{netpbm}/lib"
     end
 
     system "./configure", *args
-    system "make install"
+    system "make", "install"
   end
 end