xpdf: add freetype dep, explicitly specify lib and include paths

1 files changed, 24 insertions, 12 deletions

diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index c52999420..7362a2144 100644
--- a/Library/Formula/xpdf.rb
+++ b/Library/Formula/xpdf.rb
@@ -1,22 +1,34 @@
-require 'formula'
+require "formula"
 
 class Xpdf < Formula
-  homepage 'http://www.foolabs.com/xpdf/'
-  url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz'
-  sha1 'b9b1dbb0335742a09d0442c60fd02f4f934618bd'
+  homepage "http://www.foolabs.com/xpdf/"
+  url "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz"
+  sha1 "b9b1dbb0335742a09d0442c60fd02f4f934618bd"
 
-  depends_on 'lesstif'
+  depends_on "lesstif"
+  depends_on "freetype"
   depends_on :x11
 
-  conflicts_with 'pdf2image', 'poppler',
-    :because => 'xpdf, pdf2image, and poppler install conflicting executables'
+  conflicts_with "pdf2image", "poppler",
+    :because => "xpdf, pdf2image, and poppler install conflicting executables"
 
   def install
-    ENV.append_to_cflags "-I#{MacOS::X11.include} -I#{MacOS::X11.include}/freetype2"
-    ENV.append "LDFLAGS", "-L#{MacOS::X11.lib}"
-
-    system "./configure", "--prefix=#{prefix}", "--mandir=#{man}"
+    freetype = Formula["freetype"]
+    lesstif = Formula["lesstif"]
+    system "./configure", "--prefix=#{prefix}",
+                          "--with-freetype2-library=#{freetype.opt_lib}",
+                          "--with-freetype2-includes=#{freetype.opt_include}/freetype2",
+                          "--with-Xm-library=#{lesstif.opt_lib}",
+                          "--with-Xm-includes=#{lesstif.opt_include}",
+                          "--with-Xpm-library=#{MacOS::X11.lib}",
+                          "--with-Xpm-includes=#{MacOS::X11.include}",
+                          "--with-Xext-library=#{MacOS::X11.lib}",
+                          "--with-Xext-includes=#{MacOS::X11.include}",
+                          "--with-Xp-library=#{MacOS::X11.lib}",
+                          "--with-Xp-includes=#{MacOS::X11.include}",
+                          "--with-Xt-library=#{MacOS::X11.lib}",
+                          "--with-Xt-includes=#{MacOS::X11.include}"
     system "make"
-    system "make install"
+    system "make", "install"
   end
 end