Miscellaneous style cleanups

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

bison.rb

@@ -7,7 +7,7 @@ class Bison < Formula
   md5 '9dba20116b13fc61a0846b0058fbe004'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
 end

freetype.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Freetype < Formula
-  url 'http://download.savannah.gnu.org/releases/freetype/freetype-2.3.12.tar.gz'
   homepage 'http://freetype.sourceforge.net'
+  url 'http://download.savannah.gnu.org/releases/freetype/freetype-2.3.12.tar.gz'
   md5 '6fc690d9b34154b51a919ff466cea90c'
 
   def options
@@ -18,7 +18,7 @@ def install
           "#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER"
     end
 
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 end

gcc.rb

@@ -144,8 +144,7 @@ def install
       end
     end
 
-    Dir.mkdir 'build'
-    Dir.chdir 'build' do
+    mkdir 'build' do
       system '../configure', "--enable-languages=#{languages.join(',')}", *args
 
       if profiledbuild?

gperf.rb

@@ -14,6 +14,6 @@ def install
   end
 
   def test
-    system "#{bin}/gperf --version"
+    system "#{bin}/gperf", "--version"
   end
 end

httpd.rb

@@ -8,7 +8,8 @@ class Httpd < Formula
   skip_clean :all
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
                           "--enable-layout=GNU",

lsof.rb

@@ -1,13 +1,13 @@
 require 'formula'
 
 class Lsof < Formula
+  homepage 'http://people.freebsd.org/~abe/'
   url 'ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_4.85.tar.bz2'
   md5 '102ee2081172bbe76dccaa6cceda8573'
-  homepage 'http://people.freebsd.org/~abe/'
 
   def install
     system "tar xf lsof_4.85_src.tar"
-    Dir.chdir "lsof_4.85_src" do
+    cd "lsof_4.85_src" do
       mv "00README", "../README"
       system "./Configure -n darwin"
       system "make"

m4.rb

@@ -6,10 +6,7 @@ class M4 < Formula
   mirror 'http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2'
   md5 '8a7cef47fecab6272eb86a6be6363b2f'
 
-  keg_only <<-EOS.undent
-    In order to prevent conflicts with the system-provided m4, this formula
-    is keg-only.
-  EOS
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"

make.rb

@@ -9,8 +9,9 @@ class Make < Formula
   keg_only :provided_by_osx
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "/usr/bin/gnumake install"
+    system "make install"
   end
 end

nano.rb

@@ -1,14 +1,15 @@
 require 'formula'
 
 class Nano < Formula
-  url 'http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz'
   homepage 'http://www.nano-editor.org/'
+  url 'http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz'
   md5 '03233ae480689a008eb98feb1b599807'
 
   depends_on "s-lang"
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--sysconfdir=#{etc}",
                           "--enable-color",

openssh.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Openssh < Formula
-  url 'ftp://ftp.lambdaserver.com/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz'
   homepage 'http://www.openssh.com/'
+  url 'ftp://ftp.lambdaserver.com/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz'
   sha1 'ac4e0055421e9543f0af5da607a72cf5922dcc56'
   version '5.9p1'
 

perl.rb

@@ -9,10 +9,6 @@ def options
     [['--use-threads', 'Enable perl threads']]
   end
 
-  def threads?
-      ARGV.include? '--use-threads'
-  end
-
   def install
     system("rm -f config.sh Policy.sh")
     args = [
@@ -23,18 +19,19 @@ def install
         '-Duseshrplib',
         '-Duselargefiles',
     ]
-    if threads?
-        args << '-Dusethreads'
-    end
+
+    args << '-Dusethreads' if ARGV.include? '--use-threads'
+
     system './Configure', *args
     system "make"
     system "make test"
     system "make install"
   end
 
-  def caveats; <<-EOS.undent
-      Builds without threads by default.  Use --use-threads to build with
-      threads.
+  def caveats
+    unless ARGV.include? '--use-threads' then <<-EOS.undent
+      Builds without threads by default. Use --use-threads to build with threads.
       EOS
+    end
   end
 end

tcl.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Tcl < Formula
-  url 'http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz'
   homepage 'http://www.tcl.tk/'
+  url 'http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz'
   md5 '8512d8db3233041dd68a81476906012a'
   version '8.5.9'
 
@@ -15,12 +15,12 @@ def install
     args << "--enable-threads" if ARGV.include? "--enable-threads"
     args << "--enable-64bit" if MacOS.prefer_64_bit?
 
-    Dir.chdir 'unix'
-
-    system "./configure", *args
-    system "make"
-    system "make test"
-    system "make install"
-    system "make install-private-headers" # so we can build extensions, like Tk
+    cd 'unix' do
+      system "./configure", *args
+      system "make"
+      system "make test"
+      system "make install"
+      system "make install-private-headers"
+    end
   end
 end

tidy.rb

@@ -1,14 +1,16 @@
 require 'formula'
 
 class Tidy < Formula
-  url 'ftp://mirror.internode.on.net/pub/gentoo/distfiles/tidy-20090325.tar.bz2'
   homepage 'http://tidy.sourceforge.net/'
+  url 'ftp://mirror.internode.on.net/pub/gentoo/distfiles/tidy-20090325.tar.bz2'
   md5 '39a05125a2a2dbacaccac84af64e1dbc'
 
   def install
     system 'sh', 'build/gnuauto/setup.sh'
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}", "--mandir=#{man}"
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make", "install"
   end
 end

tk.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Tk < Formula
-  url 'http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tk8.5.9-src.tar.gz'
   homepage 'http://www.tcl.tk/'
+  url 'http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tk8.5.9-src.tar.gz'
   md5 '7cdeb9feb61593f58a0ae61f2497580e'
   version '8.5.9'
 
@@ -22,21 +22,21 @@ def install
     args << "--enable-aqua" if ARGV.include? "--enable-aqua"
     args << "--enable-64bit" if MacOS.prefer_64_bit?
 
-    Dir.chdir 'unix'
+    cd 'unix' do
+      # required to build Aqua support
+      inreplace 'Makefile.in' do |s|
+        s.change_make_var! "REZ_SWITCHES", "@REZ_FLAGS@ -i $(GENERIC_DIR) " +
+                           "-i $(TCL_GENERIC_DIR) -i #{HOMEBREW_PREFIX}/include"
+      end
 
-    # required to build Aqua support
-    inreplace 'Makefile.in' do |s|
-      s.change_make_var! "REZ_SWITCHES", "@REZ_FLAGS@ -i $(GENERIC_DIR) " +
-                         "-i $(TCL_GENERIC_DIR) -i #{HOMEBREW_PREFIX}/include"
-    end
+      # so we can find the necessary Tcl headers
+      ENV.append 'CFLAGS', "-I#{HOMEBREW_PREFIX}/include"
 
-    # so we can find the necessary Tcl headers
-    ENV.append 'CFLAGS', "-I#{HOMEBREW_PREFIX}/include"
+      system "./configure", *args
+      system "make"
+      system "make install"
 
-    system "./configure", *args
-    system "make"
-    system "make install"
-
-    ln_s bin+'wish8.5', bin+'wish'
+      ln_s bin+'wish8.5', bin+'wish'
+    end
   end
 end