diff options
| author | Jack Nagel | 2014-03-22 21:51:41 -0500 | 
|---|---|---|
| committer | Jack Nagel | 2014-03-22 21:51:41 -0500 | 
| commit | bfdf80274b3542684e5343cbca04f93d63e44d9d (patch) | |
| tree | 046f6f936a3e7409193fddc899a12eb38efac0f8 | |
| parent | bb0a66ae79116323243eb9654cd82854bcd40358 (diff) | |
| download | homebrew-bfdf80274b3542684e5343cbca04f93d63e44d9d.tar.bz2 | |
Update revisions on libpng dependents
62 files changed, 131 insertions, 68 deletions
| diff --git a/Library/Formula/analog.rb b/Library/Formula/analog.rb index 797c7ab00..922f9ce02 100644 --- a/Library/Formula/analog.rb +++ b/Library/Formula/analog.rb @@ -4,10 +4,11 @@ class Analog < Formula    homepage 'http://analog.cx'    url 'http://analog.cx/analog-6.0.tar.gz'    sha1 '17ad601f84e73c940883fb9b9e805879aac37493' +  revision 1    depends_on 'gd'    depends_on 'jpeg' -  depends_on :libpng +  depends_on 'libpng'    def install      system "make", "CC=#{ENV.cc}", diff --git a/Library/Formula/dcmtk.rb b/Library/Formula/dcmtk.rb index 2ff5192a6..7ba624076 100644 --- a/Library/Formula/dcmtk.rb +++ b/Library/Formula/dcmtk.rb @@ -4,6 +4,7 @@ class Dcmtk < Formula    homepage 'http://dicom.offis.de/dcmtk.php.en'    url 'ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.tar.gz'    sha1 '469e017cffc56f36e834aa19c8612111f964f757' +  revision 1    option 'with-docs', 'Install development libraries/headers and HTML docs' diff --git a/Library/Formula/devil.rb b/Library/Formula/devil.rb index 105a58156..74f090a90 100644 --- a/Library/Formula/devil.rb +++ b/Library/Formula/devil.rb @@ -4,8 +4,9 @@ class Devil < Formula    homepage 'http://sourceforge.net/projects/openil/'    url 'https://downloads.sourceforge.net/project/openil/DevIL/1.7.8/DevIL-1.7.8.tar.gz'    sha1 'bc27e3e830ba666a3af03548789700d10561fcb1' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    option :universal diff --git a/Library/Formula/dvdauthor.rb b/Library/Formula/dvdauthor.rb index 0e830b3c8..3df482314 100644 --- a/Library/Formula/dvdauthor.rb +++ b/Library/Formula/dvdauthor.rb @@ -4,14 +4,15 @@ class Dvdauthor < Formula    homepage 'http://dvdauthor.sourceforge.net/'    url 'https://downloads.sourceforge.net/project/dvdauthor/dvdauthor/0.7.1/dvdauthor-0.7.1.tar.gz'    sha1 'a9636d165bf546e3e2b25b7397c33dbfa2895e6a' +  revision 1    # Dvdauthor will optionally detect ImageMagick or GraphicsMagick, too.    # But we don't add either as deps because they are big.    depends_on 'pkg-config' => :build    depends_on 'libdvdread' -  depends_on :freetype -  depends_on :libpng +  depends_on 'freetype' +  depends_on 'libpng'    def install      system "./configure", "--disable-dependency-tracking", diff --git a/Library/Formula/ffmpegthumbnailer.rb b/Library/Formula/ffmpegthumbnailer.rb index 45be0d27b..f4822b2c2 100644 --- a/Library/Formula/ffmpegthumbnailer.rb +++ b/Library/Formula/ffmpegthumbnailer.rb @@ -4,10 +4,11 @@ class Ffmpegthumbnailer < Formula    homepage 'http://code.google.com/p/ffmpegthumbnailer/'    url 'https://ffmpegthumbnailer.googlecode.com/files/ffmpegthumbnailer-2.0.8.tar.gz'    sha1 '2c54ca16efd953f46547e22799cfc40bd9c24533' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'jpeg' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'ffmpeg'    def install diff --git a/Library/Formula/fltk.rb b/Library/Formula/fltk.rb index e11e0953e..45a4bfc7a 100644 --- a/Library/Formula/fltk.rb +++ b/Library/Formula/fltk.rb @@ -4,10 +4,11 @@ class Fltk < Formula    homepage 'http://www.fltk.org/'    url 'http://fossies.org/linux/misc/fltk-1.3.2-source.tar.gz'    sha1 '25071d6bb81cc136a449825bfd574094b48f07fb' +  revision 1    option :universal -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    fails_with :clang do diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb index 1356b2df2..1b40a1849 100644 --- a/Library/Formula/fontforge.rb +++ b/Library/Formula/fontforge.rb @@ -2,6 +2,7 @@ require 'formula'  class Fontforge < Formula    homepage 'http://fontforge.org/' +  revision 1    stable do      url 'https://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-20120731-b.tar.bz2' @@ -36,7 +37,7 @@ class Fontforge < Formula    depends_on 'gettext'    depends_on :python => :recommended -  depends_on :libpng    => :recommended +  depends_on 'libpng'   => :recommended    depends_on 'jpeg'     => :recommended    depends_on 'libtiff'  => :recommended    depends_on :x11 if build.with? 'x' diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb index 59a19e988..1170b1ecc 100644 --- a/Library/Formula/gdal.rb +++ b/Library/Formula/gdal.rb @@ -4,6 +4,7 @@ class Gdal < Formula    homepage 'http://www.gdal.org/'    url 'http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz'    sha1 'b4df76e2c0854625d2bedce70cc1eaf4205594ae' +  revision 1    head do      url 'https://svn.osgeo.org/gdal/trunk/gdal' @@ -17,7 +18,7 @@ class Gdal < Formula    option 'enable-mdb', 'Build with Access MDB driver (requires Java 1.6+ JDK/JRE, from Apple or Oracle).'    depends_on :python => :recommended -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    depends_on 'giflib'    depends_on 'libtiff' diff --git a/Library/Formula/gl2ps.rb b/Library/Formula/gl2ps.rb index d5bfbb64d..e0113962a 100644 --- a/Library/Formula/gl2ps.rb +++ b/Library/Formula/gl2ps.rb @@ -4,9 +4,10 @@ class Gl2ps < Formula    homepage "http://www.geuz.org/gl2ps/"    url "http://geuz.org/gl2ps/src/gl2ps-1.3.8.tgz"    sha1 "792e11db0fe7a30a4dc4491af5098b047ec378b1" +  revision 1    depends_on "cmake" => :build -  depends_on :libpng +  depends_on "libpng"    def install      system "cmake", ".", *std_cmake_args diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index c3de8c4fe..29b26c3c8 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -5,6 +5,7 @@ class Graphicsmagick < Formula    url 'https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.19/GraphicsMagick-1.3.19.tar.bz2'    sha256 'b57cdeb1ab9492b667776bbbc265149eda5601d2c572d65f43b44273e892fff1'    head 'hg://http://graphicsmagick.hg.sourceforge.net:8000/hgroot/graphicsmagick/graphicsmagick' +  revision 1    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' @@ -18,8 +19,8 @@ class Graphicsmagick < Formula    depends_on 'pkg-config' => :build    depends_on 'jpeg' => :recommended -  depends_on :libpng => :recommended -  depends_on :freetype => :recommended +  depends_on 'libpng' => :recommended +  depends_on 'freetype' => :recommended    depends_on :x11 => :optional    depends_on 'libtiff' => :optional diff --git a/Library/Formula/hatari.rb b/Library/Formula/hatari.rb index a61e2b121..d343983b5 100644 --- a/Library/Formula/hatari.rb +++ b/Library/Formula/hatari.rb @@ -4,11 +4,12 @@ class Hatari < Formula    homepage 'http://hatari.tuxfamily.org'    url 'http://download.tuxfamily.org/hatari/1.7.0/hatari-1.7.0.tar.bz2'    sha1 '9961171c6d5f3742f93c903606c4956ce2e15ea0' +  revision 1    head 'http://hg.tuxfamily.org/mercurialroot/hatari/hatari', :using => :hg, :branch => 'default'    depends_on 'cmake' => :build -  depends_on 'libpng' if MacOS.version <= :leopard +  depends_on 'libpng'    depends_on 'sdl'    def install diff --git a/Library/Formula/htmldoc.rb b/Library/Formula/htmldoc.rb index 40ffbdc09..39b71be7e 100644 --- a/Library/Formula/htmldoc.rb +++ b/Library/Formula/htmldoc.rb @@ -4,6 +4,7 @@ class Htmldoc < Formula    homepage "http://www.msweet.org/projects.php?Z1"    url "http://www.msweet.org/files/project1/htmldoc-1.8.28-source.tar.bz2"    sha1 "44ac8b5f116383e9ae44bb1fd7d8caf6e3edf9c2" +  revision 1    depends_on "libpng"    depends_on "jpeg" diff --git a/Library/Formula/icoutils.rb b/Library/Formula/icoutils.rb index 48e554157..fa5ce547b 100644 --- a/Library/Formula/icoutils.rb +++ b/Library/Formula/icoutils.rb @@ -4,8 +4,9 @@ class Icoutils < Formula    homepage 'http://www.nongnu.org/icoutils/'    url 'http://savannah.nongnu.org/download/icoutils/icoutils-0.31.0.tar.bz2'    sha1 '2712acd33c611588793562310077efd2ff35dca5' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    def install      system "./configure", "--disable-dependency-tracking", diff --git a/Library/Formula/imageworsener.rb b/Library/Formula/imageworsener.rb index 213a42819..ae51ae2c6 100644 --- a/Library/Formula/imageworsener.rb +++ b/Library/Formula/imageworsener.rb @@ -4,8 +4,9 @@ class Imageworsener < Formula    homepage 'http://entropymine.com/imageworsener/'    url 'http://entropymine.com/imageworsener/imageworsener-1.1.0.tar.gz'    sha1 'ce552890396efc03f0e7860b74cd635e5185858d' +  revision 1 -  depends_on :libpng => :recommended +  depends_on 'libpng' => :recommended    def install      system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Library/Formula/imlib2.rb b/Library/Formula/imlib2.rb index 17df37c5c..c244f9638 100644 --- a/Library/Formula/imlib2.rb +++ b/Library/Formula/imlib2.rb @@ -4,11 +4,12 @@ class Imlib2 < Formula    homepage 'http://sourceforge.net/projects/enlightenment/files/'    url 'https://downloads.sourceforge.net/project/enlightenment/imlib2-src/1.4.6/imlib2-1.4.6.tar.bz2'    sha1 '20e111d822074593e8d657ecf8aafe504e9e2967' +  revision 1    option "without-x", "Build without X support" -  depends_on :freetype -  depends_on :libpng => :recommended +  depends_on 'freetype' +  depends_on 'libpng' => :recommended    depends_on :x11 if MacOS::X11.installed? or build.with? "x"    depends_on 'pkg-config' => :build    depends_on 'jpeg' => :recommended diff --git a/Library/Formula/iulib.rb b/Library/Formula/iulib.rb index 437fb95a9..65b8488cd 100644 --- a/Library/Formula/iulib.rb +++ b/Library/Formula/iulib.rb @@ -4,11 +4,12 @@ class Iulib < Formula    homepage 'http://code.google.com/p/iulib/'    url 'https://iulib.googlecode.com/files/iulib-0.4.tgz'    sha1 '96a006f806a650886fdd59b1239f6e56d1a864c1' +  revision 1    depends_on :autoconf    depends_on :automake    depends_on :libtool -  depends_on :libpng +  depends_on "libpng"    depends_on "jpeg"    depends_on "libtiff" diff --git a/Library/Formula/lensfun.rb b/Library/Formula/lensfun.rb index 7cf0db8cd..8279ae5d7 100644 --- a/Library/Formula/lensfun.rb +++ b/Library/Formula/lensfun.rb @@ -5,10 +5,11 @@ class Lensfun < Formula    head 'svn://svn.berlios.de/lensfun/trunk'    url 'https://downloads.sourceforge.net/project/lensfun.berlios/lensfun-0.2.8.tar.bz2'    sha1 '0e85eb7692620668d27e2303687492ad68c90eb4' +  revision 1    depends_on 'doxygen' => :optional    depends_on 'glib' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'pkg-config' => :build    def install diff --git a/Library/Formula/leptonica.rb b/Library/Formula/leptonica.rb index ec4149339..a046dd833 100644 --- a/Library/Formula/leptonica.rb +++ b/Library/Formula/leptonica.rb @@ -4,8 +4,9 @@ class Leptonica < Formula    homepage 'http://www.leptonica.org/'    url 'http://www.leptonica.org/source/leptonica-1.69.tar.gz'    sha1 '91199f99d2e78b15b76ffa6fc4e86ee458a330e8' +  revision 1 -  depends_on :libpng => :recommended +  depends_on 'libpng' => :recommended    depends_on 'jpeg' => :recommended    depends_on 'libtiff' => :optional diff --git a/Library/Formula/libgaiagraphics.rb b/Library/Formula/libgaiagraphics.rb index 6f36081b3..2fddf73a8 100644 --- a/Library/Formula/libgaiagraphics.rb +++ b/Library/Formula/libgaiagraphics.rb @@ -2,9 +2,9 @@ require 'formula'  class Libgaiagraphics < Formula    homepage 'https://www.gaia-gis.it/fossil/libgaiagraphics/index' -    url 'http://www.gaia-gis.it/gaia-sins/gaiagraphics-sources/libgaiagraphics-0.4b.tar.gz'    sha1 'd045ad6d22db9e67ba410a62b9398c337786fe53' +  revision 1    devel do      url 'http://www.gaia-gis.it/gaia-sins/gaiagraphics-sources/libgaiagraphics-0.5.tar.gz' @@ -15,7 +15,7 @@ class Libgaiagraphics < Formula    depends_on 'libgeotiff'    depends_on 'jpeg'    depends_on 'cairo' -  depends_on :libpng +  depends_on 'libpng'    def install      system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Library/Formula/libharu.rb b/Library/Formula/libharu.rb index 11beaacc9..e96335fb3 100644 --- a/Library/Formula/libharu.rb +++ b/Library/Formula/libharu.rb @@ -4,8 +4,9 @@ class Libharu < Formula    homepage 'http://www.libharu.org'    url 'http://libharu.org/files/libharu-2.2.1.tar.bz2'    sha1 'bfea7d9df3fb6a112340d0d54731f62f53b26d2f' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    # Fixes compilation against LibPNG 1.5. Can be removed on next release.    # Based on a commit in the LibHaru repository which does not apply cleanly diff --git a/Library/Formula/libicns.rb b/Library/Formula/libicns.rb index 2436b8784..8b09d3f8e 100644 --- a/Library/Formula/libicns.rb +++ b/Library/Formula/libicns.rb @@ -4,11 +4,12 @@ class Libicns < Formula    homepage 'http://icns.sourceforge.net/'    url 'https://downloads.sourceforge.net/project/icns/libicns-0.8.1.tar.gz'    sha256 '335f10782fc79855cf02beac4926c4bf9f800a742445afbbf7729dab384555c2' +  revision 1    option :universal    depends_on 'jasper' -  depends_on :libpng +  depends_on 'libpng'    def install      # Fix for libpng 1.5 diff --git a/Library/Formula/libkate.rb b/Library/Formula/libkate.rb index 1ac75c234..11be1c1ce 100644 --- a/Library/Formula/libkate.rb +++ b/Library/Formula/libkate.rb @@ -4,8 +4,9 @@ class Libkate < Formula    homepage 'http://code.google.com/p/libkate/'    url 'https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz'    sha1 '87fd8baaddb7120fb4d20b0a0437e44ea8b6c9d8' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    depends_on 'libogg' => :recommended    fails_with :gcc do diff --git a/Library/Formula/libming.rb b/Library/Formula/libming.rb index 87ab10775..aeb7335ac 100644 --- a/Library/Formula/libming.rb +++ b/Library/Formula/libming.rb @@ -4,12 +4,13 @@ class Libming < Formula    homepage 'http://www.libming.org'    url 'https://downloads.sourceforge.net/project/ming/Releases/ming-0.4.4.tar.bz2'    sha1 'e803b3b94a00a361e3415105f26112cf6f7bac81' +  revision 1    option 'perl', 'Build the perl extension'    option 'php', 'Build the php extension' -  depends_on :libpng -  depends_on :freetype +  depends_on 'libpng' +  depends_on 'freetype'    depends_on :python => :optional    depends_on 'giflib' => :optional diff --git a/Library/Formula/libpano.rb b/Library/Formula/libpano.rb index ce4041386..be60f5926 100644 --- a/Library/Formula/libpano.rb +++ b/Library/Formula/libpano.rb @@ -5,8 +5,9 @@ class Libpano < Formula    url 'https://downloads.sourceforge.net/project/panotools/libpano13/libpano13-2.9.18/libpano13-2.9.18.tar.gz'    version '13-2.9.18'    sha1 '23849bdbdfc9176a2b53d157e58bd24aa0e7276e' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    depends_on 'libtiff' diff --git a/Library/Formula/librasterlite.rb b/Library/Formula/librasterlite.rb index d69772076..aa2fdda4d 100644 --- a/Library/Formula/librasterlite.rb +++ b/Library/Formula/librasterlite.rb @@ -4,9 +4,10 @@ class Librasterlite < Formula    homepage 'https://www.gaia-gis.it/fossil/librasterlite/index'    url 'http://www.gaia-gis.it/gaia-sins/librasterlite-sources/librasterlite-1.1g.tar.gz'    sha1 '87f0abab90600db64a7d468343163e760769f0c7' +  revision 1    depends_on "pkg-config" => :build -  depends_on :libpng +  depends_on "libpng"    depends_on "libgeotiff"    depends_on "libspatialite" diff --git a/Library/Formula/libsvg-cairo.rb b/Library/Formula/libsvg-cairo.rb index 70b213693..cc995aa76 100644 --- a/Library/Formula/libsvg-cairo.rb +++ b/Library/Formula/libsvg-cairo.rb @@ -4,10 +4,11 @@ class LibsvgCairo < Formula    homepage 'http://cairographics.org/'    url 'http://cairographics.org/snapshots/libsvg-cairo-0.1.6.tar.gz'    sha1 'c7bf131b59e8c00a80ce07c6f2f90f25a7c61f81' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'libsvg' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'cairo'    def install diff --git a/Library/Formula/libsvg.rb b/Library/Formula/libsvg.rb index 5ca871cd2..24b443ade 100644 --- a/Library/Formula/libsvg.rb +++ b/Library/Formula/libsvg.rb @@ -4,8 +4,9 @@ class Libsvg < Formula    homepage 'http://cairographics.org/'    url 'http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz'    sha1 '2198e65833eed905d93be70f3db4f0d32a2eaf57' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    depends_on 'pkg-config' => :build    depends_on 'jpeg' diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb index f4139be21..e457c4e18 100644 --- a/Library/Formula/libwmf.rb +++ b/Library/Formula/libwmf.rb @@ -4,11 +4,12 @@ class Libwmf < Formula    homepage 'http://wvware.sourceforge.net/libwmf.html'    url 'https://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz'    sha1 '822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'gd' -  depends_on :freetype -  depends_on :libpng +  depends_on 'freetype' +  depends_on 'libpng'    def install      system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Library/Formula/logstalgia.rb b/Library/Formula/logstalgia.rb index c66ce55a5..602f9e37c 100644 --- a/Library/Formula/logstalgia.rb +++ b/Library/Formula/logstalgia.rb @@ -4,6 +4,7 @@ class Logstalgia < Formula    homepage 'http://code.google.com/p/logstalgia/'    url 'https://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz'    sha1 '9d5db0f3598291b3a7a10b8f4bff9f6164eccadc' +  revision 1    head do      url 'https://github.com/acaudwell/Logstalgia.git' @@ -14,10 +15,10 @@ class Logstalgia < Formula    end    depends_on 'sdl' -  depends_on :freetype +  depends_on 'freetype'    depends_on 'pkg-config' => :build    depends_on 'ftgl' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    depends_on 'sdl_image'    depends_on 'pcre' diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb index 9ea511b78..1b80d73eb 100644 --- a/Library/Formula/mapnik.rb +++ b/Library/Formula/mapnik.rb @@ -4,6 +4,7 @@ class Mapnik < Formula    homepage 'http://www.mapnik.org/'    url 'http://mapnik.s3.amazonaws.com/dist/v2.2.0/mapnik-v2.2.0.tar.bz2'    sha1 'e493ad87ca83471374a3b080f760df4b25f7060d' +  revision 1    # can be removed at Mapnik > 2.2.0    # https://github.com/mapnik/mapnik/issues/1973 diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb index 0f3ea0a8d..12017d3f9 100644 --- a/Library/Formula/mapserver.rb +++ b/Library/Formula/mapserver.rb @@ -4,6 +4,7 @@ class Mapserver < Formula    homepage 'http://mapserver.org/'    url 'http://download.osgeo.org/mapserver/mapserver-6.2.1.tar.gz'    sha1 'bbe4234a4dcc179812c6598f68fe59a3dae63e44' +  revision 1    option "with-fastcgi", "Build with fastcgi support"    option "with-geos", "Build support for GEOS spatial operations" @@ -12,8 +13,8 @@ class Mapserver < Formula    env :userpaths -  depends_on :freetype -  depends_on :libpng +  depends_on 'freetype' +  depends_on 'libpng'    depends_on 'swig' => :build    depends_on 'giflib'    depends_on 'gd' => %w{with-freetype} diff --git a/Library/Formula/mldonkey.rb b/Library/Formula/mldonkey.rb index 5ba782281..57f91c1be 100644 --- a/Library/Formula/mldonkey.rb +++ b/Library/Formula/mldonkey.rb @@ -4,13 +4,14 @@ class Mldonkey < Formula    homepage 'http://mldonkey.sourceforge.net/Main_Page'    url 'https://downloads.sourceforge.net/project/mldonkey/mldonkey/3.1.3/mldonkey-3.1.3.tar.bz2'    sha1 '424386f277e84df55a2cbab213fae60787e42c8b' +  revision 1    option "with-x", "Build mldonkey with X11 support"    depends_on 'pkg-config' => :build    depends_on 'objective-caml'    depends_on 'gd' -  depends_on :libpng +  depends_on 'libpng'    if build.with? "x"      depends_on 'librsvg' diff --git a/Library/Formula/mupdf.rb b/Library/Formula/mupdf.rb index 9834367f4..ba5c823f7 100644 --- a/Library/Formula/mupdf.rb +++ b/Library/Formula/mupdf.rb @@ -4,13 +4,16 @@ class Mupdf < Formula    homepage 'http://mupdf.com'    url 'https://mupdf.googlecode.com/files/mupdf-1.3-source.tar.gz'    sha1 '082325aceb5565b07b82c2b6cc52a97533e03cf9' +  revision 1    depends_on :macos => :snow_leopard    depends_on 'jpeg'    depends_on 'openjpeg'    depends_on 'jbig2dec' -  depends_on :x11 # libpng, freetype and the X11 libs +  depends_on 'libpng' +  depends_on 'freetype' +  depends_on :x11    def install      openjpeg = Formula["openjpeg"] diff --git a/Library/Formula/nagios.rb b/Library/Formula/nagios.rb index 34f12d573..11bf779fd 100644 --- a/Library/Formula/nagios.rb +++ b/Library/Formula/nagios.rb @@ -4,10 +4,11 @@ class Nagios < Formula    homepage 'http://www.nagios.org/'    url 'https://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-3.5.1/nagios-3.5.1.tar.gz'    sha1 '486fd6c75db47000b96d6eebb1654c30d5e9bc72' +  revision 1    depends_on 'gd'    depends_on 'nagios-plugins' -  depends_on :libpng +  depends_on 'libpng'    def nagios_sbin;  prefix+'cgi-bin';       end    def nagios_etc;   etc+'nagios';           end diff --git a/Library/Formula/netpbm.rb b/Library/Formula/netpbm.rb index 033ba8ec6..0c9e0f62d 100644 --- a/Library/Formula/netpbm.rb +++ b/Library/Formula/netpbm.rb @@ -2,16 +2,17 @@ require 'formula'  class Netpbm < Formula    homepage 'http://netpbm.sourceforge.net' -  url 'svn+http://svn.code.sf.net/p/netpbm/code/advanced/', :revision => 1809 -  version '10.60.05'    # Maintainers: Look at http://netpbm.svn.sourceforge.net/viewvc/netpbm/    # for versions and matching revisions +  url 'svn+http://svn.code.sf.net/p/netpbm/code/advanced/', :revision => 1809 +  version '10.60.05' +  revision 1    head 'http://svn.code.sf.net/p/netpbm/code/trunk'    depends_on "libtiff"    depends_on "jasper" -  depends_on :libpng +  depends_on "libpng"    def install      system "cp", "config.mk.in", "config.mk" diff --git a/Library/Formula/openjpeg.rb b/Library/Formula/openjpeg.rb index ac4772559..cbd6bbb55 100644 --- a/Library/Formula/openjpeg.rb +++ b/Library/Formula/openjpeg.rb @@ -4,12 +4,13 @@ class Openjpeg < Formula    homepage 'http://www.openjpeg.org/'    url 'https://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz'    sha1 '1b0b74d1af4c297fd82806a9325bb544caf9bb8b' +  revision 1    head 'http://openjpeg.googlecode.com/svn/trunk/'    depends_on 'little-cms2'    depends_on 'libtiff' -  depends_on :libpng +  depends_on 'libpng'    def install      system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Library/Formula/openslide.rb b/Library/Formula/openslide.rb index 0d07066f5..ac047fbf5 100644 --- a/Library/Formula/openslide.rb +++ b/Library/Formula/openslide.rb @@ -4,9 +4,10 @@ class Openslide < Formula    homepage 'http://openslide.org/'    url 'http://download.openslide.org/releases/openslide/openslide-3.3.3.tar.gz'    sha1 '2315f0daa5d963e6ba9f1e67517cee44f9deabe5' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    depends_on 'libxml2'    depends_on 'libtiff' diff --git a/Library/Formula/pixie.rb b/Library/Formula/pixie.rb index 959f249af..94d63b7e9 100644 --- a/Library/Formula/pixie.rb +++ b/Library/Formula/pixie.rb @@ -4,11 +4,12 @@ class Pixie < Formula    homepage 'http://www.renderpixie.com/'    url 'https://downloads.sourceforge.net/project/pixie/pixie/Pixie%202.2.6/Pixie-src-2.2.6.tgz'    sha1 '651d3a76460f19cbbedb7d3d26ee9160182964d3' +  revision 1    depends_on 'libtiff'    depends_on 'fltk'    depends_on 'openexr' -  depends_on :libpng +  depends_on 'libpng'    depends_on :x11    def install diff --git a/Library/Formula/plotutils.rb b/Library/Formula/plotutils.rb index 5b6d42e39..216282f2f 100644 --- a/Library/Formula/plotutils.rb +++ b/Library/Formula/plotutils.rb @@ -5,8 +5,9 @@ class Plotutils < Formula    url 'http://ftpmirror.gnu.org/plotutils/plotutils-2.6.tar.gz'    mirror 'http://ftp.gnu.org/gnu/plotutils/plotutils-2.6.tar.gz'    sha1 '7921301d9dfe8991e3df2829bd733df6b2a70838' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    def install      # Fix usage of libpng to be 1.5 compatible diff --git a/Library/Formula/png++.rb b/Library/Formula/png++.rb index ff95f09b4..61fdaee6d 100644 --- a/Library/Formula/png++.rb +++ b/Library/Formula/png++.rb @@ -4,8 +4,9 @@ class Pngxx < Formula    homepage 'http://www.nongnu.org/pngpp/'    url 'http://download.savannah.nongnu.org/releases/pngpp/png++-0.2.5.tar.gz'    sha1 'bfe39c414a8c5c18dbaaf96fea22ce12a6887576' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    def install      system "make", "PREFIX=#{prefix}", "install" diff --git a/Library/Formula/png2ico.rb b/Library/Formula/png2ico.rb index b20503e77..2f8d66dcf 100644 --- a/Library/Formula/png2ico.rb +++ b/Library/Formula/png2ico.rb @@ -4,8 +4,9 @@ class Png2ico < Formula    homepage 'http://www.winterdrache.de/freeware/png2ico/'    url 'http://www.winterdrache.de/freeware/png2ico/data/png2ico-src-2002-12-08.tar.gz'    sha1 '955004bee9a20f12b225aa01895762cbbafaeb28' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    # Fix build with recent clang    patch :DATA diff --git a/Library/Formula/pngnq.rb b/Library/Formula/pngnq.rb index d0be96660..60a6bbd07 100644 --- a/Library/Formula/pngnq.rb +++ b/Library/Formula/pngnq.rb @@ -4,9 +4,10 @@ class Pngnq < Formula    homepage 'http://pngnq.sourceforge.net/'    url 'https://downloads.sourceforge.net/project/pngnq/pngnq/1.1/pngnq-1.1.tar.gz'    sha1 '6a43dc046171eee56ac2d91cebb93aecde24d26a' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :libpng +  depends_on 'libpng'    # Fixes compilation on OSX Lion    # png.h on Lion does not, in fact, include zlib.h diff --git a/Library/Formula/pngquant.rb b/Library/Formula/pngquant.rb index 813fa3c3a..c14fd0ec0 100644 --- a/Library/Formula/pngquant.rb +++ b/Library/Formula/pngquant.rb @@ -4,10 +4,11 @@ class Pngquant < Formula    homepage 'http://pngquant.org/'    url 'https://github.com/pornel/pngquant/archive/2.0.2.tar.gz'    sha1 'b7d3971d73a628ca5743331cf09bbe2e5574be73' +  revision 1    head 'https://github.com/pornel/pngquant.git' -  depends_on :libpng +  depends_on 'libpng'    def install      ENV.append_to_cflags "-DNDEBUG" # Turn off debug diff --git a/Library/Formula/podofo.rb b/Library/Formula/podofo.rb index 9de1e8b0e..b66746a3c 100644 --- a/Library/Formula/podofo.rb +++ b/Library/Formula/podofo.rb @@ -4,11 +4,12 @@ class Podofo < Formula    homepage 'http://podofo.sourceforge.net'    url 'https://downloads.sourceforge.net/podofo/podofo-0.9.2.tar.gz'    sha1 '8a6e27e17e0ed9f12e1a999cff66eae8eb97a4bc' +  revision 1    depends_on 'cmake' => :build -  depends_on :libpng -  depends_on :freetype -  depends_on :fontconfig +  depends_on 'libpng' +  depends_on 'freetype' +  depends_on 'fontconfig'    depends_on 'jpeg'    depends_on 'libtiff' diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index e2a3152f1..898427a8a 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -12,6 +12,7 @@ class Poppler < Formula    depends_on 'pkg-config' => :build +  depends_on 'libpng'    depends_on 'fontconfig'    depends_on 'openjpeg' diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb index 80b07efb8..a39588a5e 100644 --- a/Library/Formula/povray.rb +++ b/Library/Formula/povray.rb @@ -4,11 +4,12 @@ class Povray < Formula    homepage 'http://www.povray.org/'    url 'https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz'    sha1 '1d160d45e69d096e4c22f3b034dcc9ee94d22208' +  revision 1    depends_on :macos => :lion    depends_on :autoconf    depends_on :automake -  depends_on :libpng +  depends_on 'libpng'    depends_on 'boost'    depends_on 'jpeg'    depends_on 'libtiff' diff --git a/Library/Formula/pyxplot.rb b/Library/Formula/pyxplot.rb index ceadd9bb3..bb01b1eaa 100644 --- a/Library/Formula/pyxplot.rb +++ b/Library/Formula/pyxplot.rb @@ -4,6 +4,7 @@ class Pyxplot < Formula    homepage 'http://pyxplot.org.uk/'    url 'http://pyxplot.org.uk/src/pyxplot_0.9.2.tar.gz'    sha1 '5f09399bd00a4ae94a07ac186cf0e8e7761de625' +  revision 1    depends_on :x11    depends_on :tex diff --git a/Library/Formula/qrencode.rb b/Library/Formula/qrencode.rb index 97f96c3cf..007e673c8 100644 --- a/Library/Formula/qrencode.rb +++ b/Library/Formula/qrencode.rb @@ -4,9 +4,10 @@ class Qrencode < Formula    homepage 'http://fukuchi.org/works/qrencode/index.html.en'    url 'http://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2'    sha1 'a5056cf2fdc699ecf1d3c0cbea7b50993b0bf54e' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :libpng +  depends_on 'libpng'    def install      system "./configure", "--disable-dependency-tracking", diff --git a/Library/Formula/scale2x.rb b/Library/Formula/scale2x.rb index 83cf265ae..f292ff728 100644 --- a/Library/Formula/scale2x.rb +++ b/Library/Formula/scale2x.rb @@ -4,8 +4,9 @@ class Scale2x < Formula    homepage 'http://scale2x.sourceforge.net'    url 'https://downloads.sourceforge.net/project/scale2x/scale2x/2.4/scale2x-2.4.tar.gz'    sha1 '30bbd674dcdf134a58b34e75f87ed05bd716d484' +  revision 1 -  depends_on :libpng +  depends_on 'libpng'    def install      # This function was renamed in current versions of libpng. diff --git a/Library/Formula/sdl2_image.rb b/Library/Formula/sdl2_image.rb index d3001c67d..d40cb4364 100644 --- a/Library/Formula/sdl2_image.rb +++ b/Library/Formula/sdl2_image.rb @@ -4,6 +4,7 @@ class Sdl2Image < Formula    homepage 'http://www.libsdl.org/projects/SDL_image/'    url 'http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz'    sha1 '20b1b0db9dd540d6d5e40c7da8a39c6a81248865' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'sdl2' diff --git a/Library/Formula/sdl_image.rb b/Library/Formula/sdl_image.rb index a8e5e2506..e35334831 100644 --- a/Library/Formula/sdl_image.rb +++ b/Library/Formula/sdl_image.rb @@ -4,6 +4,7 @@ class SdlImage < Formula    homepage 'http://www.libsdl.org/projects/SDL_image'    url 'http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz'    sha1 '5e3e393d4e366638048bbb10d6a269ea3f4e4cf2' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'sdl' diff --git a/Library/Formula/sox.rb b/Library/Formula/sox.rb index 858f1d493..4a8bb4885 100644 --- a/Library/Formula/sox.rb +++ b/Library/Formula/sox.rb @@ -4,9 +4,10 @@ class Sox < Formula    homepage 'http://sox.sourceforge.net/'    url 'https://downloads.sourceforge.net/project/sox/sox/14.4.1/sox-14.4.1.tar.gz'    sha1 '71f05afc51e3d9b03376b2f98fd452d3a274d595' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :libpng +  depends_on 'libpng'    depends_on 'mad'    depends_on 'opencore-amr' => :optional    depends_on 'libvorbis' => :optional diff --git a/Library/Formula/swfmill.rb b/Library/Formula/swfmill.rb index e638becd3..36818291b 100644 --- a/Library/Formula/swfmill.rb +++ b/Library/Formula/swfmill.rb @@ -4,10 +4,11 @@ class Swfmill < Formula    homepage 'http://swfmill.org'    url 'http://swfmill.org/releases/swfmill-0.3.3.tar.gz'    sha1 '7aa2c674e20f5649985b6dde3838393c5efefb6e' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :freetype -  depends_on :libpng +  depends_on 'freetype' +  depends_on 'libpng'    def install      # Use inreplace instead of a patch due to newlines diff --git a/Library/Formula/synfig.rb b/Library/Formula/synfig.rb index c4cb28e8b..417b5ebdf 100644 --- a/Library/Formula/synfig.rb +++ b/Library/Formula/synfig.rb @@ -4,6 +4,7 @@ class Synfig < Formula    homepage 'http://synfig.org'    url 'https://downloads.sourceforge.net/project/synfig/releases/0.64.1/source/synfig-0.64.1.tar.gz'    sha1 '19fe81f144100c3f5e14a1b88b26a9b659fee3b8' +  revision 1    head 'git://synfig.git.sourceforge.net/gitroot/synfig/synfig' @@ -13,8 +14,8 @@ class Synfig < Formula    depends_on 'libsigc++'    depends_on 'libxml++'    depends_on 'imagemagick' -  depends_on :libpng -  depends_on :freetype +  depends_on 'libpng' +  depends_on 'freetype'    depends_on 'cairo'    depends_on 'pango'    depends_on 'boost' diff --git a/Library/Formula/tiff2png.rb b/Library/Formula/tiff2png.rb index a7c34856a..5658ed82f 100644 --- a/Library/Formula/tiff2png.rb +++ b/Library/Formula/tiff2png.rb @@ -4,9 +4,10 @@ class Tiff2png < Formula    homepage 'http://www.libpng.org/pub/png/apps/tiff2png.html'    url 'ftp://ftp.simplesystems.org/pub/libpng/png/applications/tiff2png/tiff2png-0.91.tar.gz'    sha1 '3a23abaaadbed8f3d13b88241257fe2078eb61fd' +  revision 1    depends_on 'libtiff' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg'    # libpng 1.5 no longer #includes zlib.h diff --git a/Library/Formula/ufraw.rb b/Library/Formula/ufraw.rb index 03d6a612a..cc7125807 100644 --- a/Library/Formula/ufraw.rb +++ b/Library/Formula/ufraw.rb @@ -4,9 +4,10 @@ class Ufraw < Formula    homepage 'http://ufraw.sourceforge.net'    url 'https://downloads.sourceforge.net/project/ufraw/ufraw/ufraw-0.19.2/ufraw-0.19.2.tar.gz'    sha1 '11a607e874eb16453a8f7964e4946a29d18b071d' +  revision 1    depends_on 'pkg-config' => :build -  depends_on :libpng +  depends_on 'libpng'    depends_on 'dcraw'    depends_on 'glib'    depends_on 'jpeg' diff --git a/Library/Formula/vice.rb b/Library/Formula/vice.rb index ba84087d5..8dea8a5cc 100644 --- a/Library/Formula/vice.rb +++ b/Library/Formula/vice.rb @@ -4,10 +4,11 @@ class Vice < Formula    homepage 'http://vice-emu.sourceforge.net/'    url 'http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.4.tar.gz'    sha1 '719aa96cc72e7578983fadea1a31c21898362bc7' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'jpeg' -  depends_on :libpng +  depends_on 'libpng'    depends_on 'giflib' => :optional    depends_on 'lame' => :optional diff --git a/Library/Formula/webalizer.rb b/Library/Formula/webalizer.rb index 06505da96..ba114fabe 100644 --- a/Library/Formula/webalizer.rb +++ b/Library/Formula/webalizer.rb @@ -4,10 +4,11 @@ class Webalizer < Formula    homepage 'http://www.mrunix.net/webalizer/'    url 'ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tgz'    sha1 'bc28ff28d9484c8e9793ec081c7cbfcb1f577351' +  revision 1    depends_on 'gd'    depends_on 'berkeley-db' -  depends_on :libpng +  depends_on 'libpng'    def install      system "./configure", "--disable-debug", diff --git a/Library/Formula/webp.rb b/Library/Formula/webp.rb index b7a458d03..b9b3a54df 100644 --- a/Library/Formula/webp.rb +++ b/Library/Formula/webp.rb @@ -4,10 +4,11 @@ class Webp < Formula    homepage 'http://code.google.com/speed/webp/'    url 'https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz'    sha1 '326c4b6787a01e5e32a9b30bae76442d18d2d1b6' +  revision 1    option :universal -  depends_on :libpng +  depends_on 'libpng'    depends_on 'jpeg' => :recommended    def install diff --git a/Library/Formula/wv.rb b/Library/Formula/wv.rb index fb219a967..6915fece1 100644 --- a/Library/Formula/wv.rb +++ b/Library/Formula/wv.rb @@ -4,12 +4,13 @@ class Wv < Formula    homepage 'http://wvware.sourceforge.net/'    url 'http://abisource.com/downloads/wv/1.2.5/wv-1.2.5.tar.gz'    sha1 'a196a31ca1c4083436d9414b9bf4809c0fd7c33c' +  revision 1    depends_on 'pkg-config' => :build    depends_on 'glib'    depends_on 'libgsf'    depends_on 'libwmf' -  depends_on :libpng +  depends_on 'libpng'    def install      ENV.libxml2 diff --git a/Library/Formula/xplanet.rb b/Library/Formula/xplanet.rb index ac9c72390..129912320 100644 --- a/Library/Formula/xplanet.rb +++ b/Library/Formula/xplanet.rb @@ -4,6 +4,7 @@ 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' +  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)" diff --git a/Library/Formula/zint.rb b/Library/Formula/zint.rb index 1485e8f17..23080015f 100644 --- a/Library/Formula/zint.rb +++ b/Library/Formula/zint.rb @@ -4,13 +4,14 @@ class Zint < Formula    homepage 'http://zint.github.io/'    url 'https://github.com/downloads/zint/zint/zint-2.4.3.tar.gz'    sha1 '300732d03c77ccf1031c485a20f09b51495ef5a3' +  revision 1    head 'git://zint.git.sourceforge.net/gitroot/zint/zint'    option 'qt', 'Build the zint-qt GUI.'    depends_on 'cmake' => :build -  depends_on :libpng +  depends_on 'libpng'    depends_on 'qt' if build.include? 'qt'    def install | 
