diff options
| author | Adam Vandenberg | 2013-06-08 17:29:36 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-09-11 22:05:31 -0700 |
| commit | f6bc1443084b59bf90222d9e32775ef2e9b5f3fa (patch) | |
| tree | d160af57c8091e4eafb04f8e0f0c4c341dce2ba6 | |
| parent | 95a4f070d8be7ff0c074eff15bbbfe296ca00387 (diff) | |
| download | homebrew-f6bc1443084b59bf90222d9e32775ef2e9b5f3fa.tar.bz2 | |
poppler: use resource
| -rw-r--r-- | Library/Formula/poppler.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index 7b41fd2be..9e25fac70 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -1,10 +1,5 @@ require 'formula' -class PopplerData < Formula - url 'http://poppler.freedesktop.org/poppler-data-0.4.6.tar.gz' - sha1 'f030563eed9f93912b1a546e6d87936d07d7f27d' -end - class Poppler < Formula homepage 'http://poppler.freedesktop.org' url 'http://poppler.freedesktop.org/poppler-0.24.0.tar.xz' @@ -26,6 +21,11 @@ class Poppler < Formula conflicts_with 'pdf2image', 'xpdf', :because => 'poppler, pdf2image, and xpdf install conflicting executables' + resource 'font-data' do + url 'http://poppler.freedesktop.org/poppler-data-0.4.6.tar.gz' + sha1 'f030563eed9f93912b1a546e6d87936d07d7f27d' + end + def install if build.with? 'qt4' ENV['POPPLER_QT4_CFLAGS'] = `#{HOMEBREW_PREFIX}/bin/pkg-config QtCore QtGui --libs`.chomp @@ -44,10 +44,6 @@ class Poppler < Formula system "./configure", *args system "make install" - - # Install poppler font data. - PopplerData.new.brew do - system "make", "install", "prefix=#{prefix}" - end + resource('font-data').stage { system "make", "install", "prefix=#{prefix}" } end end |