From 585ee080504f8b76e37c270f8da126e5e4e7fdb6 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Sat, 6 Mar 2010 22:27:19 -0800
Subject: Clean ups to several formulas, including:

* Removing silly concatenation
* Removing .bat files before installing
* Removing silly quoting
* Fixing download URLs
* Removing explicit versions
---
 Library/Formula/doxygen.rb       | 2 +-
 Library/Formula/ec2-api-tools.rb | 2 +-
 Library/Formula/fop.rb           | 3 +--
 Library/Formula/grails.rb        | 2 +-
 Library/Formula/icecast.rb       | 4 ++--
 Library/Formula/ioke.rb          | 2 +-
 Library/Formula/ipmitool.rb      | 1 -
 Library/Formula/john.rb          | 4 ++--
 Library/Formula/maven.rb         | 9 ++++-----
 Library/Formula/md5deep.rb       | 2 +-
 Library/Formula/pig.rb           | 6 ++----
 Library/Formula/qt.rb            | 4 ++--
 Library/Formula/spim.rb          | 6 +++---
 Library/Formula/tmux.rb          | 2 +-
 14 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/doxygen.rb b/Library/Formula/doxygen.rb
index da537509c..c09a359db 100644
--- a/Library/Formula/doxygen.rb
+++ b/Library/Formula/doxygen.rb
@@ -6,7 +6,7 @@ class Doxygen <Formula
   md5 '2d6ea20a9d850d94321cee78bab7bb87'
 
   def install
-    system "./configure", "--prefix", "#{prefix}"
+    system "./configure", "--prefix", prefix
     inreplace "Makefile" do |s|
       # Path of man1 relative to already given prefix
       s.change_make_var! 'MAN1DIR', man1
diff --git a/Library/Formula/ec2-api-tools.rb b/Library/Formula/ec2-api-tools.rb
index ac60a87be..24ae72d91 100644
--- a/Library/Formula/ec2-api-tools.rb
+++ b/Library/Formula/ec2-api-tools.rb
@@ -30,7 +30,7 @@ a terminal to edit said file. zsh users will want to edit `~/.zprofile`
 instead.
 
     export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home/"
-    export EC2_HOME="#{prefix.to_s}/"
+    export EC2_HOME="#{prefix}/"
 
 However, you're still not ready to use the tools. You need to download your
 X.509 certificate and private key from Amazon Web Services. These files are
diff --git a/Library/Formula/fop.rb b/Library/Formula/fop.rb
index afd5ba4dc..0bfab5c52 100644
--- a/Library/Formula/fop.rb
+++ b/Library/Formula/fop.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Fop <Formula
-  version "0.95"
   homepage "http://xmlgraphics.apache.org/fop/index.html"
-  url "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries/fop-#{@version}-bin.tar.gz"
+  url "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries/fop-0.95-bin.tar.gz"
   md5 "7af50bf58924dd22d71d22d8ad90b268"
   aka 'apache-fop'
 
diff --git a/Library/Formula/grails.rb b/Library/Formula/grails.rb
index 74e399143..ed35d5fd0 100644
--- a/Library/Formula/grails.rb
+++ b/Library/Formula/grails.rb
@@ -6,7 +6,7 @@ class Grails <Formula
   md5 'dcfe25c2425ec86e47dea7722b44c744'
 
   def install
-    FileUtils.rm_f Dir["bin/*.bat"]
+    rm_f Dir["bin/*.bat"]
     prefix.install Dir['*']
   end
 end
diff --git a/Library/Formula/icecast.rb b/Library/Formula/icecast.rb
index 7852c5dbb..7309cd2fe 100644
--- a/Library/Formula/icecast.rb
+++ b/Library/Formula/icecast.rb
@@ -15,7 +15,7 @@ class Icecast <Formula
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
 
-    (prefix + 'var' + 'log' + 'icecast').mkpath
-    touch prefix + 'var' + 'log' + 'icecast' + 'error.log'
+    (prefix+'var/log/icecast').mkpath
+    touch prefix+'var/log/icecast/error.log'
   end
 end
diff --git a/Library/Formula/ioke.rb b/Library/Formula/ioke.rb
index 8630a1f0b..58da1fe12 100644
--- a/Library/Formula/ioke.rb
+++ b/Library/Formula/ioke.rb
@@ -10,7 +10,7 @@ class Ioke <Formula
       s.change_make_var! 'IOKE_HOME', HOMEBREW_PREFIX
     end
 
+    rm_f Dir["bin/*.bat"]
     prefix.install %w[bin lib share]
-    FileUtils.rm_f Dir["#{bin}/*.bat"]
   end
 end
\ No newline at end of file
diff --git a/Library/Formula/ipmitool.rb b/Library/Formula/ipmitool.rb
index 621f17c4e..8a2be67e1 100644
--- a/Library/Formula/ipmitool.rb
+++ b/Library/Formula/ipmitool.rb
@@ -3,7 +3,6 @@ require 'formula'
 class Ipmitool <Formula
   url 'http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.11/ipmitool-1.8.11.tar.bz2'
   homepage 'http://ipmitool.sourceforge.net/'
-  version '1.8.11'
   md5 '1d0da20add7388d64c549f95538b6858'
 
   def install
diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb
index e84e2190d..1e1198381 100644
--- a/Library/Formula/john.rb
+++ b/Library/Formula/john.rb
@@ -20,8 +20,8 @@ class John <Formula
     
     FileUtils.rm 'README'
     # using mv over bin.install due to problem moving sym links
-    FileUtils.mv 'run', "#{bin}"
-    FileUtils.chmod_R 0755, "#{bin}"
+    FileUtils.mv 'run', bin
+    FileUtils.chmod_R 0755, bin
   end
 end
 
diff --git a/Library/Formula/maven.rb b/Library/Formula/maven.rb
index 7c80b57fb..fca3d5388 100644
--- a/Library/Formula/maven.rb
+++ b/Library/Formula/maven.rb
@@ -1,13 +1,12 @@
 require 'formula'
 
 class Maven <Formula
-  @url='http://www.apache.org/dist/maven/binaries/apache-maven-2.2.1-bin.tar.gz'
-  @version="2.2.1"
-  @homepage='http://maven.apache.org/'
-  @md5='3f829ed854cbacdaca8f809e4954c916'
+  url 'http://www.apache.org/dist/maven/binaries/apache-maven-2.2.1-bin.tar.gz'
+  homepage 'http://maven.apache.org/'
+  md5 '3f829ed854cbacdaca8f809e4954c916'
 
   def install
+    rm_f Dir["bin/*.bat"]
     prefix.install %w[bin conf boot lib]
-    FileUtils.rm_f Dir["#{bin}/*.bat"]
   end
 end
diff --git a/Library/Formula/md5deep.rb b/Library/Formula/md5deep.rb
index 052468303..082bada84 100644
--- a/Library/Formula/md5deep.rb
+++ b/Library/Formula/md5deep.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class Md5deep <Formula
-  url 'http://sourceforge.net/projects/md5deep/files/md5deep/md5deep-3.5.1/md5deep-3.5.1.tar.gz/download'
+  url 'http://sourceforge.net/projects/md5deep/files/md5deep/md5deep-3.5.1/md5deep-3.5.1.tar.gz'
   homepage 'http://md5deep.sourceforge.net/'
   md5 'c568d1193e83d0a76b501396abca2be7'
   version '3.5.1'
diff --git a/Library/Formula/pig.rb b/Library/Formula/pig.rb
index 80d9bd5ae..b9505ecc4 100644
--- a/Library/Formula/pig.rb
+++ b/Library/Formula/pig.rb
@@ -10,10 +10,8 @@ class Pig < Formula
   end
 
   def install
-    rm_f Dir["#{bin}/*.bat"]
-    prefix.install 'bin'
-    prefix.install 'lib/hadoop20.jar'
-    prefix.install "pig-#{version}-core.jar"
+    rm_f Dir["bin/*.bat"]
+    prefix.install ['bin', 'lib/hadoop20.jar', "pig-#{version}-core.jar"]
   end
   
 end
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index f629e99e6..1ea08f49c 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -72,8 +72,8 @@ class Qt <Formula
     system "make install"
 
     # stop crazy disk usage
-    (prefix+'doc'+'html').rmtree
-    (prefix+'doc'+'src').rmtree
+    (prefix+'doc/html').rmtree
+    (prefix+'doc/src').rmtree
     # what are these anyway?
     (bin+'Assistant_adp.app').rmtree
     (bin+'pixeltool.app').rmtree
diff --git a/Library/Formula/spim.rb b/Library/Formula/spim.rb
index 4f634b73a..dc4ab6d48 100644
--- a/Library/Formula/spim.rb
+++ b/Library/Formula/spim.rb
@@ -11,9 +11,9 @@ class Spim <Formula
     Dir.chdir 'spim'
 
     inreplace "Makefile" do |s|
-      s.change_make_var! "BIN_DIR", "#{bin}"
-      s.change_make_var! "EXCEPTION_DIR", "#{libexec}"
-      s.change_make_var! "MAN_DIR", "#{man1}"
+      s.change_make_var! "BIN_DIR", bin
+      s.change_make_var! "EXCEPTION_DIR", libexec
+      s.change_make_var! "MAN_DIR", man1
     end
 
     system "make"
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 1f566018f..f220851b1 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -8,7 +8,7 @@ class Tmux <Formula
   depends_on 'libevent'
 
   def install
-    ENV['PREFIX'] = "#{prefix}"
+    ENV['PREFIX'] = prefix
     system "./configure"
 
     inreplace "GNUmakefile" do |f|
-- 
cgit v1.2.3