Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: kaizoku/homebrew
...
head fork: kaizoku/homebrew
compare: 7f71415a82
Checking mergeability… Don't worry, you can still create the pull request.
  • 15 commits
  • 55 files changed
  • 0 commit comments
  • 11 contributors
Commits on Apr 08, 2011
@andrew andrew Mongodb 1.8.1
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
d8c0da0
@MindTooth MindTooth ATK 2.0
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
90cc2da
@adamv adamv mongodb: Fix checksums 1907dd5
@adamv adamv graphicsmagick: require X11 (for png and other deps) aca2aa5
@mikemcquaid mikemcquaid No need for kdelibs to depend on libpng. f8ce3ef
@ryansch ryansch Updating redis to 2.2.4.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
a268323
Commits on Apr 09, 2011
@Sharpie Sharpie Update git to 1.7.4.4
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ae63365
@chrismeller chrismeller mysql: Change download URL.
Switch the MySQL formula to use the official MySQL mirror, rather than
the hardcoded Swedish one that's having issues.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
fac665e
@krupenik krupenik fixed nginx 0.9.7 (head) md5
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2eb4f6b
@jbrisbin jbrisbin RabbitMQ 2.4.1
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
c6bbc7c
@adamv adamv Move fails_with_llvm for glib/gtk/gnu-smalltalk b5b6da2
@adamv adamv Normalize use of MACOS_VERSION b782d9d
@theister theister muscle 3.8.31
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
45bff20
@mkhl mkhl Fix formula paths for manually specified names.
When the name of a new formula can't be autodetected, it defaults to the empty
string. When it then gets read from user input later on, the new name is used
but the formula path, based on the name, stays empty.

This change sets the path after a new name was read.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
413cd1e
Commits on Apr 10, 2011
@adamv adamv gd: use yet another mirror 7f71415
Showing with 150 additions and 157 deletions.
  1. +7 −6 Library/Formula/alpine.rb
  2. +2 −2 Library/Formula/atk.rb
  3. +5 −6 Library/Formula/bdw-gc.rb
  4. +4 −3 Library/Formula/cairomm.rb
  5. +1 −1  Library/Formula/collectd.rb
  6. +1 −1  Library/Formula/couchdb.rb
  7. +1 −1  Library/Formula/disco.rb
  8. +2 −2 Library/Formula/ejabberd.rb
  9. +1 −1  Library/Formula/erlang.rb
  10. +1 −1  Library/Formula/ffmpeg.rb
  11. +2 −2 Library/Formula/gd.rb
  12. +1 −1  Library/Formula/gerbv.rb
  13. +1 −2  Library/Formula/gfortran.rb
  14. +6 −6 Library/Formula/git.rb
  15. +2 −2 Library/Formula/glib.rb
  16. +2 −2 Library/Formula/gnu-smalltalk.rb
  17. +4 −17 Library/Formula/graphicsmagick.rb
  18. +1 −1  Library/Formula/graphviz.rb
  19. +18 −18 Library/Formula/grass.rb
  20. +3 −2 Library/Formula/gtk+.rb
  21. +1 −1  Library/Formula/imagemagick.rb
  22. +1 −1  Library/Formula/iodine.rb
  23. +1 −1  Library/Formula/jstalk.rb
  24. +1 −1  Library/Formula/kdelibs.rb
  25. +1 −1  Library/Formula/lftp.rb
  26. +1 −3 Library/Formula/libmemcached.rb
  27. +1 −1  Library/Formula/libnet.rb
  28. +1 −1  Library/Formula/libsvg-cairo.rb
  29. +1 −1  Library/Formula/libvirt.rb
  30. +1 −1  Library/Formula/madplay.rb
  31. +11 −26 Library/Formula/mongodb.rb
  32. +1 −1  Library/Formula/mpd.rb
  33. +14 −0 Library/Formula/muscle.rb
  34. +1 −1  Library/Formula/mysql.rb
  35. +1 −1  Library/Formula/nginx.rb
  36. +2 −2 Library/Formula/nmap.rb
  37. +1 −1  Library/Formula/nspr.rb
  38. +1 −1  Library/Formula/pango.rb
  39. +1 −1  Library/Formula/pbrt.rb
  40. +2 −2 Library/Formula/postgresql.rb
  41. +2 −2 Library/Formula/qt.rb
  42. +3 −3 Library/Formula/rabbitmq.rb
  43. +3 −3 Library/Formula/recode.rb
  44. +2 −2 Library/Formula/redis.rb
  45. +1 −1  Library/Formula/rogue.rb
  46. +1 −1  Library/Formula/rtmpdump.rb
  47. +1 −1  Library/Formula/rtorrent.rb
  48. +3 −6 Library/Formula/spidermonkey.rb
  49. +4 −4 Library/Formula/subversion.rb
  50. +4 −2 Library/Formula/swi-prolog.rb
  51. +3 −3 Library/Formula/tcpflow.rb
  52. +1 −1  Library/Formula/wget.rb
  53. +1 −1  Library/Formula/wine.rb
  54. +2 −1  Library/Homebrew/cmd/create.rb
  55. +9 −1 Library/Homebrew/utils.rb
View
13 Library/Formula/alpine.rb
@@ -5,16 +5,17 @@ class Alpine < Formula
homepage 'http://www.washington.edu/alpine/'
md5 '0f4757167baf5c73aa44f2ffa4860093'
- def install
- system "./configure", "--prefix=#{prefix}", "--disable-debug", "--with-ssl-include-dir=/usr/include/openssl"
+ def patches
+ DATA unless MacOS.snow_leopard?
+ end
+ def install
ENV.j1
+ system "./configure", "--disable-debug",
+ "--prefix=#{prefix}",
+ "--with-ssl-include-dir=/usr/include/openssl"
system "make install"
end
-
- def patches
- DATA if MACOS_VERSION >= 10.6
- end
end
__END__
View
4 Library/Formula/atk.rb
@@ -2,8 +2,8 @@
class Atk < Formula
homepage 'http://library.gnome.org/devel/atk/'
- url 'ftp://ftp.gnome.org/pub/gnome/sources/atk/1.32/atk-1.32.0.tar.bz2'
- sha256 'e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e'
+ url 'http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.0.tar.bz2'
+ sha256 '5dbdc35f7f5b3f0748039bb3faa7cd5e45ec3d337a539772bc73acd0dfb55afd'
depends_on 'pkg-config' => :build
depends_on 'glib'
View
11 Library/Formula/bdw-gc.rb
@@ -8,13 +8,12 @@ class BdwGc < Formula
fails_with_llvm "LLVM gives an unsupported inline asm error"
def install
- if 10.6 <= MACOS_VERSION
- # ucontext has been deprecated in 10.6
- # use this flag to force the header to compile
- ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE"
- end
+ # ucontext has been deprecated in 10.6
+ # use this flag to force the header to compile
+ ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE" if MacOS.snow_leopard?
- system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+ system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
system "make install"
end
end
View
7 Library/Formula/cairomm.rb
@@ -5,6 +5,8 @@ class Cairomm < Formula
homepage 'http://cairographics.org/cairomm/'
md5 '559afbc47484ba3fad265e38a3dafe90'
+ # patch for universal compilation from:
+ # http://trac.macports.org/browser/trunk/dports/graphics/cairomm/files/patch-quartz-lp64.diff
def patches
{ :p0 => DATA }
end
@@ -12,7 +14,7 @@ def patches
depends_on 'pkg-config' => :build
depends_on 'libsigc++'
# cairo is available on 10.6 via X11 but not on 10.5
- depends_on 'cairo' if MACOS_VERSION == 10.5
+ depends_on 'cairo' if MacOS.leopard?
def install
system "./configure", "--disable-dependency-tracking",
@@ -25,8 +27,7 @@ def install
end
end
-# patch for universal compilation from:
-# http://trac.macports.org/browser/trunk/dports/graphics/cairomm/files/patch-quartz-lp64.diff
+
__END__
diff -urN cairomm/quartz_font.cc cairomm-1.8.2/cairomm/quartz_font.cc
--- cairomm/quartz_font.cc 2008-12-20 18:37:46.000000000 +0100
View
2  Library/Formula/collectd.rb
@@ -15,7 +15,7 @@ def install
"--with-python=/usr/bin",
"--prefix=#{prefix}",
"--localstatedir=#{var}"]
- args << "--disable-embedded-perl" if MACOS_VERSION < 10.6
+ args << "--disable-embedded-perl" if MacOS.leopard?
system "./configure", *args
system "make install"
View
2  Library/Formula/couchdb.rb
@@ -8,7 +8,7 @@ class Couchdb < Formula
depends_on 'spidermonkey'
depends_on 'icu4c'
depends_on 'erlang'
- depends_on 'curl' if MACOS_VERSION < 10.6
+ depends_on 'curl' if MacOS.leopard?
def install
system "./bootstrap" if File.exists? "bootstrap"
View
2  Library/Formula/disco.rb
@@ -9,7 +9,7 @@ class Disco < Formula
head 'git://github.com/tuulos/disco.git'
depends_on 'erlang'
- depends_on 'simplejson' => :python if MACOS_VERSION < 10.6
+ depends_on 'simplejson' => :python if MacOS.leopard?
depends_on 'libcmph'
def install
View
4 Library/Formula/ejabberd.rb
@@ -5,7 +5,7 @@ class Ejabberd < Formula
homepage 'http://www.ejabberd.im'
md5 '2029ceca45584d704ca821a771d6d928'
- depends_on "openssl" if MACOS_VERSION < 10.6
+ depends_on "openssl" if MacOS.leopard?
depends_on "erlang"
def install
@@ -18,7 +18,7 @@ def install
"--sysconfdir=#{etc}",
"--localstatedir=#{var}"]
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
openssl = Formula.factory('openssl')
args << "--with-openssl=#{openssl.prefix}"
end
View
2  Library/Formula/erlang.rb
@@ -67,7 +67,7 @@ def install
args << "--enable-darwin-64bit" if MacOS.prefer_64_bit?
system "./configure", *args
- system "touch lib/wx/SKIP" if MACOS_VERSION >= 10.6
+ system "touch lib/wx/SKIP" if MacOS.snow_leopard?
system "make"
system "make install"
View
2  Library/Formula/ffmpeg.rb
@@ -40,7 +40,7 @@ def install
# For 32-bit compilation under gcc 4.2, see:
# http://trac.macports.org/ticket/20938#comment:22
- if MACOS_VERSION >= 10.6 and Hardware.is_32_bit?
+ if MacOS.snow_leopard? and Hardware.is_32_bit?
ENV.append_to_cflags "-mdynamic-no-pic"
end
View
4 Library/Formula/gd.rb
@@ -6,10 +6,10 @@ class Gd < Formula
# url "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
homepage "http://bitbucket.org/pierrejoye/gd-libgd"
- url "http://www.sfr-fresh.com/unix/www/gd-2.0.36RC1.tar.gz"
+ url "http://ring.riken.jp/archives/graphics/gd/gd-2.0.36RC1.tar.gz"
+ md5 "39ac48e6d5e0012a3bd2248a0102f209"
head "http://bitbucket.org/pierrejoye/gd-libgd", :using => :hg
- md5 "39ac48e6d5e0012a3bd2248a0102f209"
depends_on 'jpeg' => :recommended
View
2  Library/Formula/gerbv.rb
@@ -7,7 +7,7 @@ class Gerbv < Formula
depends_on 'pkg-config' => :build
depends_on 'gtk+'
- depends_on 'cairo' if MACOS_VERSION < 10.6
+ depends_on 'cairo' if MacOS.leopard?
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
View
3  Library/Formula/gfortran.rb
@@ -15,8 +15,7 @@ def stage
end
class Gfortran < Formula
- if MACOS_VERSION < 10.6
- # Leopard
+ if MacOS.leopard?
url 'http://r.research.att.com/gfortran-42-5577.pkg'
md5 '30fb495c93cf514003cdfcb7846dc701'
version "4.2.4-5577"
View
12 Library/Formula/git.rb
@@ -1,18 +1,18 @@
require 'formula'
class GitManuals < Formula
- url 'http://kernel.org/pub/software/scm/git/git-manpages-1.7.4.3.tar.bz2'
- md5 '0d29c91eb213391b4ecb1419568555ef'
+ url 'http://kernel.org/pub/software/scm/git/git-manpages-1.7.4.4.tar.bz2'
+ md5 '5812f4fca4afc6c81e06f485111ec8ab'
end
class GitHtmldocs < Formula
- url 'http://kernel.org/pub/software/scm/git/git-htmldocs-1.7.4.3.tar.bz2'
- md5 'bf12e07302a3616389cfc8b559c28739'
+ url 'http://kernel.org/pub/software/scm/git/git-htmldocs-1.7.4.4.tar.bz2'
+ md5 '71e40b22e5d4b54f69ac1e8e0ca1670b'
end
class Git < Formula
- url 'http://kernel.org/pub/software/scm/git/git-1.7.4.3.tar.bz2'
- md5 'da6c8f4967393342a4397b955db72cb1'
+ url 'http://kernel.org/pub/software/scm/git/git-1.7.4.4.tar.bz2'
+ md5 '1313f71d62fa100b32fa313769a85f2a'
homepage 'http://git-scm.com'
def install
View
4 Library/Formula/glib.rb
@@ -16,6 +16,8 @@ class Glib < Formula
depends_on 'pkg-config' => :build
depends_on 'gettext'
+ fails_with_llvm "Undefined symbol errors while linking"
+
def patches
mp = "http://trac.macports.org/export/77283/trunk/dports/devel/glib2/files/"
{
@@ -35,8 +37,6 @@ def options
end
def install
- fails_with_llvm "Undefined symbol errors while linking"
-
# Snow Leopard libiconv doesn't have a 64bit version of the libiconv_open
# function, which breaks things for us, so we build our own
# http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html
View
4 Library/Formula/gnu-smalltalk.rb
@@ -19,9 +19,9 @@ class GnuSmalltalk < Formula
depends_on 'readline'
- def install
- fails_with_llvm "Codegen problems with LLVM"
+ fails_with_llvm "Codegen problems with LLVM"
+ def install
# 64-bit version doesn't build, so force 32 bits.
ENV.m32
View
21 Library/Formula/graphicsmagick.rb
@@ -14,12 +14,6 @@ def use_wmf?
ARGV.include? '--use-wmf'
end
-def x11?
- # I used this file because old Xcode seems to lack it, and its that old
- # Xcode that loads of people seem to have installed still
- File.file? '/usr/X11/include/ft2build.h'
-end
-
class Graphicsmagick < Formula
url 'http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.12/GraphicsMagick-1.3.12.tar.bz2'
homepage 'http://www.graphicsmagick.org/'
@@ -30,8 +24,7 @@ class Graphicsmagick < Formula
depends_on 'libtiff' => :optional
depends_on 'little-cms' => :optional
depends_on 'jasper' => :optional
- depends_on 'ghostscript' => :recommended if ghostscript_srsly? and x11?
- depends_on 'libpng' unless x11?
+ depends_on 'ghostscript' => :recommended if ghostscript_srsly?
fails_with_llvm
@@ -48,8 +41,8 @@ def options
end
def install
- ENV.libpng
- ENV.O3
+ ENV.x11
+ ENV.O3 # Takes forever with O4 (LLVM)
# versioned stuff in main tree is pointless for us
inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
@@ -58,7 +51,7 @@ def install
"--prefix=#{prefix}",
"--enable-shared", "--disable-static"]
args << "--without-magick-plus-plus" unless ARGV.include? '--with-magick-plus-plus'
- args << "--disable-openmp" if MACOS_VERSION < 10.6 # libgomp unavailable
+ args << "--disable-openmp" if MacOS.leopard? # libgomp unavailable
args << "--with-gslib" if ghostscript_srsly?
args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
unless ghostscript_fonts?
@@ -66,10 +59,4 @@ def install
system "./configure", *args
system "make install"
end
-
- def caveats; <<-EOS.undent
- You don't have X11 from the Xcode DMG installed. Consequently GraphicsMagick
- is less fully featured.
- EOS
- end unless x11?
end
View
2  Library/Formula/graphviz.rb
@@ -9,7 +9,7 @@ class Graphviz < Formula
if ARGV.include? '--with-pdf'
depends_on 'pango'
- depends_on 'cairo' if MACOS_VERSION < 10.6
+ depends_on 'cairo' if MacOS.leopard?
end
def options
View
36 Library/Formula/grass.rb
@@ -21,7 +21,7 @@ class Grass < Formula
depends_on "unixodbc"
depends_on "fftw"
- depends_on "cairo" if MACOS_VERSION < 10.6
+ depends_on "cairo" if MacOS.leopard?
def patches
DATA
@@ -38,9 +38,8 @@ def install
readline = Formula.factory( 'readline' )
gettext = Formula.factory( 'gettext' )
- configure_args = [
- "--disable-debug",
- "--disable-dependency-tracking",
+ args = [
+ "--disable-debug", "--disable-dependency-tracking",
"--with-libs=/usr/X11/lib #{HOMEBREW_PREFIX}/lib",
"--with-includes=#{HOMEBREW_PREFIX}/include",
"--enable-largefile",
@@ -70,32 +69,33 @@ def install
]
if MacOS.prefer_64_bit?
- configure_args << "--enable-64bit"
- configure_args << "--with-macosx-archs=x86_64"
+ args << "--enable-64bit"
+ args << "--with-macosx-archs=x86_64"
else
- configure_args << "--with-macosx-archs=i386"
+ args << "--with-macosx-archs=i386"
end
# Deal with Cairo support
- if MACOS_VERSION >= 10.6
- configure_args << "--with-cairo-includes=/usr/X11/include /usr/X11/include/cairo"
- else
+ if MacOS.leopard?
cairo = Formula.factory('cairo')
- configure_args << "--with-cairo-includes=#{cairo.include + 'cairo'}"
- configure_args << "--with-cairo-libs=#{cairo.lib}"
+ args << "--with-cairo-includes=#{cairo.include}/cairo"
+ args << "--with-cairo-libs=#{cairo.lib}"
+ else
+ args << "--with-cairo-includes=/usr/X11/include /usr/X11/include/cairo"
end
- configure_args << "--with-cairo"
+
+ args << "--with-cairo"
# Database support
- configure_args << "--with-postgres" if postgres?
+ args << "--with-postgres" if postgres?
if mysql?
mysql = Formula.factory('mysql')
- configure_args << "--with-mysql-includes=#{mysql.include + 'mysql'}"
- configure_args << "--with-mysql-libs=#{mysql.lib + 'mysql'}"
- configure_args << "--with-mysql"
+ args << "--with-mysql-includes=#{mysql.include + 'mysql'}"
+ args << "--with-mysql-libs=#{mysql.lib + 'mysql'}"
+ args << "--with-mysql"
end
- system "./configure", "--prefix=#{prefix}", *configure_args
+ system "./configure", "--prefix=#{prefix}", *args
system "make" # make and make install must be seperate steps.
system "make install"
end
View
5 Library/Formula/gtk+.rb
@@ -13,14 +13,15 @@ class Gtkx < Formula
# Used by pango, but keg-only, so needs to be added to
# the flags for gtk+ explicitly.
- depends_on 'cairo' if MACOS_VERSION < 10.6
+ depends_on 'cairo' if MacOS.leopard?
depends_on 'pango'
depends_on 'jasper' => :optional
depends_on 'atk' => :optional
+ fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
def install
- fails_with_llvm "Undefined symbols when linking", :build => "2326"
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--disable-glibtest"
View
2  Library/Formula/imagemagick.rb
@@ -74,7 +74,7 @@ def install
"--disable-static",
"--with-modules"]
- args << "--disable-openmp" if MACOS_VERSION < 10.6 or disable_openmp?
+ args << "--disable-openmp" if MacOS.leopard? or disable_openmp?
args << "--without-gslib" unless ghostscript_srsly?
args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
unless ghostscript_srsly? or ghostscript_fonts?
View
2  Library/Formula/iodine.rb
@@ -6,7 +6,7 @@ class Iodine < Formula
md5 'a15bb4faba020d217016fde6e231074a'
def install
- if MACOS_VERSION >= 10.6
+ unless MacOS.leopard?
inreplace ["src/common.c", "src/dns.c", "src/iodine.c", "src/iodined.c"],
"arpa/nameser8_compat", "arpa/nameser_compat"
end
View
2  Library/Formula/jstalk.rb
@@ -6,7 +6,7 @@ class Jstalk < Formula
version '1.0.1'
def install
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
onoe "jstalk requires Mac OS X 10.6+"
exit 1
end
View
2  Library/Formula/kdelibs.rb
@@ -11,7 +11,6 @@ class Kdelibs < Formula
depends_on 'pcre'
depends_on 'jpeg'
depends_on 'giflib'
- depends_on 'libpng' unless File.exist? "/usr/X11R6/lib"
depends_on 'strigi'
depends_on 'soprano'
depends_on 'shared-desktop-ontologies'
@@ -29,6 +28,7 @@ def patches
end
def install
+ ENV.x11
gettext_prefix = Formula.factory('gettext').prefix
docbook_prefix = Formula.factory('docbook').prefix
docbook_dtd = "#{docbook_prefix}/docbook/xml/4.5"
View
2  Library/Formula/lftp.rb
@@ -11,7 +11,7 @@ class Lftp < Formula
def install
# Bus error
- ENV.no_optimization if MACOS_VERSION == 10.5
+ ENV.no_optimization if MacOS.leopard?
system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
system "make install"
View
4 Library/Formula/libmemcached.rb
@@ -8,9 +8,7 @@ class Libmemcached < Formula
depends_on 'memcached'
def install
- if MACOS_VERSION < 10.6
- ENV.append_to_cflags "-undefined dynamic_lookup"
- end
+ ENV.append_to_cflags "-undefined dynamic_lookup" if MacOS.leopard?
system "./configure", "--prefix=#{prefix}"
system "make install"
View
2  Library/Formula/libnet.rb
@@ -11,7 +11,7 @@ def install
inreplace "autogen.sh", "libtoolize", "glibtoolize"
system "./autogen.sh"
- if MACOS_VERSION >= 10.6
+ unless MacOS.leopard?
cp "/usr/share/libtool/config/config.guess", "."
cp "/usr/share/libtool/config/config.sub", "."
end
View
2  Library/Formula/libsvg-cairo.rb
@@ -8,7 +8,7 @@ class LibsvgCairo < Formula
depends_on 'pkg-config' => :build
depends_on 'libsvg'
- depends_on 'cairo' if MACOS_VERSION < 10.6
+ depends_on 'cairo' if MacOS.leopard?
def install
system "./configure", "--disable-dependency-tracking", "--disable-debug", "--prefix=#{prefix}"
View
2  Library/Formula/libvirt.rb
@@ -13,7 +13,7 @@ class Libvirt < Formula
depends_on "gnutls"
depends_on "yajl"
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
# Definitely needed on Leopard, but not on Snow Leopard.
depends_on "readline"
depends_on "libxml2"
View
2  Library/Formula/madplay.rb
@@ -18,7 +18,7 @@ def patches
def install
configure_flags = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
# Avoid "error: CPU you selected does not support x86-64 instruction set"
- configure_flags << "--build=x86_64" if Hardware.is_64_bit? and MACOS_VERSION >= 10.6
+ configure_flags << "--build=x86_64" if MacOS.prefer_64_bit?
system "./configure", *configure_flags
system "make install"
end
View
37 Library/Formula/mongodb.rb
@@ -4,33 +4,18 @@
class Mongodb < Formula
homepage 'http://www.mongodb.org/'
- if ARGV.build_head?
- packages = {
- :x86_64 => {
- :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-1.8.1-rc1.tgz',
- :md5 => '76597bddbc36b6f75d1f8c9af499f3ba',
- :version => '1.8.0-x86_64'
- },
- :i386 => {
- :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-i386-1.8.1-rc1.tgz',
- :md5 => '73c9514d7cbf4263f7ae3c6442f7ff90',
- :version => '1.8.0-i386'
- }
+ packages = {
+ :x86_64 => {
+ :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-1.8.1.tgz',
+ :md5 => 'e446ba61cc8898fa2ffd5046953155ca',
+ :version => '1.8.1-x86_64'
+ },
+ :i386 => {
+ :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-i386-1.8.1.tgz',
+ :md5 => 'db95a601072feb3031f628dd39ca2446',
+ :version => '1.8.1-i386'
}
- else
- packages = {
- :x86_64 => {
- :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-1.8.0.tgz',
- :md5 => 'bba118bd6ba6a0db83aa5b7cff2f21fb',
- :version => '1.8.0-x86_64'
- },
- :i386 => {
- :url => 'http://fastdl.mongodb.org/osx/mongodb-osx-i386-1.8.0.tgz',
- :md5 => '286109a07e3fdb265d4602571e965ec3',
- :version => '1.8.0-i386'
- }
- }
- end
+ }
package = (Hardware.is_64_bit? and not ARGV.include? '--32bit') ? packages[:x86_64] : packages[:i386]
View
2  Library/Formula/mpd.rb
@@ -34,7 +34,7 @@ def install
"--enable-fluidsynth",
"--enable-zip",
"--enable-lame-encoder"]
- args << "--disable-curl" if MACOS_VERSION <= 10.5
+ args << "--disable-curl" if MacOS.leopard?
args << "--enable-lastfm" if ARGV.include?("--lastfm")
system "./configure", *args
View
14 Library/Formula/muscle.rb
@@ -0,0 +1,14 @@
+require 'formula'
+
+class Muscle < Formula
+ url 'http://www.drive5.com/muscle/downloads3.8.31/muscle3.8.31_src.tar.gz'
+ homepage 'http://www.drive5.com/muscle/'
+ md5 'f767f00fd15f0c5db944d41936779e10'
+ version '3.8.31'
+
+ def install
+ Dir.chdir "src"
+ system "make"
+ bin.install "muscle"
+ end
+end
View
2  Library/Formula/mysql.rb
@@ -2,7 +2,7 @@
class Mysql < Formula
homepage 'http://dev.mysql.com/doc/refman/5.5/en/'
- url 'http://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-5.5/mysql-5.5.10.tar.gz'
+ url 'http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.10.tar.gz'
md5 'ee604aff531ff85abeb10cf332c1355a'
depends_on 'cmake' => :build
View
2  Library/Formula/nginx.rb
@@ -6,7 +6,7 @@ class Nginx < Formula
homepage 'http://nginx.org/'
if ARGV.build_head?
- md5 'bb2dbacd4e66c4c578e0ac44b2f006b5'
+ md5 'efd94b736155f2c0b5267f50f09e7f67'
else
md5 '44df4eb6a22d725021288c570789046f'
end
View
4 Library/Formula/nmap.rb
@@ -6,7 +6,7 @@ class Nmap < Formula
md5 '0b80d2cb92ace5ebba8095a4c2850275'
# namp needs newer version of openssl on Leopard
- depends_on "openssl" if MACOS_VERSION < 10.6
+ depends_on "openssl" if MacOS.leopard?
fails_with_llvm
@@ -15,7 +15,7 @@ def install
args = ["--prefix=#{prefix}", "--without-zenmap"]
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
openssl = Formula.factory('openssl')
args << "--with-openssl=#{openssl.prefix}"
end
View
2  Library/Formula/nspr.rb
@@ -10,7 +10,7 @@ def install
Dir.chdir "mozilla/nsprpub" do
# Fixes a bug with linking against CoreFoundation, needed to work with SpiderMonkey
# See: http://openradar.appspot.com/7209349
- target_frameworks = (Hardware.is_32_bit? or MACOS_VERSION == 10.5) ? "-framework Carbon" : ""
+ target_frameworks = (Hardware.is_32_bit? or MacOS.leopard?) ? "-framework Carbon" : ""
inreplace "pr/src/Makefile.in", "-framework CoreServices -framework CoreFoundation", target_frameworks
args = ["--prefix=#{prefix}", "--disable-debug", "--enable-strip", "--enable-optimize"]
View
2  Library/Formula/pango.rb
@@ -10,7 +10,7 @@ class Pango < Formula
fails_with_llvm "Undefined symbols when linking", :build => "2326"
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
depends_on 'fontconfig' # Leopard's fontconfig is too old.
depends_on 'cairo' # Leopard doesn't come with Cairo.
end
View
2  Library/Formula/pbrt.rb
@@ -27,7 +27,7 @@ def install
s.change_make_var! "EXR_LIBDIR", "-L#{openexr.lib} -L#{ilmbase.lib}"
# Change settings if we are using a 32bit system
- if MACOS_VERSION < 10.6 or Hardware.is_32_bit?
+ if MacOS.leopard? or Hardware.is_32_bit?
s.change_make_var! "MARCH", "-m32 -msse2 -mfpmath=sse"
end
end
View
4 Library/Formula/postgresql.rb
@@ -7,7 +7,7 @@ class Postgresql < Formula
md5 '928df8c40bb012ad10756e58b70516fb'
depends_on 'readline'
- depends_on 'libxml2' if MACOS_VERSION < 10.6 # Leopard libxml is too old
+ depends_on 'libxml2' if MacOS.leopard? # Leopard libxml is too old
depends_on 'ossp-uuid'
def options
@@ -20,7 +20,7 @@ def options
skip_clean :all
def install
- ENV.libxml2 if MACOS_VERSION >= 10.6
+ ENV.libxml2 if MacOS.snow_leopard?
args = ["--disable-debug",
"--prefix=#{prefix}",
View
4 Library/Formula/qt.rb
@@ -21,7 +21,7 @@ def options
end
depends_on "d-bus" if ARGV.include? '--with-qtdbus'
- depends_on 'sqlite' if MACOS_VERSION <= 10.5
+ depends_on 'sqlite' if MacOS.leopard?
def install
ENV.x11
@@ -33,7 +33,7 @@ def install
"-cocoa", "-fast" ]
# See: https://github.com/mxcl/homebrew/issues/issue/744
- args << "-system-sqlite" if MACOS_VERSION <= 10.5
+ args << "-system-sqlite" if MacOS.leopard?
args << "-plugin-sql-mysql" if (HOMEBREW_CELLAR+"mysql").directory?
if ARGV.include? '--with-qtdbus'
View
6 Library/Formula/rabbitmq.rb
@@ -2,11 +2,11 @@
class Rabbitmq < Formula
homepage 'http://rabbitmq.com'
- url 'http://www.rabbitmq.com/releases/rabbitmq-server/v2.4.0/rabbitmq-server-2.4.0.tar.gz'
- md5 '5df5df63ec24249b7806e44b64059da5'
+ url 'http://www.rabbitmq.com/releases/rabbitmq-server/v2.4.1/rabbitmq-server-2.4.1.tar.gz'
+ md5 '6db31b4353bd44f8ae9b6756b0a831e6'
depends_on 'erlang'
- depends_on 'simplejson' => :python if MACOS_VERSION < 10.6
+ depends_on 'simplejson' => :python if MacOS.leopard?
def patches
# Can't build manpages without a lot of other junk, so disable
View
6 Library/Formula/recode.rb
@@ -13,10 +13,10 @@ def patches
end
def install
- if MACOS_VERSION >= 10.6
- cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
- else
+ if MacOS.leopard?
cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "."
+ else
+ cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
end
system "./configure", "--disable-debug", "--disable-dependency-tracking",
View
4 Library/Formula/redis.rb
@@ -1,10 +1,10 @@
require 'formula'
class Redis < Formula
- url 'http://redis.googlecode.com/files/redis-2.2.2.tar.gz'
+ url 'http://redis.googlecode.com/files/redis-2.2.4.tar.gz'
head 'git://github.com/antirez/redis.git'
homepage 'http://redis.io/'
- sha1 '75b953e4a3067570555c5f3f5e8f481c40489904'
+ sha1 '063e6e9f615ceda664d0691a6ea59befb22ebc40'
fails_with_llvm "Fails with \"reference out of range from _linenoise\""
View
2  Library/Formula/rogue.rb
@@ -7,7 +7,7 @@ class Rogue < Formula
sha1 'aef9e589c4f31eb6d3eeb9d543ab8787b00fb022'
def install
- ENV.ncurses_define if MACOS_VERSION == 10.6
+ ENV.ncurses_define if MacOS.snow_leopard?
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}"
View
2  Library/Formula/rtmpdump.rb
@@ -5,7 +5,7 @@ class Rtmpdump < Formula
homepage 'http://rtmpdump.mplayerhq.hu'
md5 'eb961f31cd55f0acf5aad1a7b900ef59'
- depends_on 'openssl' if MACOS_VERSION < 10.6
+ depends_on 'openssl' if MacOS.leopard?
# Use dylib instead of so
def patches; DATA; end
View
2  Library/Formula/rtorrent.rb
@@ -13,7 +13,7 @@ class Rtorrent < Formula
def install
args = ["--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"]
args << "--with-xmlrpc-c" if Formula.factory("xmlrpc-c").installed?
- if MACOS_VERSION == 10.5
+ if MacOS.leopard?
inreplace 'configure' do |s|
s.gsub! ' pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.15.4" 2>/dev/null`', ' pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.15.4" | sed -e "s/-arch [^-]*/-arch $(uname -m) /" 2>/dev/null`'
end
View
9 Library/Formula/spidermonkey.rb
@@ -18,12 +18,9 @@ def patches
end
def install
- if MACOS_VERSION == 10.5
- # aparently this flag causes the build to fail for ivanvc on 10.5 with a
- # penryn (core 2 duo) CPU. So lets be cautious here and remove it.
- # It might not be need with newer spidermonkeys anymore tho.
- ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '')
- end
+ # aparently this flag causes the build to fail for ivanvc on 10.5 with a
+ # penryn (core 2 duo) CPU. So lets be cautious here and remove it.
+ ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '') if MacOS.leopard?
# For some reason SpiderMonkey requires Autoconf-2.13
ac213_prefix = Pathname.pwd.join('ac213')
View
8 Library/Formula/subversion.rb
@@ -22,7 +22,7 @@ class Subversion < Formula
depends_on 'pkg-config' => :build
# On Snow Leopard, build a new neon. For Leopard, the deps above include this.
- depends_on 'neon' if MACOS_VERSION >= 10.6
+ depends_on 'neon' if MacOS.snow_leopard?
def options
[
@@ -82,7 +82,7 @@ def install
ENV.universal_binary if build_universal?
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
setup_leopard
else
check_neon_arch if build_universal?
@@ -122,14 +122,14 @@ def install
# Remove hard-coded ppc target, add appropriate ones
if build_universal?
arches = "-arch x86_64 -arch i386"
- elsif MACOS_VERSION < 10.6
+ elsif MacOS.leopard?
arches = "-arch i386"
else
arches = "-arch x86_64"
end
# Use verison-appropriate system Perl
- if MACOS_VERSION < 10.6
+ if MacOS.leopard?
perl_version = "5.8.8"
else
perl_version = "5.10.0"
View
6 Library/Formula/swi-prolog.rb
@@ -14,8 +14,10 @@ class SwiProlog < Formula
depends_on 'gawk'
# 10.5 versions of these are too old
- depends_on 'fontconfig' if MACOS_VERSION < 10.6
- depends_on 'expat' if MACOS_VERSION < 10.6
+ if MacOS.leopard?
+ depends_on 'fontconfig'
+ depends_on 'expat'
+ end
fails_with_llvm "Exported procedure chr_translate:chr_translate_line_info/3 is not defined"
View
6 Library/Formula/tcpflow.rb
@@ -11,10 +11,10 @@ def patches
end
def install
- if MACOS_VERSION >= 10.6
- cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
- else
+ if MacOS.leopard?
cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "."
+ else
+ cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
end
system "./configure", "--disable-debug", "--disable-dependency-tracking",
View
2  Library/Formula/wget.rb
@@ -5,7 +5,7 @@ class Wget < Formula
url 'http://ftp.gnu.org/gnu/wget/wget-1.12.tar.bz2'
md5 '308a5476fc096a8a525d07279a6f6aa3'
- depends_on "openssl" if MACOS_VERSION < 10.6
+ depends_on "openssl" if MacOS.leopard?
depends_on "libidn" if ARGV.include? "--enable-iri"
def options
View
2  Library/Formula/wine.rb
@@ -50,7 +50,7 @@ def install
"--with-x",
"--with-coreaudio",
"--with-opengl"]
- args << "--disable-win16" if MACOS_VERSION < 10.6
+ args << "--disable-win16" if MacOS.leopard?
# 64-bit builds of mpg123 are incompatible with 32-bit builds of Wine
args << "--without-mpg123" if Hardware.is_64_bit?
View
3  Library/Homebrew/cmd/create.rb
@@ -24,6 +24,7 @@ def create
path = Pathname.new url
print "Formula name [#{path.stem}]: "
fc.name = __gets || path.stem
+ fc.path = Formula.path fc.name
end
unless ARGV.force?
@@ -58,7 +59,7 @@ class FormulaCreator
attr :url
attr :md5
attr :name, true
- attr :path
+ attr :path, true
attr :mode, true
def url= url
View
10 Library/Homebrew/utils.rb
@@ -316,8 +316,16 @@ def macports_or_fink_installed?
false
end
+ def leopard?
+ 10.5 == MACOS_VERSION
+ end
+
+ def snow_leopard?
+ 10.6 <= MACOS_VERSION # Actually Snow Leopard or newer
+ end
+
def prefer_64_bit?
- MACOS_VERSION >= 10.6 and Hardware.is_64_bit?
+ Hardware.is_64_bit? and 10.6 <= MACOS_VERSION
end
end

No commit comments for this range

Something went wrong with that request. Please try again.