Commits

tomo cocoa committed b3c204a Merge

Merge branch 'master' of http://github.com/mxcl/homebrew

Comments (0)

Files changed (408)

Library/Contributions/brew_bash_completion.sh

     __brew_complete_formulae
 }
 
+_brew_link ()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    case "$cur" in
+    --*)
+        if __brewcomp_words_include "--dry-run"; then
+            return
+        elif __brewcomp_words_include "--force"; then
+            return
+        else
+            __brewcomp "--dry-run --force"
+            return
+        fi
+        ;;
+    esac
+    __brew_complete_installed
+}
+
 _brew_list ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
     case "$cmd" in
     --cache|--cellar|--prefix)  __brew_complete_formulae ;;
     audit|cat|edit|home)        __brew_complete_formulae ;;
-    link|ln|test|unlink)        __brew_complete_installed ;;
+    test|unlink)                __brew_complete_installed ;;
     upgrade)                    __brew_complete_outdated ;;
     cleanup)                    _brew_cleanup ;;
     create)                     _brew_create ;;
     fetch)                      _brew_fetch ;;
     info|abv)                   _brew_info ;;
     install)                    _brew_install ;;
+    link|ln)                    _brew_link ;;
     list|ls)                    _brew_list ;;
     log)                        _brew_log ;;
     missing)                    __brew_complete_formulae ;;

Library/Contributions/manpages/brew.1.md

     If `--git` is passed, Homebrew will create a Git repository, useful for
     creating patches to the software.
 
-  * `ln`, `link` <formula>:
+  * `ln`, `link [--force] [--dry-run]` <formula>:
     Symlink all of <formula>'s installed files into the Homebrew prefix. This
     is done automatically when you install formula, but can be useful for DIY
     installations.
 
+    If `--force` is passed, Homebrew will delete files which already exist in
+    the prefix while linking.
+
+    If `--dry-run` or `-n` is passed, Homebrew will list all files which would
+    be deleted by `brew link --force`, but will not actually link or delete
+    any files.
+
   * `ls, list [--unbrewed] [--versions]` [<formulae>]:
     Without any arguments, list all installed formulae.
 

Library/Formula/aalib.rb

   url 'http://downloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz'
   md5 'd5aa8e9eae07b7441298b5c30490f6a6'
 
+  depends_on :automake
+  depends_on :libtool
+  depends_on :x11
+
   # Fix malloc/stdlib issue on OS X
   def patches
     DATA
   end
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
-    # Build fails some of the time without `ENV.x11`!
-    # See: https://github.com/mxcl/homebrew/pull/10356
-    ENV.x11
     ENV.ncurses_define
-    system 'autoreconf --force --install'
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system 'autoreconf --force --install' # To fix X11 linker flags
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
                           "--infodir=#{info}",
-                          "--enable-shared=yes", "--enable-static=yes"
+                          "--enable-shared=yes",
+                          "--enable-static=yes"
     system "make install"
   end
 end

Library/Formula/abiword.rb

 class Abiword < Formula
   homepage 'http://www.abisource.com/'
   url 'http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz'
-  md5 'f883b0a7f26229a9c66fd6a1a94381aa'
+  sha1 '998f69d038000b3fc027d4259548f02d67c8d0df'
 
   devel do
     url 'http://www.abisource.com/downloads/abiword/2.9.2/source/abiword-2.9.2.tar.gz'
     sha1 '34a6e4e9c5619e8f2d619ac844519fc9378405b3'
   end
 
+  depends_on :libpng
   depends_on 'jpeg'
   depends_on 'fribidi'
   depends_on 'libgsf'
   depends_on 'wv'
   depends_on 'imagemagick'
 
+  def patches
+    if ARGV.build_devel?
+      {:p0 => "http://bugzilla.abisource.com/attachment.cgi?id=5477"}
+    else
+      DATA
+    end
+  end
+
   def install
-    ENV.libpng
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
   end
 end
+
+__END__
+diff --git a/src/af/util/xp/ut_go_file.h b/src/af/util/xp/ut_go_file.h
+index e29d7b7..8d5f608 100644
+--- a/src/af/util/xp/ut_go_file.h
++++ b/src/af/util/xp/ut_go_file.h
+@@ -31,7 +31,6 @@
+ 
+ #include <glib.h>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS

Library/Formula/android-sdk.rb

     mv 'tools', prefix
 
     %w[android apkbuilder ddms dmtracedump draw9patch etc1tool emulator
-    hierarchyviewer hprof-conv lint mksdcard monkeyrunner traceview
-    zipalign].each do |tool|
+    emulator-arm emulator-x86 hierarchyviewer hprof-conv lint mksdcard
+    monitor monkeyrunner traceview zipalign].each do |tool|
       (bin/tool).write <<-EOS.undent
         #!/bin/sh
         TOOL="#{prefix}/tools/#{tool}"
       dst.make_relative_symlink src
     end
 
-    (bin+'adb').write <<-EOS.undent
-      #!/bin/sh
-      ADB="#{prefix}/platform-tools/adb"
-      test -f "$ADB" && exec "$ADB" "$@"
-      echo Use the \\`android\\' tool to install the \\"Android SDK Platform-tools\\".
-    EOS
+    %w[aapt adb aidl dexdump dx fastboot llvm-rs-cc].each do |platform_tool|
+      (bin/platform_tool).write <<-EOS.undent
+        #!/bin/sh
+        PLATFORM_TOOL="#{prefix}/platform-tools/#{platform_tool}"
+        test -f "$PLATFORM_TOOL" && exec "$PLATFORM_TOOL" "$@"
+        echo Use the \\`android\\' tool to install the \\"Android SDK Platform-tools\\".
+      EOS
+    end
   end
 
   def caveats; <<-EOS.undent

Library/Formula/apiextractor.rb

-require 'formula'
-
-class Apiextractor < Formula
-  homepage 'http://www.pyside.org/docs/apiextractor'
-  url 'http://www.pyside.org/files/apiextractor-0.10.10.tar.bz2'
-  md5 '7cdf6bdbf161e15b8bc5e98df86f95ee'
-
-  depends_on 'cmake' => :build
-  depends_on 'qt'
-
-  def install
-    system "cmake", ".", *std_cmake_args
-    system "make install"
-  end
-end

Library/Formula/aplus.rb

     DATA
   end
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     # replace placeholder w/ actual prefix

Library/Formula/arangodb.rb

 
 class Arangodb < Formula
   homepage 'http://www.arangodb.org/'
-  url "https://github.com/triAGENS/ArangoDB/zipball/v1.0.alpha2"
-  sha1 'd6e90221dcc02252ae9bb66085a797d495be5bc4'
+  url "https://github.com/triAGENS/ArangoDB/zipball/v1.0.alpha3"
+  sha1 '1e63607f1d98edaa02e36e664ebb770ace0bbda7'
 
   head "https://github.com/triAGENS/ArangoDB.git"
 
   depends_on 'v8'
 
   def install
-    system "./configure", "--prefix=#{prefix}",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--disable-relative",
                           "--disable-all-in-one",
                           "--enable-mruby",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
                           "--datadir=#{share}",
                           "--localstatedir=#{var}"
 
     system "make install"
 
-    (var+'arango').mkpath
+    (var+'arangodb').mkpath
+    (var+'log/arangodb').mkpath
+
+    plist_path.write startup_plist
+    plist_path.chmod 0644
   end
 
   def caveats; <<-EOS.undent
 
       https://github.com/triAGENS/ArangoDB/issues
 
-    To start the ArangoDB server, run:
+    If this is your first install, automatically load on login with:
+        mkdir -p ~/Library/LaunchAgents
+        cp #{plist_path} ~/Library/LaunchAgents/
+        launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
+
+    If this is an upgrade and you already have the #{plist_path.basename} loaded:
+        launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
+        cp #{plist_path} ~/Library/LaunchAgents/
+        launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
+
+    To start the ArangoDB server manually, run:
         /usr/local/sbin/arangod
 
     To start the ArangoDB shell, run:
         arangosh
     EOS
   end
+
+  def startup_plist
+    return <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>#{plist_name}</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>#{HOMEBREW_PREFIX}/sbin/arangod</string>
+      <string>-c</string>
+      <string>#{etc}/arangodb/arangod.conf</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>UserName</key>
+    <string>#{`whoami`.chomp}</string>
+  </dict>
+</plist>
+    EOS
+  end
 end

Library/Formula/ascii.rb

 require 'formula'
 
 class Ascii < Formula
-  url 'http://www.catb.org/~esr/ascii/ascii-3.10.tar.gz'
   homepage 'http://www.catb.org/~esr/ascii/'
-  md5 '9dcae3ab8b097efd16a24c5d20e0044e'
+  url 'http://www.catb.org/~esr/ascii/ascii-3.11.tar.gz'
+  sha1 '8d033809d14fec814fc9a5818420718043a49e7b'
 
   def install
     system "make"
     bin.install "ascii"
+    man1.install 'ascii.1'
   end
 end

Library/Formula/asciidoc.rb

 require 'formula'
 
 class Asciidoc < Formula
+  homepage 'http://www.methods.co.nz/asciidoc'
   url 'http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz'
-  md5 'edcf05b28ce21a4d27b1cd3028930021'
+  sha1 '5fc55496b2a23e2cc1dcc1f6b1f75dd06fcdefa1'
+
   head 'https://code.google.com/p/asciidoc/', :using => :hg
-  homepage 'http://www.methods.co.nz/asciidoc'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
+  depends_on :autoconf if ARGV.build_head?
   depends_on 'docbook'
 
   def install

Library/Formula/atf.rb

 require 'formula'
 
 class Atf < Formula
-  url 'ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.14/atf-0.14.tar.gz'
-  homepage 'http://www.netbsd.org/~jmmv/atf/index.html'
-  sha256 'bfdd26321f3e4d62254277a646b2df7ce113369c4a79090b8d77c2e9979eba7a'
+  homepage 'http://code.google.com/p/kyua/wiki/ATF'
+  url 'http://kyua.googlecode.com/files/atf-0.15.tar.gz'
+  sha256 '0c7242a107c7e308feed8fac45a194a6f6c8d90283add576cfc3dab0fcd61b2b'
 
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--sysconfdir=#{etc}",
-                          "--mandir=#{man}"
-    system "make install"
+                          "--sysconfdir=#{etc}"
+    system 'make'
+    ENV.j1  # Fixes an llvm race condition error where a file exists.
+    system 'make install'
   end
 end

Library/Formula/atomicparsley.rb

 require 'formula'
 
 class Atomicparsley < Formula
-  url 'https://bitbucket.org/wez/atomicparsley/get/0.9.4.tar.bz2'
   homepage 'http://bitbucket.org/wez/atomicparsley/overview/'
-  md5 '2ce6f39cedc959f46b5515920c35d0d7'
+  url 'https://bitbucket.org/dinkypumpkin/atomicparsley/downloads/atomicparsley-0.9.5.tar.bz2'
+  sha1 'ffdf42179f83b344670bd7d7b6cfd829e1a1ea6a'
 
   head 'https://bitbucket.org/wez/atomicparsley', :using => :hg
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     system "./autogen.sh"
     system "make install"
   end
 end
-

Library/Formula/atool.rb

   url 'http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz'
   md5 'e0aa006decbc6484b9dba2879f1bb9f0'
 
-  depends_on "gnu-sed"
-
   def install
     system "./configure", "--prefix=#{prefix}"
-    # OS X sed doesn't work; use GNU sed
-    inreplace 'Makefile', 'sed -r', '#{HOMEBREW_PREFIX}/bin/gsed'
     system "make install"
   end
 end

Library/Formula/autogen.rb

 
 class Autogen < Formula
   homepage 'http://autogen.sourceforge.net'
-  url 'http://ftpmirror.gnu.org/autogen/rel5.15/autogen-5.15.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/autogen/rel5.15/autogen-5.15.tar.gz'
-  md5 '2e77ddd723433bef4adc644c93553c3d'
+  url 'http://ftpmirror.gnu.org/autogen/rel5.16.1/autogen-5.16.1.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/autogen/rel5.16.1/autogen-5.16.1.tar.gz'
+  sha1 'a3a1aac9df966aabad39c68c01668bb2ba6be566'
 
   depends_on 'guile'
 

Library/Formula/automake.rb

 
 class Automake < Formula
   homepage 'http://www.gnu.org/software/automake/'
-  url 'http://ftpmirror.gnu.org/automake/automake-1.12.1.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.1.tar.gz'
-  sha1 'e39d3e95e384549cbac22f9f0b110fa53825ddef'
+  url 'http://ftpmirror.gnu.org/automake/automake-1.12.2.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz'
+  sha1 '3a31471923be1cff1d2fe68166ae209ab455aa0f'
 
-  depends_on "autoconf" => :build
+  # Always needs a newer autoconf, even on Snow Leopard.
+  depends_on 'autoconf'
 
   if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/automake"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake."
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
-    # our aclocal must go first: https://github.com/mxcl/homebrew/issues/10618
+    # Our aclocal must go first. See:
+    # https://github.com/mxcl/homebrew/issues/10618
     (share/"aclocal/dirlist").write <<-EOS.undent
       #{HOMEBREW_PREFIX}/share/aclocal
       /usr/share/aclocal
-      EOS
+    EOS
   end
 
   def test

Library/Formula/aview.rb

   md5 '093f298e7787591e229b59d039c72f4d'
 
   depends_on 'aalib'
+  depends_on :x11
 
   def patches
     DATA
   end
 
   def install
-    ENV.x11
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}"
     system "make install"

Library/Formula/aws-elasticache.rb

 
 class AwsElasticache < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/2310261897259567'
-  url 'https://s3.amazonaws.com/elasticache-downloads/AmazonElastiCacheCli-2011-07-15-1.5.000.zip'
-  version '1.5.0'
-  md5 '68581c62ef0a820f12294415c60fe45f'
+  url 'https://s3.amazonaws.com/elasticache-downloads/AmazonElastiCacheCli-2012-03-09-1.6.000.zip'
+  version '1.6.0'
+  md5 'd5d5f6ee58105b0d994bde4ff120b867'
 
   depends_on 'ec2-api-tools'
 

Library/Formula/aws-iam-tools.rb

 require 'formula'
 
 class AwsIamTools < AmazonWebServicesFormula
-  homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=4143&categoryID=322'
+  homepage 'http://aws.amazon.com/developertools/4143'
   url 'http://awsiammedia.s3.amazonaws.com/public/tools/cli/latest/IAMCli.zip'
-  version "1.4.0"
-  md5 '666f31802eda23723bcc04e0440a138f'
+  md5 '7b479a42c09f0d64771dbb0415c3df9f'
+  version "1.5.0"
 
   def install
     standard_install

Library/Formula/bash-completion.rb

 require 'formula'
 
+# NOTE: version 2.0 is out, but it requires Bash 4, and OS X ships
+# with 3.2.48
 class BashCompletion < Formula
-  url 'http://bash-completion.alioth.debian.org/files/bash-completion-1.3.tar.bz2'
   homepage 'http://bash-completion.alioth.debian.org/'
-  md5 'a1262659b4bbf44dc9e59d034de505ec'
+  url 'http://bash-completion.alioth.debian.org/files/bash-completion-1.3.tar.bz2'
+  sha1 '6a46b93f44c56cc336632ab28d90c0595fbcc98f'
+
   head 'git://git.debian.org/git/bash-completion/bash-completion.git'
 
-  depends_on "automake" => :build if ARGV.build_head? and MacOS.xcode_version.to_f >= 4.3
+  if ARGV.build_head?
+    depends_on :autoconf
+    depends_on :automake
+  end
 
   def install
     inreplace "bash_completion" do |s|

Library/Formula/blitz.rb

 class Blitz < Formula
   homepage 'http://oonumerics.org/blitz'
   url 'http://downloads.sourceforge.net/project/blitz/blitz/Blitz%2B%2B%200.9/blitz-0.9.tar.gz'
-  md5 '031df2816c73e2d3bd6d667bbac19eca'
+  sha1 '055a4bcb47903e5c2446884d2df1494ac3e24034'
 
   head 'http://blitz.hg.sourceforge.net:8000/hgroot/blitz/blitz', :using => :hg
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install

Library/Formula/bsdiff.rb

 require 'formula'
 
 class Bsdiff < Formula
-  url 'http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz'
   homepage 'http://www.daemonology.net/bsdiff'
-  md5 'e6d812394f0e0ecc8d5df255aa1db22a'
+  url 'http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz'
+  sha1 '0c0a89d604fc55ef2b5e69cd18372b2972edd8b8'
 
-  depends_on 'bsdmake' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :bsdmake
 
   def patches
     DATA

Library/Formula/bsdmake.rb

                  '@PREFIX@', prefix
 
     # X11 path shouldn't be munged
-    inreplace 'mk/sys.mk', '@PREFIX@', '/usr/X11'
+    inreplace 'mk/sys.mk', '@PREFIX@', MacOS.x11_prefix
 
     inreplace 'mk/bsd.own.mk' do |s|
       s.gsub! '@INSTALL_USER@', `id -un`.chomp

Library/Formula/bulk_extractor.rb

 class BulkExtractor < Formula
   homepage 'https://github.com/simsong/bulk_extractor/wiki'
   url 'https://github.com/downloads/simsong/bulk_extractor/bulk_extractor-1.2.2.tar.gz'
-  md5 '11ccee3709ac862a41edad309153c7a3'
+  sha1 '2f0a2049259f826afe253cf5baeeb139b795dddb'
+
+  depends_on :autoconf
+  depends_on :automake
 
   depends_on 'afflib' => :optional
   depends_on 'exiv2' => :optional
   depends_on 'libewf' => :optional
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
-  depends_on 'automake' => :build if MacOS.xcode_version.to_f >= 4.3
 
   def install
     system "autoreconf", "-i"

Library/Formula/byacc.rb

+require 'formula'
+
+class Byacc < Formula
+  homepage 'http://invisible-island.net/byacc/byacc.html'
+  url 'ftp://invisible-island.net/byacc/byacc-20120526.tgz'
+  sha1 '69662091c2ad42e4048860b886adbf5bab5a53a6'
+
+  def install
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--program-prefix=b",
+                          "--prefix=#{prefix}",
+                          "--man=#{man}"
+    system "make install"
+  end
+end

Library/Formula/cairo.rb

 
 class Cairo < Formula
   homepage 'http://cairographics.org/'
-  url 'http://www.cairographics.org/releases/cairo-1.10.2.tar.gz'
-  sha1 'ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
+  url 'http://cairographics.org/releases/cairo-1.12.2.tar.xz'
+  sha256 'b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96'
 
   depends_on 'pkg-config' => :build
+  depends_on 'xz'=> :build
   depends_on 'pixman'
+  depends_on :x11
 
   keg_only :provided_by_osx,
             "The Cairo provided by Leopard is too old for newer software to link against."
     [['--universal', 'Build a universal library']]
   end
 
-  # Fixes a build error with llvm, 'lto could not merge'.  Fixes a build error
-  # when brewing universal, cannot use 'lto-bc' with multiple -arch options.
   # Fixes a build error with clang & universal, where a function was implicit.
-  # Not reported upstream because we are using an old version, Cairo-1.10.2.
-  # cf. issues #12923 and #10400
   def patches; DATA; end
 
   def install
-    ENV.universal_binary if ARGV.include? '--universal'
+    ENV.universal_binary if ARGV.build_universal?
+
+    pixman = Formula.factory('pixman')
+    ENV['pixman_CFLAGS'] = "-I#{pixman.include}/pixman-1"
+    ENV['pixman_LIBS'] = "-L#{pixman.lib} -lpixman-1"
+
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
-      --with-x
-    ]
-    args << '--enable-xcb' unless MacOS.leopard?
+      --with-x]
+
+    args << '--enable-xcb=no' if MacOS.leopard?
 
     system "./configure", *args
     system "make install"
 end
 
 __END__
---- a/configure	2010-12-25 06:22:57.000000000 -0800
-+++ b/configure	2012-06-19 22:39:49.000000000 -0700
-@@ -17224,7 +17224,7 @@
+diff --git a/configure b/configure
+index b75757d..1230da2 100755
+--- a/configure
++++ b/configure
+@@ -17939,7 +17939,7 @@ CAIRO_NONPKGCONFIG_LIBS="$LIBS"
  
  MAYBE_WARN="-Wall -Wextra \
  -Wold-style-definition -Wdeclaration-after-statement \
  -Wnested-externs -Wpointer-arith -Wwrite-strings \
  -Wsign-compare -Wstrict-prototypes -Wmissing-prototypes \
  -Wpacked -Wswitch-enum -Wmissing-format-attribute \
-@@ -17236,7 +17236,7 @@
- MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
- 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
- 
--MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
-+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
- 
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 

Library/Formula/cairomm.rb

 
   depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
-  depends_on 'cairo' if MACOS_VERSION <= 10.6
+  depends_on 'cairo'
+  depends_on :x11
 
   def install
     system "./configure", "--disable-dependency-tracking",

Library/Formula/casperjs.rb

 
 class Casperjs < Formula
   homepage 'http://www.casperjs.org/'
-  url "https://github.com/n1k0/casperjs/tarball/0.6.10"
-  sha1 'eb8155970117fa0748266e7b188030b15d67dcab'
+  url 'https://github.com/n1k0/casperjs/tarball/1.0.0-RC1'
+  sha1 '3f08685bf41044a200b78110f5c2062ce1bb918c'
 
   head 'https://github.com/n1k0/casperjs.git'
 

Library/Formula/cassandra.rb

 
 class Cassandra < Formula
   homepage 'http://cassandra.apache.org'
-  url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.1.1/apache-cassandra-1.1.1-bin.tar.gz'
-  sha1 '32c6719c53dae7c520c91028e98b2c66d18fc264'
+  url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.1.2/apache-cassandra-1.1.2-bin.tar.gz'
+  sha1 'a4e9188c4662d80a70edf1b1c3b2cff6be5be91f'
 
   def install
     (var+"lib/cassandra").mkpath

Library/Formula/cdparanoia.rb

 require 'formula'
 
 class Cdparanoia < Formula
-  url 'http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz'
   homepage 'http://www.xiph.org/paranoia/'
+  url 'http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz'
   md5 'b304bbe8ab63373924a744eac9ebc652'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :autoconf
 
   fails_with :llvm do
     build 2326
     system "autoconf"
     # Libs are installed as keg-only because most software that searches for cdparanoia
     # will fail to link against it cleanly due to our patches
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-           "--prefix=#{prefix}", "--mandir=#{man}", "--libdir=#{libexec}"
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--libdir=#{libexec}"
     system "make all"
     system "make install"
   end

Library/Formula/ceylon.rb

 
 class Ceylon < Formula
   homepage 'http://ceylon-lang.org/'
-  url 'http://ceylon-lang.org/download/dist/1_0_Milestone3'
-  version '1.0M3'
-  sha1 'c25efda8c717da55d92c063dd5414a02aab8ff1d'
+  url 'http://ceylon-lang.org/download/dist/1_0_Milestone3_1'
+  version '1.0M3.1'
+  sha1 'f9c267b567358bfab6387a329b3e540715850c47'
 
   def install
     rm_f Dir["bin/*.bat"]

Library/Formula/cfengine.rb

 
 class Cfengine < Formula
   homepage 'http://cfengine.com/'
-  url 'https://cfengine.com/source-code/download?file=cfengine-3.3.2.tar.gz'
-  sha1 'e669f51bbc31f65cfd45bc895d0b101287606563'
+  url 'https://cfengine.com/source-code/download?file=cfengine-3.3.4.tar.gz'
+  sha1 '143ab0000e39b9ba2fb0b00a0f0ce69608787423'
 
   depends_on 'tokyo-cabinet'
   depends_on 'pcre'

Library/Formula/cgal.rb

 
 class Cgal < Formula
   homepage 'http://www.cgal.org/'
-  url 'https://gforge.inria.fr/frs/download.php/30387/CGAL-4.0.tar.gz'
-  sha1 '3cbc6431918fe56146cd70713d6cfa6c37c0ad0c'
+  url 'https://gforge.inria.fr/frs/download.php/31175/CGAL-4.0.2.tar.gz'
+  sha1 'e80af4b1da25690df63ce83dd083710cc3db9697'
 
   depends_on 'cmake' => :build
   depends_on 'boost'

Library/Formula/cloud-watch.rb

 
 class CloudWatch < AmazonWebServicesFormula
   version  '1.0.12.1'
-  homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=2534&categoryID=251'
+  homepage 'http://aws.amazon.com/developertools/2534'
   url      'http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip'
   md5      '2c8fb900beab1450db334f8b09811d98'
 

Library/Formula/clusterit.rb

   url 'http://downloads.sourceforge.net/project/clusterit/clusterit/clusterit-2.5/clusterit-2.5.tar.gz'
   md5 'f0e772e07122e388de629fb57f7237ab'
 
+  depends_on :x11
+
   def install
-    ENV.x11
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"

Library/Formula/clutter.rb

 
 class Clutter < Formula
   homepage 'http://clutter-project.org/'
-  url 'http://source.clutter-project.org/sources/clutter/1.6/clutter-1.6.20.tar.bz2'
-  sha256 'c4e40c7a553a0437a3b8c54da440bf54b44114bd83d68d4eeea425fed90e046e'
+  url 'http://source.clutter-project.org/sources/clutter/1.10/clutter-1.10.6.tar.bz2'
+  sha256 '791bf752de2636989b82007d9f2a3a83bba56b13c329f40ca67e4d35ed982b31'
 
   depends_on 'pkg-config' => :build
   depends_on 'atk'
-  # Cairo is keg-only and usually only used for Leopard builds.
-  # But Clutter requires a newer version of Cairo that what comes with Snow Leopard.
-  depends_on 'cairo'
   depends_on 'intltool'
   depends_on 'json-glib'
   depends_on 'pango'
+  depends_on 'cairo' # for cairo-gobject
+  depends_on :x11
+  depends_on 'cogl'
+  depends_on 'gdk-pixbuf'
 
   def install
     system "./configure", "--prefix=#{prefix}",
-                          "--with-flavour=osx",
-                          "--with-imagebackend=quartz",
-                          "--disable-introspection"
+                          "--disable-introspection",
+                          "--enable-quartz-backend",
+                          "--disable-x11-backend"
     system "make install"
   end
 end

Library/Formula/cogl.rb

+require 'formula'
+
+class Cogl < Formula
+  homepage 'http://wiki.clutter-project.org/wiki/Cogl'
+  url 'http://source.clutter-project.org/sources/cogl/1.10/cogl-1.10.2.tar.bz2'
+  sha256 'ce4705693e98c064d5493913b2ffe23a49a9c83b644b2277d882b960369bc545'
+
+  head 'git://git.gnome.org/cogl'
+
+  depends_on 'pkg-config' => :build
+  depends_on :x11
+  depends_on 'pango'
+  depends_on 'cairo' # needs cairo-gobject
+  depends_on 'glib'
+
+  def install
+    system "./autogen.sh" if ARGV.build_head?
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-introspection"
+    system "make install"
+  end
+end

Library/Formula/crf++.rb

 require 'formula'
 
 class Crfxx < Formula
-  url 'http://downloads.sourceforge.net/project/crfpp/crfpp/0.54/CRF++-0.54.tar.gz'
-  homepage 'http://crfpp.sourceforge.net/'
-  md5 'a3c12c99b25e06d18147d50f0f92e8d3'
+  homepage 'http://code.google.com/p/crfpp/'
+  url 'http://crfpp.googlecode.com/files/CRF++-0.57.tar.gz'
+  sha1 'bb80676edd8fee5835b967700c30884b50a7c766'
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"

Library/Formula/crossroads.rb

 class Crossroads < Formula
   homepage 'http://www.crossroads.io/'
   url 'http://download.crossroads.io/libxs-1.2.0.tar.gz'
-  md5 'aac1264bb0d03704bd2126419b981fd5'
-  head 'https://github.com/crossroads-io/libxs.git'
+  sha1 'd9633e6df56e3ed0c4f0e86d80ee0ae10c8a966a'
 
-  fails_with :llvm do
-    build 2326
-    cause "Compiling with LLVM gives a segfault while linking."
-  end
+  head 'https://github.com/crossroads-io/libxs.git'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def options
     [['--with-pgm', 'Build with PGM extension']]
   end
 
+  fails_with :llvm do
+    build 2326
+    cause "Compiling with LLVM gives a segfault while linking."
+  end
+
   def install
     system "./autogen.sh" if ARGV.build_head?
 

Library/Formula/ctags.rb

 require 'formula'
 
 class Ctags < Formula
-  url 'http://downloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
   homepage 'http://ctags.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
   md5 'c00f82ecdcc357434731913e5b48630d'
 
   head 'https://ctags.svn.sourceforge.net/svnroot/ctags/trunk'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :autoconf
 
   fails_with :llvm do
     build 2335

Library/Formula/curlftpfs.rb

 class Curlftpfs < Formula
   homepage 'http://curlftpfs.sourceforge.net/'
   url 'http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/0.9.2/curlftpfs-0.9.2.tar.gz'
-  md5 'b452123f755114cd4461d56c648d9f12'
+  sha1 '83f148afe6bd4d44c9790790f1c30986c8b9ea56'
+
   head 'https://github.com/rfw/curlftpfs.git'
 
-  depends_on 'pkg-config' => :build
+  depends_on :automake
+  depends_on :libtool
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on 'pkg-config' => :build
 
   depends_on 'fuse4x'
   depends_on 'glib'

Library/Formula/dash.rb

 require 'formula'
 
 class Dash < Formula
-  url 'http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz'
   homepage 'http://gondor.apana.org.au/~herbert/dash/'
+  url 'http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz'
   sha1 'a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6'
 
   head 'https://git.kernel.org/pub/scm/utils/dash/dash.git'
 
-  depends_on "automake" => :build if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+  depends_on :automake if ARGV.build_head?
 
   def install
     if ARGV.build_head?

Library/Formula/dc3dd.rb

 class Dc3dd < Formula
   homepage 'http://sourceforge.net/projects/dc3dd/'
   url 'http://downloads.sourceforge.net/project/dc3dd/dc3dd/7.1.0/dc3dd-7.1.614.tar.gz'
-  md5 'b6c4ec16e7f539b17224d7f334f8396e'
+  sha1 '808abb6472861a88efd94fd22ffea7021007d769'
+
+  depends_on :automake
 
   # Remove explicit dependency on automake 1.10.1
   def patches; DATA; end

Library/Formula/dcmtk.rb

   url 'ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.tar.gz'
   md5 '19409e039e29a330893caea98715390e'
 
+  depends_on :x11
   depends_on 'libtiff'
   depends_on 'doxygen' if ARGV.include? '--with-docs'
 
 
   def install
     ENV.m64 if MacOS.prefer_64_bit?
-    ENV.x11
 
     args = std_cmake_args
     args << '-DDCMTK_WITH_DOXYGEN=YES' if ARGV.include? '--with-docs'

Library/Formula/devil.rb

   homepage 'http://sourceforge.net/projects/openil/'
   md5 '7918f215524589435e5ec2e8736d5e1d'
 
+  depends_on :x11
   depends_on 'jpeg'
   depends_on 'libtiff'
   depends_on 'little-cms'
   # also, even with -std=gnu99 removed from the configure script,
   # devil fails to build with clang++ while compiling il_exr.cpp
   fails_with :clang do
-    build 318
+    build 421
     cause "invalid -std=gnu99 flag while building C++"
   end
 
   def patches; DATA; end
 
   def install
-    # devil won't find libpng without ENV.x11
-    ENV.x11
-
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}", "--enable-ILU"
     system "make install"

Library/Formula/dia.rb

   depends_on 'pango'
   depends_on 'libtiff'
   depends_on 'gtk+'
+  depends_on :x11
 
   def patches
     # fixes compilation with glib 2.31+
   end
 
   def install
-    ENV.x11
     # fix for Leopard, potentially others with isspecial defined elswhere
     inreplace 'objects/GRAFCET/boolequation.c', 'isspecial', 'char_isspecial'
     system "./configure", "--enable-debug=no",

Library/Formula/dvdauthor.rb

 
   depends_on 'pkg-config' => :build
   depends_on 'libdvdread'
+  depends_on :x11
 
   # Fix build with png-1.5. Patch has been applied upstream, but no tagged
   # release has been made since 2010. See:
   end
 
   def install
-    ENV.x11 # For libpng, etc.
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}"

Library/Formula/dzen2.rb

   homepage 'http://sites.google.com/site/gotmor/dzen'
   md5 '5978620c2124c8a8ad52d7f17ce94fd7'
 
+  depends_on :x11
+
   def install
-    ENV.x11
     ENV.append 'LDFLAGS', '-lX11 -lXinerama -lXpm'
     ENV.append_to_cflags '-DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM'
 

Library/Formula/ec2-ami-tools.rb

 
 class Ec2AmiTools < AmazonWebServicesFormula
   homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368'
-  url 'http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.3-45758.zip'
-  md5 'b3fd0dd779277ba40f0f234bfa309135'
+  url 'http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.4.0.7.zip'
+  md5 '9d315e7d7d8f5713b2349d3de2aec42b'
 
   def install
     standard_install

Library/Formula/ec2-api-tools.rb

 
 class Ec2ApiTools < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/351'
-  url 'http://ec2-downloads.s3.amazonaws.com/ec2-api-tools-1.5.2.5.zip'
-  md5 'a9926c03fe3c05ff2e7fed3ae1b31634'
+  url 'http://ec2-downloads.s3.amazonaws.com/ec2-api-tools-1.5.5.0.zip'
+  md5 '51c79657e921cfaaea8d0bff98bbc24b'
 
   def install
     standard_install

Library/Formula/eet.rb

 class Eet < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Eet'
   url 'http://download.enlightenment.org/releases/eet-1.5.0.tar.gz'
-  md5 'f6fd734fbf6a2852abf044a2e1a8cabf'
+  sha1 '58a06c81027e4d85e5ced3260dde1faf4046b2ce'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/eet/'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'eina'
   depends_on 'jpeg'
   depends_on 'lzlib'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",

Library/Formula/eigen.rb

 
 class Eigen < Formula
   homepage 'http://eigen.tuxfamily.org/'
-  url 'http://bitbucket.org/eigen/eigen/get/3.0.5.tar.bz2'
-  md5 '43070952464a5bf21694e082e7fb8fce'
+  url 'http://bitbucket.org/eigen/eigen/get/3.1.0.tar.bz2'
+  sha1 '6afc46e7d44e85622024341500c3464e0e04beb4'
 
   depends_on 'cmake' => :build
 

Library/Formula/eina.rb

 class Eina < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Eina'
   url 'http://download.enlightenment.org/releases/eina-1.1.0.tar.gz'
-  md5 'fedb3814427827c1bb777edea3c86298'
+  sha1 'b9dbfda79d0cc9cdc28a4a87125d339688bb65a4'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/eina/'
 
-  depends_on 'pkg-config' => :build
-
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
   end
 
+  depends_on 'pkg-config' => :build
+
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",

Library/Formula/elb-tools.rb

 require 'formula'
 
 class ElbTools < AmazonWebServicesFormula
-  homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?categoryID=251&externalID=2536'
+  homepage 'http://aws.amazon.com/developertools/2536'
   url 'http://ec2-downloads.s3.amazonaws.com/ElasticLoadBalancing.zip'
   version '1.0.17.0'
   sha1 '0546f9dde4a98e2371cf7a03b419bab09254f99c'

Library/Formula/elinks.rb

 class Elinks < Formula
   homepage 'http://elinks.or.cz/'
   url 'http://elinks.or.cz/download/elinks-0.11.7.tar.bz2'
-  md5 'fcd087a6d2415cd4c6fd1db53dceb646'
+  sha1 'd13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54'
 
   head 'http://elinks.cz/elinks.git'
 
     md5 '92790144290131ac5e63b44548b45e08'
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   fails_with :llvm do

Library/Formula/emacs.rb

     head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk'
   end
 
+  depends_on :x11 if ARGV.include? "--with-x"
+
   # Stripping on Xcode 4 causes malformed object errors.
   # Just skip everything.
   skip_clean :all
       prefix.install "nextstep/Emacs.app"
     else
       if ARGV.include? "--with-x"
-        ENV.x11
         # These libs are not specified in xft's .pc. See:
         # https://trac.macports.org/browser/trunk/dports/editors/emacs/Portfile#L74
         # https://github.com/mxcl/homebrew/issues/8156

Library/Formula/embryo.rb

 class Embryo < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Embryo'
   url 'http://download.enlightenment.org/releases/embryo-1.1.0.tar.gz'
-  md5 'aded5754ee7f586e3a0631e0fa3abcc8'
+  sha1 'f17bd3af565ada4ed5bbae1818c871b33c0897b8'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/embryo/'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'eina'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",

Library/Formula/erlang.rb

   # may as well skip bin too, everything is just shell scripts
   skip_clean ['lib', 'bin']
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  # remove the autoreconf if possible
+  depends_on :automake
+  depends_on :libtool
 
   fails_with :llvm do
     build 2334

Library/Formula/exiftool.rb

 
 class Exiftool < Formula
   homepage 'http://www.sno.phy.queensu.ca/~phil/exiftool/index.html'
-  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.95.tar.gz'
-  sha1 'a4fa6f7758317c16ca473974ae76abdb4c0302ff'
+  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.97.tar.gz'
+  sha1 'd763fa7ba28e8a52f00570d5624a325eb22bcc6a'
 
   def install
     system "perl", "Makefile.PL"

Library/Formula/fasd.rb

 
 class Fasd < Formula
   homepage 'https://github.com/clvv/fasd'
-  url 'https://github.com/clvv/fasd/tarball/0.5.5'
-  sha1 '8ce380ab9e04b4cc14e79557fbb0e7b0ef4b61f7'
+  url 'https://github.com/clvv/fasd/tarball/0.7.1'
+  sha1 '73c0c612e7e21d440636cc280b3dd64b33772af2'
 
   def install
     bin.install 'fasd'

Library/Formula/feh.rb

   md5 '7dee285e8dd34f69058b0977283b3a8a'
 
   depends_on 'giblib' => :build
+  depends_on :x11
 
   def install
-    ENV.x11
-
     system "make", "PREFIX=#{prefix}"
     system "make", "PREFIX=#{prefix}", "install"
   end

Library/Formula/ffmbc.rb

   md5 '547bb7b7963224dd66dffa8b25e623b3'
 
   depends_on 'yasm' => :build
+  depends_on :x11
   depends_on 'x264' => :optional
   depends_on 'faac' => :optional
   depends_on 'lame' => :optional
   depends_on 'xvid' => :optional
 
   def install
-    ENV.x11
     args = ["--prefix=#{prefix}",
             "--disable-debug",
             "--disable-shared",

Library/Formula/ffmpeg.rb

   head 'git://git.videolan.org/ffmpeg.git'
 
   depends_on 'yasm' => :build
+  depends_on :x11
   depends_on 'x264' => :optional
   depends_on 'faac' => :optional
   depends_on 'lame' => :optional
   end
 
   def install
-    ENV.x11
     args = ["--prefix=#{prefix}",
             "--enable-shared",
             "--enable-gpl",
             "--enable-nonfree",
             "--enable-hardcoded-tables",
             "--enable-libfreetype",
-            "--cc=#{ENV.cc}"]
+            "--cc=#{ENV.cc}",
+            "--host-cflags=#{ENV.cflags}",
+            "--host-ldflags=#{ENV.ldflags}"
+           ]
 
     args << "--enable-libx264" if Formula.factory('x264').linked_keg.exist?
     args << "--enable-libfaac" if Formula.factory('faac').linked_keg.exist?

Library/Formula/finch.rb

 
 class Finch < Formula
   homepage 'http://developer.pidgin.im/wiki/Using%20Finch'
-  url 'http://sourceforge.net/projects/pidgin/files/Pidgin/2.7.11/pidgin-2.7.11.tar.bz2'
-  sha256 'a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b'
+  url 'http://sourceforge.net/projects/pidgin/files/Pidgin/2.10.4/pidgin-2.10.4.tar.bz2'
+  sha256 '8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e'
 
   depends_on 'pkg-config' => :build
   depends_on 'libidn'

Library/Formula/fio.rb

 require 'formula'
 
 class Fio < Formula
-  homepage 'http://freshmeat.net/projects/fio/'
-  url 'http://brick.kernel.dk/snaps/fio-1.58.tar.bz2'
-  md5 'bc5600997788bce5647576a4976d461d'
+  homepage 'http://freecode.com/projects/fio'
+  url 'http://brick.kernel.dk/snaps/fio-2.0.7.tar.bz2'
+  sha1 '597cca3a5843daeb3584ce52d090c58ca6632ef7'
 
   def install
     system "make", "prefix=#{prefix}",

Library/Formula/fish.rb

 require 'formula'
 
 class Fish < Formula
-  url 'http://downloads.sourceforge.net/project/fish/fish/1.23.1/fish-1.23.1.tar.bz2'
   homepage 'http://fishshell.com'
+  url 'http://downloads.sourceforge.net/project/fish/fish/1.23.1/fish-1.23.1.tar.bz2'
   md5 'ead6b7c6cdb21f35a3d4aa1d5fa596f1'
 
   head 'git://gitorious.org/fish-shell/fish-shell.git'
 
   # Indeed, the head build always builds documentation
   depends_on 'doxygen' => :build if ARGV.build_head?
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
+  depends_on :autoconf if ARGV.build_head?
   depends_on 'readline'
   skip_clean 'share/doc'
 

Library/Formula/fits.rb

 require 'formula'
 
 class Fits < Formula
-  url 'http://fits.googlecode.com/files/fits-0.6.0.zip'
   homepage 'http://code.google.com/p/fits/'
-  md5 '354eaba6c83f8403b36e4dee3f67224e'
+  url 'http://fits.googlecode.com/files/fits-0.6.1.zip'
+  sha1 '528be5e8d68c468ea1ea45c4812c15da8f52e9f4'
 
   def install
     inreplace 'fits.sh' do |s|

Library/Formula/fiwalk.rb

 require 'formula'
 
 class Fiwalk < Formula
-  url 'http://afflib.org/downloads/fiwalk-0.6.16.tar.gz'
   homepage 'http://afflib.org/software/fiwalk'
-  md5 '282925766aa0e7ca7c5b894d28e0c9ee'
+  url 'https://github.com/downloads/kfairbanks/sleuthkit/fiwalk-0.6.16.tar.gz'
+  sha1 '36ba2e97a201cd240fc7187185f07a5c56ee1982'
 
   depends_on 'sleuthkit'
   depends_on 'afflib' => :optional

Library/Formula/flickcurl.rb

+require 'formula'
+
+class Flickcurl < Formula
+  homepage 'http://librdf.org/flickcurl/'
+  url 'http://download.dajobe.org/flickcurl/flickcurl-1.22.tar.gz'
+  sha1 '38f427262bc76c23ac4ab31ed4df6c6022c5d3ec'
+
+  depends_on 'pkg-config' => :build
+
+  def install
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
+  end
+
+  def test
+    system "#{bin}/flickcurl -h"
+  end
+end

Library/Formula/fltk.rb

     version '1.3.x-r9327'
   end
 
+  depends_on :libpng
   depends_on 'jpeg'
 
   fails_with :clang do
   end