Permalink
Browse files

Miscellaneous style cleanups

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information...
1 parent f093075 commit 6574de7e1cee05dfaf75fe4cda34590f83c632a1 @jacknagel jacknagel committed Jun 11, 2012
Showing with 42 additions and 45 deletions.
  1. +1 −1 allegro4.rb
  2. +1 −1 allegro5.rb
  3. +0 −3 antlr2.rb
  4. +4 −4 berkeley-db4.rb
  5. +1 −1 cassandra-0.6.rb
  6. +1 −1 erlang-r13.rb
  7. +1 −2 gcc45.rb
  8. +1 −1 gmp4.rb
  9. +3 −6 hdf4.rb
  10. +1 −2 imagemagick-ruby186.rb
  11. +1 −1 llvm-gcc28.rb
  12. +1 −1 mapnik071.rb
  13. +1 −1 maven2.rb
  14. +5 −2 mysql51.rb
  15. +1 −1 node4.rb
  16. +1 −1 nu0.rb
  17. +1 −1 openssl098.rb
  18. +1 −1 play12.rb
  19. +1 −1 python24.rb
  20. +1 −1 python25.rb
  21. +1 −1 python26.rb
  22. +1 −1 python31.rb
  23. +3 −2 ruby192.rb
  24. +1 −1 solr14.rb
  25. +3 −3 spidermonkey180.rb
  26. +3 −2 squid2.rb
  27. +1 −1 tomcat6.rb
  28. +1 −1 unison232.rb
View
@@ -1,8 +1,8 @@
require 'formula'
class Allegro4 < Formula
- url 'http://downloads.sourceforge.net/project/alleg/allegro/4.4.1.1/allegro-4.4.1.1.tar.gz'
homepage 'http://www.allegro.cc'
+ url 'http://downloads.sourceforge.net/project/alleg/allegro/4.4.1.1/allegro-4.4.1.1.tar.gz'
md5 '0f1cfff8f2cf88e5c91a667d9fd386ec'
depends_on 'cmake' => :build
View
@@ -1,8 +1,8 @@
require 'formula'
class Allegro5 < Formula
- url 'http://downloads.sourceforge.net/project/alleg/allegro/5.0.1/allegro-5.0.1.tar.gz'
homepage 'http://www.allegro.cc'
+ url 'http://downloads.sourceforge.net/project/alleg/allegro/5.0.1/allegro-5.0.1.tar.gz'
md5 '7a7dafa3362b97dd653f736e21f5ef21'
depends_on 'cmake' => :build
View
@@ -1,13 +1,11 @@
require 'formula'
class Antlr2 < Formula
-
homepage 'http://www.antlr2.org'
url 'http://www.antlr2.org/download/antlr-2.7.7.tar.gz'
md5 '01cc9a2a454dd33dcd8c856ec89af090'
def install
-
# C Sharp is explicitly disabled because the antlr configure script will
# confuse the Chicken Scheme compiler, csc, for a C sharp compiler.
args = %W[
@@ -28,5 +26,4 @@ def install
java -classpath #{libexec}/antlr.jar antlr.Tool "$@"
EOS
end
-
end
View
@@ -1,8 +1,8 @@
require 'formula'
class BerkeleyDb4 < Formula
- url 'http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz'
homepage 'http://www.oracle.com/technology/products/berkeley-db/index.html'
+ url 'http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz'
md5 'f80022099c5742cd179343556179aa8c'
def options
@@ -12,15 +12,15 @@ def options
def install
# BerkeleyDB dislikes parallel builds
ENV.deparallelize
- ENV.O3 # takes an hour or more with link time optimisation
args = ["--disable-debug",
- "--prefix=#{prefix}", "--mandir=#{man}",
+ "--prefix=#{prefix}",
+ "--mandir=#{man}",
"--enable-cxx"]
args << "--enable-java" unless ARGV.include? "--without-java"
# BerkeleyDB requires you to build everything from the build_unix subdirectory
- Dir.chdir 'build_unix' do
+ cd 'build_unix' do
system "../dist/configure", *args
system "make install"
View
@@ -1,8 +1,8 @@
require 'formula'
class Cassandra06 < Formula
- url 'http://www.mirrorservice.org/sites/ftp.apache.org//cassandra/0.6.8/apache-cassandra-0.6.8-bin.tar.gz'
homepage 'http://cassandra.apache.org'
+ url 'http://www.mirrorservice.org/sites/ftp.apache.org//cassandra/0.6.8/apache-cassandra-0.6.8-bin.tar.gz'
md5 'a1a15b00e78fd3148c37d45900e08829'
def install
View
@@ -6,10 +6,10 @@ class ErlangR13Manuals < Formula
end
class ErlangR13 < Formula
+ homepage 'http://www.erlang.org'
# Download from GitHub. Much faster than official tarball.
url "https://github.com/erlang/otp.git", :tag => "OTP_R13B04"
version 'R13B04'
- homepage 'http://www.erlang.org'
# We can't strip the beam executables or any plugins, there isn't really
# anything else worth stripping and it takes a really, long time to run
View
@@ -137,8 +137,7 @@ def install
end
end
- Dir.mkdir 'build'
- Dir.chdir 'build' do
+ mkdir 'build' do
system '../configure', "--enable-languages=#{languages.join(',')}", *args
if profiledbuild?
View
@@ -1,8 +1,8 @@
require 'formula'
class Gmp4 < Formula
- url 'ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2'
homepage 'http://gmplib.org/'
+ url 'ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2'
sha1 'c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c'
def options
View
@@ -5,17 +5,15 @@ def fortran?
end
class Hdf4 < Formula
+ homepage 'http://www.hdfgroup.org'
url 'http://www.hdfgroup.org/ftp/HDF/releases/HDF4.2.6/src/hdf-4.2.6.tar.bz2'
md5 'eed281ded7f81f6ba1a3b1b1d5109bfe'
- homepage 'http://www.hdfgroup.org'
depends_on 'cmake' => :build
depends_on 'szip'
def options
- [
- ['--enable-fortran', 'Build Fortran libraries']
- ]
+ [['--enable-fortran', 'Build Fortran libraries']]
end
def install
@@ -39,8 +37,7 @@ def install
]
args.concat %W[-DHDF4_BUILD_FORTRAN=ON -DCMAKE_Fortran_MODULE_DIRECTORY=#{include}] if fortran?
- Dir.mkdir 'build'
- Dir.chdir 'build' do
+ mkdir 'build' do
system 'cmake', '..', *args
system 'make install'
end
@@ -18,9 +18,9 @@ def x11?
end
class ImagemagickRuby186 < Formula
+ homepage 'http://www.imagemagick.org'
url 'http://image_magick.veidrodis.com/image_magick/ImageMagick-6.5.9-8.tar.bz2'
md5 '89892e250e81fad51b4b2a1f816987e6'
- homepage 'http://www.imagemagick.org'
depends_on 'jpeg'
depends_on 'libwmf' => :optional if x11?
@@ -61,7 +61,6 @@ def configure_args
def install
ENV.libpng
ENV.deparallelize
- ENV.O3 # takes forever otherwise
fix_configure
View
@@ -1,9 +1,9 @@
require 'formula'
class LlvmGcc28 < Formula
+ homepage 'http://llvm.org/docs/CommandGuide/html/llvmgcc.html'
url 'http://llvm.org/releases/2.8/llvm-gcc-4.2-2.8-x86_64-apple-darwin10.tar.gz'
version '2.8'
- homepage 'http://llvm.org/docs/CommandGuide/html/llvmgcc.html'
md5 'b1ceb9d3a6cc36f6e274a9cdd773d72b'
skip_clean :all # This is a binary install
View
@@ -1,8 +1,8 @@
require 'formula'
class Mapnik071 < Formula
- url 'http://download.berlios.de/mapnik/mapnik-0.7.1.tar.gz'
homepage 'http://www.mapnik.org/'
+ url 'http://download.berlios.de/mapnik/mapnik-0.7.1.tar.gz'
md5 '3a070fdd7c6a3367ad78d95c2387b03b'
depends_on 'pkg-config' => :build
View
@@ -1,8 +1,8 @@
require 'formula'
class Maven2 < Formula
- url 'http://www.apache.org/dist/maven/binaries/apache-maven-2.2.1-bin.tar.gz'
homepage 'http://maven.apache.org/'
+ url 'http://www.apache.org/dist/maven/binaries/apache-maven-2.2.1-bin.tar.gz'
md5 '3f829ed854cbacdaca8f809e4954c916'
def install
View
@@ -7,6 +7,11 @@ class Mysql51 < Formula
depends_on 'readline'
+ fails_with :llvm do
+ build 2335
+ cause "https://github.com/mxcl/homebrew/issues/issue/144"
+ end
+
def options
[
['--with-tests', "Keep tests when installing."],
@@ -23,8 +28,6 @@ def patches
end
def install
- fails_with_llvm "https://github.com/mxcl/homebrew/issues/issue/144", :build => 2335
-
# See: http://dev.mysql.com/doc/refman/5.1/en/configure-options.html
# These flags may not apply to gcc 4+
ENV['CXXFLAGS'] = ENV['CXXFLAGS'].gsub "-fomit-frame-pointer", ""
View
@@ -1,8 +1,8 @@
require 'formula'
class Node4 < Formula
- url 'http://nodejs.org/dist/node-v0.4.12.tar.gz'
homepage 'http://nodejs.org/'
+ url 'http://nodejs.org/dist/node-v0.4.12.tar.gz'
md5 'a6375eaa43db5356bf443e25b828ae16'
head 'https://github.com/joyent/node.git'
View
@@ -1,8 +1,8 @@
require 'formula'
class Nu0 < Formula
- url 'http://programming.nu/releases/Nu-0.4.0.tgz'
homepage 'http://programming.nu'
+ url 'http://programming.nu/releases/Nu-0.4.0.tgz'
md5 '94d181e94cd661569103290183e89477'
depends_on 'pcre'
View
@@ -16,7 +16,7 @@ def install
ENV.deparallelize # Parallel compilation fails
system "make"
system "make test"
- system "make install MANDIR=#{man} MANSUFFIX=ssl"
+ system "make", "install", "MANDIR=#{man}", "MANSUFFIX=ssl"
end
def caveats; <<-EOS.undent
View
@@ -1,8 +1,8 @@
require 'formula'
class Play12 < Formula
- url 'http://download.playframework.org/releases/play-1.2.4.zip'
homepage 'http://www.playframework.org/'
+ url 'http://download.playframework.org/releases/play-1.2.4.zip'
md5 'ec8789f8cc02927ece536d102f5e649e'
def install
View
@@ -1,8 +1,8 @@
require 'formula'
class Python24 < Formula
- url 'http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz'
homepage 'http://www.python.org/download/releases/2.4.6/'
+ url 'http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz'
md5 '7564b2b142b1b8345cd5358b7aaaa482'
depends_on 'gdbm' => :optional
View
@@ -42,8 +42,8 @@ def as_framework?
end
class Python25 < Formula
- url 'http://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz'
homepage 'http://www.python.org/'
+ url 'http://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz'
md5 'd1d9c83928561addf11d00b22a18ca50'
depends_on 'sqlite' => :optional # Prefer over OS X's older version
View
@@ -42,8 +42,8 @@ def as_framework?
end
class Python26 < Formula
- url 'http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz'
homepage 'http://www.python.org/'
+ url 'http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz'
md5 'f6c1781f5d73ab7dfa5181f43ea065f6'
depends_on 'sqlite' => :optional # Prefer over OS X's older version
View
@@ -9,8 +9,8 @@ def as_framework?
end
class Python31 < Formula
- url 'http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.bz2'
homepage 'http://www.python.org/'
+ url 'http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.bz2'
md5 'dc8a7a96c12880d2e61e9f4add9d3dc7'
depends_on 'readline' => :optional # Prefer over OS X's libedit
View
@@ -1,11 +1,12 @@
require 'formula'
class Ruby192 < Formula
- url 'http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.bz2'
homepage 'http://www.ruby-lang.org/en/'
- head 'http://svn.ruby-lang.org/repos/ruby/trunk/', :using => :svn
+ url 'http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.bz2'
sha256 '403b3093fbe8a08dc69c269753b8c6e7bd8f87fb79a7dd7d676913efe7642487'
+ head 'http://svn.ruby-lang.org/repos/ruby/trunk/', :using => :svn
+
depends_on 'readline'
depends_on 'libyaml'
View
@@ -1,8 +1,8 @@
require 'formula'
class Solr14 < Formula
- url 'ftp://ftp.fu-berlin.de/unix/www/apache/lucene/solr/1.4.1/apache-solr-1.4.1.tgz'
homepage 'http://lucene.apache.org/solr/'
+ url 'ftp://ftp.fu-berlin.de/unix/www/apache/lucene/solr/1.4.1/apache-solr-1.4.1.tgz'
md5 '258a020ed8c3f44e13b09e8ae46a1c84'
def script; <<-EOS.undent
View
@@ -2,10 +2,10 @@
# Private older version of autoconf required to compile Spidermonkey
class Autoconf213 < Formula
+ homepage 'http://www.gnu.org/software/autoconf/'
url 'http://ftpmirror.gnu.org/autoconf/autoconf-2.13.tar.gz'
mirror 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz'
md5 '9de56d4a161a723228220b0f425dc711'
- homepage 'http://www.gnu.org/software/autoconf/'
end
class Spidermonkey180 < Formula
@@ -35,7 +35,7 @@ def install
system "make install"
end
- Dir.chdir "js/src" do
+ cd "js/src" do
# Fixes a bug with linking against CoreFoundation. Tests all pass after
# building like this. See: http://openradar.appspot.com/7209349
inreplace "configure.in", "LDFLAGS=\"$LDFLAGS -framework Cocoa\"", ""
@@ -49,7 +49,7 @@ def install
mkdir "brew-build"
- Dir.chdir "brew-build" do
+ cd "brew-build" do
system "../js/src/configure", "--prefix=#{prefix}",
"--enable-readline",
"--enable-threadsafe",
View
@@ -1,13 +1,14 @@
require 'formula'
class Squid2 < Formula
- url 'http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9.tar.gz'
homepage 'http://www.squid-cache.org/'
+ url 'http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9.tar.gz'
version '2.7.9'
md5 '7d3b8b0bdda3ae56e438d4a95a97d3b3'
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ system "./configure", "--disable-debug",
+ "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
end
View
@@ -1,8 +1,8 @@
require 'formula'
class Tomcat6 < Formula
- url 'http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz'
homepage 'http://tomcat.apache.org/'
+ url 'http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz'
md5 '0e86af52d7d31503a98beb04a9d5d8dc'
skip_clean :all
View
@@ -1,8 +1,8 @@
require 'formula'
class Unison232 < Formula
- url 'http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.32.52/unison-2.32.52.tar.gz'
homepage 'http://www.cis.upenn.edu/~bcpierce/unison/'
+ url 'http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.32.52/unison-2.32.52.tar.gz'
md5 '0701f095c1721776a0454b94607eda48'
depends_on 'objective-caml'

0 comments on commit 6574de7

Please sign in to comment.