Permalink
Browse files

Merge branch 'master' of github.com:klausmeyer/homebrew

  • Loading branch information...
2 parents e009f30 + 6ef77e6 commit 158eb68ea04366a6d79eed7c1f8459ce297f6029 @klausmeyer klausmeyer committed Jan 6, 2013
Showing with 952 additions and 532 deletions.
  1. +1 −1 Library/ENV/4.3/make
  2. +2 −38 Library/Formula/apt-dater.rb
  3. +2 −2 Library/Formula/armadillo.rb
  4. +3 −3 Library/Formula/automake.rb
  5. +6 −4 Library/Formula/autotrace.rb
  6. +3 −3 Library/Formula/bagit.rb
  7. +2 −7 Library/Formula/cassandra.rb
  8. +2 −2 Library/Formula/cdo.rb
  9. +4 −2 Library/Formula/cdrtools.rb
  10. +2 −2 Library/Formula/cfengine.rb
  11. +15 −13 Library/Formula/chruby.rb
  12. +2 −2 Library/Formula/cloog.rb
  13. +2 −2 Library/Formula/closure-compiler.rb
  14. +29 −0 Library/Formula/collectd.rb
  15. +2 −2 Library/Formula/concurrencykit.rb
  16. +3 −2 Library/Formula/coq.rb
  17. +2 −2 Library/Formula/cracklib.rb
  18. +14 −3 Library/Formula/ctags.rb
  19. +2 −2 Library/Formula/czmq.rb
  20. +3 −36 Library/Formula/disktype.rb
  21. +2 −2 Library/Formula/dnsmasq.rb
  22. +3 −3 Library/Formula/doxygen.rb
  23. +2 −2 Library/Formula/dylibbundler.rb
  24. +2 −2 Library/Formula/eina.rb
  25. +35 −34 Library/Formula/elasticsearch.rb
  26. +21 −3 Library/Formula/emacs.rb
  27. +2 −2 Library/Formula/embryo.rb
  28. +2 −2 Library/Formula/exiftool.rb
  29. +17 −0 Library/Formula/ext4fuse.rb
  30. +2 −2 Library/Formula/feh.rb
  31. +12 −1 Library/Formula/freerdp.rb
  32. +3 −1 Library/Formula/fuse4x.rb
  33. +60 −0 Library/Formula/gdmap.rb
  34. +2 −2 Library/Formula/getmail.rb
  35. +21 −4 Library/Formula/gforth.rb
  36. +0 −6 Library/Formula/git-extras.rb
  37. +36 −0 Library/Formula/git-tf.rb
  38. +4 −4 Library/Formula/giter8.rb
  39. +2 −2 Library/Formula/glm.rb
  40. +3 −4 Library/Formula/gnutls.rb
  41. +2 −2 Library/Formula/gsoap.rb
  42. +1 −1 Library/Formula/gtk+.rb
  43. +2 −2 Library/Formula/gtk-gnutella.rb
  44. +2 −2 Library/Formula/hwloc.rb
  45. +2 −2 Library/Formula/insighttoolkit.rb
  46. +2 −2 Library/Formula/ios-sim.rb
  47. +2 −2 Library/Formula/ipmiutil.rb
  48. +2 −69 Library/Formula/ircd-hybrid.rb
  49. +33 −0 Library/Formula/irods.rb
  50. +18 −0 Library/Formula/itstool.rb
  51. +3 −3 Library/Formula/jetty.rb
  52. +2 −2 Library/Formula/jruby.rb
  53. +3 −3 Library/Formula/jython.rb
  54. +2 −2 Library/Formula/kbtin.rb
  55. +12 −0 Library/Formula/lci.rb
  56. +2 −2 Library/Formula/libcouchbase.rb
  57. +22 −0 Library/Formula/libdnet.rb
  58. +3 −3 Library/Formula/libewf.rb
  59. +1 −1 Library/Formula/libgit2.rb
  60. +3 −3 Library/Formula/libmagic.rb
  61. +2 −2 Library/Formula/libmemcached.rb
  62. +33 −0 Library/Formula/libopkele.rb
  63. +2 −2 Library/Formula/libssh2.rb
  64. +67 −1 Library/Formula/logrotate.rb
  65. +3 −0 Library/Formula/lua.rb
  66. +3 −0 Library/Formula/mariadb.rb
  67. +2 −2 Library/Formula/midnight-commander.rb
  68. +2 −2 Library/Formula/monetdb.rb
  69. +3 −0 Library/Formula/moreutils.rb
  70. +0 −21 Library/Formula/mosh.rb
  71. +2 −2 Library/Formula/multimarkdown.rb
  72. +3 −0 Library/Formula/mysql.rb
  73. +3 −4 Library/Formula/nasm.rb
  74. +2 −2 Library/Formula/nginx.rb
  75. +3 −4 Library/Formula/ngircd.rb
  76. +3 −3 Library/Formula/nimrod.rb
  77. +2 −3 Library/Formula/nrpe.rb
  78. +2 −23 Library/Formula/opam.rb
  79. +25 −0 Library/Formula/opusfile.rb
  80. +14 −0 Library/Formula/osxutils.rb
  81. +8 −7 Library/Formula/p11-kit.rb
  82. +2 −2 Library/Formula/parrot.rb
  83. +1 −3 Library/Formula/pdf2json.rb
  84. +3 −0 Library/Formula/percona-server.rb
  85. +2 −2 Library/Formula/phoronix-test-suite.rb
  86. +19 −0 Library/Formula/plplot.rb
  87. +20 −0 Library/Formula/pnapi.rb
  88. +2 −2 Library/Formula/poco.rb
  89. +3 −0 Library/Formula/postgresql.rb
  90. +6 −1 Library/Formula/pygtk.rb
  91. +32 −0 Library/Formula/pygtksourceview.rb
  92. +2 −2 Library/Formula/python.rb
  93. +2 −2 Library/Formula/python3.rb
  94. +2 −2 Library/Formula/qpdf.rb
  95. +18 −0 Library/Formula/rancid.rb
  96. +2 −2 Library/Formula/rbenv.rb
  97. +2 −2 Library/Formula/ruby-build.rb
  98. +8 −2 Library/Formula/rust.rb
  99. +4 −16 Library/Formula/scala.rb
  100. +1 −1 Library/Formula/scsh.rb
  101. +2 −2 Library/Formula/skytools.rb
  102. +2 −2 Library/Formula/smake.rb
  103. +6 −1 Library/Formula/sphinx.rb
  104. +2 −2 Library/Formula/squid.rb
  105. +3 −0 Library/Formula/sshfs.rb
  106. +7 −1 Library/Formula/star.rb
  107. +19 −6 Library/Formula/suite-sparse.rb
  108. +20 −0 Library/Formula/svtplay-dl.rb
  109. +2 −2 Library/Formula/swi-prolog.rb
  110. +2 −2 Library/Formula/swig.rb
  111. +19 −0 Library/Formula/sylpheed.rb
  112. +3 −0 Library/Formula/task-spooler.rb
  113. +2 −50 Library/Formula/teem.rb
  114. +0 −4 Library/Formula/tesseract.rb
  115. +2 −2 Library/Formula/unbound.rb
  116. +12 −16 Library/Formula/v8.rb
  117. +2 −2 Library/Formula/virtualhost.sh.rb
  118. +30 −0 Library/Formula/vowpal-wabbit.rb
  119. +11 −0 Library/Formula/wgetpaste.rb
  120. +2 −2 Library/Formula/xmlstarlet.rb
  121. +2 −2 Library/Formula/xrootd.rb
  122. +3 −2 Library/Formula/youtube-dl.rb
  123. +12 −7 Library/Homebrew/cmd/audit.rb
  124. +1 −1 Library/Homebrew/dependencies.rb
  125. +5 −3 Library/Homebrew/extend/ENV.rb
  126. +12 −1 Library/Homebrew/macos/xquartz.rb
  127. +2 −0 Library/Homebrew/requirements.rb
  128. +1 −0 Library/Homebrew/superenv.rb
@@ -4,7 +4,7 @@ if [ $(basename "$0") == "bsdmake" ]; then
pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
bsd="$pwd/../../../bin/bsdmake"
# bsdmake used to be keg-only: support users who don't run brew doctor
- [ -x "$bsd" ] || bsd="$(brew --prefix bsdmake)/bin/bsdmake"
+ [ -x "$bsd" ] || bsd="$(${HOMEBREW_BREW_FILE} --prefix bsdmake)/bin/bsdmake"
exec "$bsd" "$@"
else
exec xcrun make "$@"
@@ -2,19 +2,13 @@
class AptDater < Formula
homepage 'http://www.ibh.de/apt-dater/'
- url 'http://downloads.sourceforge.net/project/apt-dater/apt-dater/0.8.6/apt-dater-0.8.6.tar.gz'
- sha1 '178955f4c8999cf3cfeaf8ebbcf807f9a6beafd6'
+ url 'http://sourceforge.net/projects/apt-dater/files/apt-dater/0.9.0/apt-dater-0.9.0.tar.gz'
+ sha1 'f62fe55602f2526f2830c3c266b8c392bb908d92'
depends_on 'gettext'
depends_on 'glib'
depends_on 'popt'
- # bug report:
- # http://sourceforge.net/tracker/?func=detail&aid=3470631&group_id=233727&atid=1091021
- def patches
- { :p0 => DATA }
- end
-
def install
system "./configure", "--disable-debug",
"--disable-dependency-tracking",
@@ -26,33 +20,3 @@ def test
system "#{bin}/apt-dater", "-v"
end
end
-
-__END__
---- src/apt-dater.c
-+++ src/apt-dater.c
-@@ -180,10 +180,10 @@ int main(int argc, char **argv, char **envp)
- if(!report) {
- #endif
- /* Test if we are the owner of the TTY or die. */
-- if(g_access("/proc/self/fd/0", R_OK|W_OK)) {
-- g_error(_("Cannot open your terminal /proc/self/fd/0 - please check."));
-- exit(EXIT_FAILURE);
-- }
-+// if( g_access("/proc/self/fd/0", R_OK|W_OK)) {
-+// g_error(_("Cannot open your terminal /proc/self/fd/0 - please check."));
-+// exit(EXIT_FAILURE);
-+// }
-
- getOldestMtime(hosts);
-
---- src/stats.c
-+++ src/stats.c
-@@ -96,6 +96,9 @@ gboolean setStatsFileFromIOC(GIOChannel *ioc, GIOCondition condition,
- if(iostatus == G_IO_STATUS_ERROR || iostatus == G_IO_STATUS_AGAIN)
- break;
-
-+ if(*buf == 0)
-+ condition = G_IO_HUP;
-+
- if(fwrite(buf, sizeof(gchar), bytes, ((HostNode *) n)->fpstat) != bytes)
- break;
@@ -2,8 +2,8 @@
class Armadillo < Formula
homepage 'http://arma.sourceforge.net/'
- url 'http://sourceforge.net/projects/arma/files/armadillo-3.6.0.tar.gz'
- sha1 'f2a29c78d3c18a48187ef9fc15011d89b2c5268e'
+ url 'http://sourceforge.net/projects/arma/files/armadillo-3.6.1.tar.gz'
+ sha1 'c3b34f2c240ca1da6e9e3728dc1ebd2d197a2071'
depends_on 'cmake' => :build
depends_on 'boost'
@@ -2,9 +2,9 @@
class Automake < Formula
homepage 'http://www.gnu.org/software/automake/'
- url 'http://ftpmirror.gnu.org/automake/automake-1.12.6.tar.gz'
- mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.gz'
- sha1 '34bfda1c720e1170358562b1667e533a203878d6'
+ url 'http://ftpmirror.gnu.org/automake/automake-1.13.tar.gz'
+ mirror 'http://ftp.gnu.org/gnu/automake/automake-1.13.tar.gz'
+ sha1 'cc01ed114f49dd7282e26b07400d9e503e2e4109'
# Always needs a newer autoconf, even on Snow Leopard.
depends_on 'autoconf'
@@ -9,11 +9,13 @@ class Autotrace < Formula
depends_on 'imagemagick' unless build.include? 'without-imagemagick'
+ # Issue 16569: Use MacPorts patch to port input-png.c to libpng 1.5.
+ # Fix underquoted m4
def patches
- {
- # Issue 16569: Use MacPorts patch to port input-png.c to libpng 1.5.
- :p0 => 'https://trac.macports.org/export/100575/trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff'
- }
+ {:p0 => [
+ 'https://trac.macports.org/export/100575/trunk/dports/graphics/autotrace/files/patch-libpng-1.5.diff',
+ 'https://trac.macports.org/export/77101/trunk/dports/graphics/autotrace/files/patch-autotrace.m4.diff'
+ ]}
end
def install
@@ -1,9 +1,9 @@
require 'formula'
class Bagit < Formula
- homepage 'http://sourceforge.net/projects/loc-xferutils/files/loc-bil-java-library/4.1/'
- url 'http://downloads.sourceforge.net/project/loc-xferutils/loc-bil-java-library/4.1/bagit-4.1-bin.zip'
- sha1 'a8ae349e3901a7eb38ff580dd10dd915440c27cc'
+ homepage 'http://sourceforge.net/projects/loc-xferutils/files/loc-bil-java-library/4.4/'
+ url 'http://sourceforge.net/projects/loc-xferutils/files/loc-bil-java-library/4.4/bagit-4.4-bin.zip'
+ sha1 '2ef049e2d53a0cbb8e9959a6e2433d82a2c0c11b'
skip_clean 'logs'
@@ -2,13 +2,8 @@
class Cassandra < Formula
homepage 'http://cassandra.apache.org'
- url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.1.8/apache-cassandra-1.1.8-bin.tar.gz'
- sha1 'fabc75f82e9fb08373cb2d8add594d888aadf67b'
-
- devel do
- url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz'
- sha1 '10259ebcdd9a57202aec5e2f5f4478ade77796bf'
- end
+ url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-bin.tar.gz'
+ sha1 '22a90d65dde1ad073f2dd804960cc1c743f9302b'
def install
(var+"lib/cassandra").mkpath
@@ -2,8 +2,8 @@
class Cdo < Formula
homepage 'https://code.zmaw.de/projects/cdo'
- url 'https://code.zmaw.de/attachments/download/4195/cdo-1.5.8.tar.gz'
- sha1 '763f7175c230b6fc865ece1031a3c25887fc87ed'
+ url 'https://code.zmaw.de/attachments/download/4824/cdo-1.5.9.tar.gz'
+ sha1 '94add81a8f6e8e964ed0b12ed23014ad54764735'
option 'enable-grib2', 'Compile Fortran bindings'
@@ -14,8 +14,10 @@ def install
system "smake", "INS_BASE=#{prefix}", "INS_RBASE=#{prefix}", "install"
# cdrtools tries to install some generic smake headers, libraries and
# manpages, which conflict with the copies installed by smake itself
- (include/"schily/i386-darwin-cc").rmtree
- (lib/"libschily.a").unlink
+ (include/"schily").rmtree
+ %w[libschily.a libdeflt.a libfind.a].each do |file|
+ (lib/file).unlink
+ end
(lib/"profiled").rmtree
man5.rmtree
end
@@ -2,8 +2,8 @@
class Cfengine < Formula
homepage 'http://cfengine.com/'
- url 'https://cfengine.com/source-code/download?file=cfengine-3.4.0.tar.gz'
- sha1 '17212f6ea2911c50590063193ab33af18719f740'
+ url 'https://cfengine.com/source-code/download?file=cfengine-3.4.1.tar.gz'
+ sha1 'dbbbb203227dd44b799cab15c24e9191ec79b339'
depends_on 'tokyo-cabinet'
depends_on 'pcre'
@@ -2,8 +2,8 @@
class Chruby < Formula
homepage 'https://github.com/postmodern/chruby#readme'
- url 'https://github.com/postmodern/chruby/archive/v0.3.0.tar.gz'
- sha1 '3c207a7b43d8e66928704237aadc043353799a5d'
+ url 'https://github.com/postmodern/chruby/archive/v0.3.1.tar.gz'
+ sha1 '90c3fce7a512acc8b60d5efd3e6a2eeadcd5a238'
head 'https://github.com/postmodern/chruby.git'
@@ -12,28 +12,30 @@ def install
end
def caveats; <<-EOS.undent
- For a system wide install, add the following to /etc/profile.d/chruby.sh.
- #!/bin/sh
- source #{opt_prefix}/share/chruby/chruby.sh
- RUBIES=(/opt/rubies/*)
+ Add the following to the /etc/profile.d/chruby.sh, ~/.bashrc or
+ ~/.zshrc file:
- For a local install, add the following to ~/.bashrc or ~/.zshrc.
+ source #{HOMEBREW_PREFIX}/opt/chruby/share/chruby/chruby.sh
- #!/bin/sh
- source #{opt_prefix}/share/chruby/chruby.sh
- RUBIES=(~/.rubies/*)
+ By default chruby will search for Rubies installed into /opt/rubies/ or
+ ~/.rubies/. For non-standard installation locations, simply set the RUBIES
+ variable:
- To use existing Rubies installed by RVM, rbenv or rbfu, set RUBIES to
- the following:
+ RUBIES=(
+ /opt/jruby-1.7.0
+ $HOME/src/rubinius
+ )
+
+ If you are migrating from another Ruby manager, set `RUBIES` accordingly:
RVM: RUBIES=(~/.rvm/rubies/*)
rbenv: RUBIES=(~/.rbenv/versions/*)
rbfu: RUBIES=('~/.rbfu/rubies/*)
To enable auto-switching of Rubies specified by .ruby-version files:
- source #{opt_prefix}/share/chruby/auto.sh
+ source #{HOMEBREW_PREFIX}/opt/chruby/share/chruby/auto.sh
EOS
end
@@ -2,8 +2,8 @@
class Cloog < Formula
homepage 'http://www.cloog.org/'
- url 'http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-0.17.0.tar.gz'
- sha1 'decc2221b1f1bd9238288d043835cb018af15d5a'
+ url 'http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-0.18.0.tar.gz'
+ sha1 '85f620a26aabf6a934c44ca40a9799af0952f863'
depends_on 'pkg-config' => :build
depends_on 'gmp'
@@ -3,8 +3,8 @@
class ClosureCompiler < Formula
homepage 'http://code.google.com/p/closure-compiler/'
# Use an SVN download to get the externals as well
- url 'svn+http://closure-compiler.googlecode.com/svn/trunk/', :revision => '2180'
- version '20120917'
+ url 'svn+http://closure-compiler.googlecode.com/svn/trunk/', :revision => '2388'
+ version '20121212'
head 'svn+http://closure-compiler.googlecode.com/svn/trunk/'
@@ -34,4 +34,33 @@ def install
system "./configure", *args
system "make install"
end
+
+ def plist; <<-EOS.undent
+ <?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>#{sbin}/collectd</string>
+ <string>-f</string>
+ <string>-C</string>
+ <string>#{etc}/collectd.conf</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>UserName</key>
+ <string>#{`whoami`.chomp}</string>
+ <key>StandardErrorPath</key>
+ <string>/usr/local/var/log/collectd.log</string>
+ <key>StandardOutPath</key>
+ <string>/usr/local/var/log/collectd.log</string>
+ </dict>
+ </plist>
+ EOS
+ end
end
@@ -2,8 +2,8 @@
class Concurrencykit < Formula
homepage 'http://concurrencykit.org'
- url 'http://concurrencykit.org/releases/ck-0.2.12.tar.gz'
- sha1 '538638f3233b77c57efcfe8ad226f6098be9a0b2'
+ url 'http://concurrencykit.org/releases/ck-0.2.13.tar.gz'
+ sha1 'fd350384baa7f6263a2cc9d9d43f69f0dd3c89d0'
head 'git://git.concurrencykit.org/ck.git'
@@ -19,8 +19,9 @@ def fatal?
class Coq < Formula
homepage 'http://coq.inria.fr/'
- url 'http://coq.inria.fr/distrib/V8.4/files/coq-8.4.tar.gz'
- sha1 '2987aa418dd96a0df7284afe296293cb28814ef5'
+ url 'http://coq.inria.fr/distrib/V8.4pl1/files/coq-8.4pl1.tar.gz'
+ version '8.4pl1'
+ sha1 '23d403dbe9e410a99c584d0210dc527950051679'
head 'svn://scm.gforge.inria.fr/svn/coq/trunk'
@@ -2,8 +2,8 @@
class Cracklib < Formula
homepage 'http://cracklib.sourceforge.net/'
- url 'http://downloads.sourceforge.net/project/cracklib/cracklib/2.8.19/cracklib-2.8.19.tar.gz'
- sha1 '29224f51db85e1946c209f6ef6c38da699a9c7cc'
+ url 'http://sourceforge.net/projects/cracklib/files/cracklib/2.8.22/cracklib-2.8.22.tar.gz'
+ sha1 'd91d977a1909e0cc3f5cb30754ba5e5e90655ab0'
depends_on "gettext"
@@ -7,9 +7,6 @@ class Ctags < Formula
head 'https://ctags.svn.sourceforge.net/svnroot/ctags/trunk'
- conflicts_with 'emacs',
- :because => 'Both ctags and emacs install a `ctags` executable.'
-
depends_on :autoconf => :build if build.head?
def patches
@@ -28,4 +25,18 @@ def install
"--with-readlib"
system "make install"
end
+
+ def caveats
+ <<-EOS.undent
+ Under some circumstances, emacs and ctags can conflict. By default,
+ emacs provides an executable `ctags` that would conflict with the
+ executable of the same name that ctags provides. To prevent this,
+ Homebrew removes the emacs `ctags` and its manpage before linking.
+
+ However, if you install emacs with the `--keep-ctags` option, then
+ the `ctags` emacs provides will not be removed. In that case, you
+ won't be able to install ctags successfully. It will build but not
+ link.
+ EOS
+ end
end
@@ -2,8 +2,8 @@
class Czmq < Formula
homepage 'http://czmq.zeromq.org/'
- url 'http://download.zeromq.org/czmq-1.3.1.tar.gz'
- sha1 '73dea800cf556d66d5a4630bb7f99bd313cc30dc'
+ url 'http://download.zeromq.org/czmq-1.3.2.tar.gz'
+ sha1 '09354c07cad4570d1360ad197c5f979c8f58847e'
option :universal
Oops, something went wrong.

0 comments on commit 158eb68

Please sign in to comment.