Streamline metafile installs

35 files changed, 43 insertions, 52 deletions

diff --git a/Library/Formula/activemq.rb b/Library/Formula/activemq.rb
index b79d44c57..47ba0da33 100644
--- a/Library/Formula/activemq.rb
+++ b/Library/Formula/activemq.rb
@@ -10,7 +10,7 @@ class Activemq < Formula
   def install
     rm_rf Dir['bin/linux-x86-*']
 
-    prefix.install %w{ LICENSE NOTICE README.txt }
+    prefix.install_metafiles
     libexec.install Dir['*']
 
     bin.write_exec_script libexec/'bin/activemq'
diff --git a/Library/Formula/apollo.rb b/Library/Formula/apollo.rb
index 6c8042f78..a0e9aae21 100644
--- a/Library/Formula/apollo.rb
+++ b/Library/Formula/apollo.rb
@@ -24,7 +24,8 @@ class Apollo < Formula
   option "no-mqtt", "Install without MQTT protocol support"
 
   def install
-    prefix.install %w{ LICENSE NOTICE readme.html docs examples }
+    prefix.install_metafiles
+    prefix.install %w{ docs examples }
     libexec.install Dir['*']
 
     unless build.include? "no-bdb"
diff --git a/Library/Formula/autopsy.rb b/Library/Formula/autopsy.rb
index 4b0f4a05a..20c49f7d9 100644
--- a/Library/Formula/autopsy.rb
+++ b/Library/Formula/autopsy.rb
@@ -52,7 +52,7 @@ class Autopsy < Formula
   def install
     (var+"lib/autopsy").mkpath
     mv 'lib', 'libexec'
-    prefix.install %w{ COPYING global.css help libexec pict }
+    prefix.install %w{ global.css help libexec pict }
     prefix.install Dir['*.txt']
     (prefix+"conf.pl").write autcfg
     inreplace 'base/autopsy.base', '/tmp/autopsy', prefix
diff --git a/Library/Formula/dc3dd.rb b/Library/Formula/dc3dd.rb
index b9e71fc24..62cd9f92a 100644
--- a/Library/Formula/dc3dd.rb
+++ b/Library/Formula/dc3dd.rb
@@ -17,7 +17,7 @@ class Dc3dd < Formula
                           "--infodir=#{info}"
     system "make"
     system "make install"
-    prefix.install %w[README Options_Reference.txt Sample_Commands.txt]
+    prefix.install %w[Options_Reference.txt Sample_Commands.txt]
   end
 end
 
diff --git a/Library/Formula/disco.rb b/Library/Formula/disco.rb
index 3f2b6529d..75dbb430b 100644
--- a/Library/Formula/disco.rb
+++ b/Library/Formula/disco.rb
@@ -33,8 +33,8 @@ class Disco < Formula
     system "make install"
     ENV.delete('CC')
     system "make install-discodb install-discodex"
-    bin.install ['contrib/discodex/bin/discodex','contrib/discodex/bin/discodexcli.py']
-    prefix.install ['contrib', 'doc', 'examples', 'node']
+    bin.install %w[contrib/discodex/bin/discodex contrib/discodex/bin/discodexcli.py]
+    prefix.install %w[contrib doc examples node]
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/findbugs.rb b/Library/Formula/findbugs.rb
index 57e4a6888..309862fe2 100644
--- a/Library/Formula/findbugs.rb
+++ b/Library/Formula/findbugs.rb
@@ -8,7 +8,7 @@ class Findbugs < Formula
   def install
     # Remove windows files
     rm_f Dir["bin/*.bat"]
-    prefix.install 'README.txt'
+    prefix.install_metafiles
     libexec.install Dir['*']
 
     bin.write_exec_script libexec/'bin/fb'
diff --git a/Library/Formula/fon-flash-cli.rb b/Library/Formula/fon-flash-cli.rb
index dcd383e70..10934157d 100644
--- a/Library/Formula/fon-flash-cli.rb
+++ b/Library/Formula/fon-flash-cli.rb
@@ -10,7 +10,7 @@ class FonFlashCli < Formula
     cd 'fon-flash' do
       system "make fon-flash"
       bin.install 'fon-flash'
-      prefix.install 'README.txt'
+      prefix.install_metafiles
     end
   end
 
diff --git a/Library/Formula/grails.rb b/Library/Formula/grails.rb
index 42f7e1aad..d9d3ab95a 100644
--- a/Library/Formula/grails.rb
+++ b/Library/Formula/grails.rb
@@ -7,7 +7,7 @@ class Grails < Formula
 
   def install
     rm_f Dir["bin/*.bat", "bin/cygrails", "*.bat"]
-    prefix.install %w[LICENSE README]
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
diff --git a/Library/Formula/griffon.rb b/Library/Formula/griffon.rb
index 90c69fb83..44403ce17 100644
--- a/Library/Formula/griffon.rb
+++ b/Library/Formula/griffon.rb
@@ -8,7 +8,7 @@ class Griffon < Formula
   def install
     rm_f Dir["bin/*.bat"]
 
-    prefix.install %w[LICENSE README.md]
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
diff --git a/Library/Formula/groovy.rb b/Library/Formula/groovy.rb
index 8f7f0cebc..aefeb9410 100644
--- a/Library/Formula/groovy.rb
+++ b/Library/Formula/groovy.rb
@@ -10,7 +10,7 @@ class Groovy < Formula
     # Why are icons in bin?
     rm_f Dir["bin/*.bat","bin/groovy.{icns,ico}"]
 
-    prefix.install %w(LICENSE.txt NOTICE.txt)
+    prefix.install_metafiles
     libexec.install %w(bin conf lib embeddable)
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
diff --git a/Library/Formula/groovyserv.rb b/Library/Formula/groovyserv.rb
index 3df97ab65..ca0c0e07e 100644
--- a/Library/Formula/groovyserv.rb
+++ b/Library/Formula/groovyserv.rb
@@ -13,8 +13,6 @@ class Groovyserv < Formula
     ENV['CC'] = ENV['CFLAGS'] = nil # to workaround
     system './gradlew clean executables'
 
-    prefix.install %w{LICENSE.txt README.txt NOTICE.txt}
-
     # Install executables in libexec to avoid conflicts
     libexec.install Dir["build/executables/{bin,lib}"]
 
diff --git a/Library/Formula/idnits.rb b/Library/Formula/idnits.rb
index cd1485696..33ea86ee2 100644
--- a/Library/Formula/idnits.rb
+++ b/Library/Formula/idnits.rb
@@ -9,6 +9,6 @@ class Idnits < Formula
 
   def install
     bin.install "idnits"
-    prefix.install %w(about todo)
+    prefix.install_metafiles
   end
 end
diff --git a/Library/Formula/ioke.rb b/Library/Formula/ioke.rb
index 34105b0c4..8d066212a 100644
--- a/Library/Formula/ioke.rb
+++ b/Library/Formula/ioke.rb
@@ -1,21 +1,24 @@
 require 'formula'
 
 class Ioke < Formula
-  url 'http://ioke.org/dist/ioke-P-ikj-0.4.0.tar.gz'
   homepage 'http://ioke.org/'
+  url 'http://ioke.org/dist/ioke-P-ikj-0.4.0.tar.gz'
   sha1 '1cf1512e1a845b64c8f839fed396f279afdc0ed9'
 
   def install
     # Remove windows files
     rm_f Dir["bin/*.bat"]
 
+    prefix.install_metafiles
+
+    # Install jars in libexec to avoid conflicts
+    libexec.install Dir['*']
+
     # Point IOKE_HOME to libexec
-    inreplace 'bin/ioke' do |s|
+    inreplace libexec/'bin/ioke' do |s|
       s.change_make_var! 'IOKE_HOME', libexec
     end
 
-    # Install jars in libexec to avoid conflicts
-    prefix.install %w{ COPYING LICENSE README bin }
-    libexec.install Dir['*']
+    bin.install_symlink libexec/'bin/ioke'
   end
 end
diff --git a/Library/Formula/jmeter.rb b/Library/Formula/jmeter.rb
index 8e536a716..8e2c8f408 100644
--- a/Library/Formula/jmeter.rb
+++ b/Library/Formula/jmeter.rb
@@ -8,7 +8,7 @@ class Jmeter < Formula
   def install
     # Remove windows files
     rm_f Dir["bin/*.bat"]
-    prefix.install %w{ LICENSE NOTICE README }
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.write_exec_script libexec/'bin/jmeter'
   end
diff --git a/Library/Formula/libstxxl.rb b/Library/Formula/libstxxl.rb
index 59a008ce6..64f531bb3 100644
--- a/Library/Formula/libstxxl.rb
+++ b/Library/Formula/libstxxl.rb
@@ -11,7 +11,7 @@ class Libstxxl < Formula
     system "make", "config_gnu", "USE_MACOSX=yes"
     system "make", "library_g++", "USE_MACOSX=yes"
 
-    prefix.install Dir['include']
+    prefix.install 'include'
     lib.install 'lib/libstxxl.a'
   end
 end
diff --git a/Library/Formula/liquibase.rb b/Library/Formula/liquibase.rb
index 7eea0397e..e6ec74f8b 100644
--- a/Library/Formula/liquibase.rb
+++ b/Library/Formula/liquibase.rb
@@ -10,7 +10,7 @@ class Liquibase < Formula
 
     chmod 0755, Dir['liquibase']
 
-    prefix.install "LICENSE.txt"
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.install_symlink libexec+'liquibase'
   end
diff --git a/Library/Formula/mallet.rb b/Library/Formula/mallet.rb
index 77dee9f6b..43ef6d28d 100644
--- a/Library/Formula/mallet.rb
+++ b/Library/Formula/mallet.rb
@@ -16,7 +16,7 @@ class Mallet < Formula
 
   def install
     rm Dir['bin/*.{bat,dll,exe}'] # Remove all windows files
-    prefix.install 'LICENSE'
+    prefix.install_metafiles
     libexec.install Dir['*']
     cd libexec+'bin' do
       Dir['*'].each do |file|
diff --git a/Library/Formula/maven-shell.rb b/Library/Formula/maven-shell.rb
index e143b2e04..d016fb928 100644
--- a/Library/Formula/maven-shell.rb
+++ b/Library/Formula/maven-shell.rb
@@ -9,9 +9,8 @@ class MavenShell < Formula
     # Remove windows files.
     rm_f Dir["bin/*.bat"]
 
-    # Install jars in libexec to avoid conflicts.
-    prefix.install %w{ NOTICE.txt LICENSE.txt README.txt }
+    prefix.install_metafiles
     libexec.install Dir['*']
-    bin.install_symlink "#{libexec}/bin/mvnsh"
+    bin.install_symlink libexec/"bin/mvnsh"
   end
 end
diff --git a/Library/Formula/maven.rb b/Library/Formula/maven.rb
index aa3e41f5f..0444a028b 100644
--- a/Library/Formula/maven.rb
+++ b/Library/Formula/maven.rb
@@ -12,8 +12,7 @@ class Maven < Formula
     # Fix the permissions on the global settings file.
     chmod 0644, Dir["conf/settings.xml"]
 
-    prefix.install %w{ NOTICE.txt LICENSE.txt README.txt }
-    # Install jars in libexec to avoid conflicts
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
diff --git a/Library/Formula/multimarkdown.rb b/Library/Formula/multimarkdown.rb
index 906ab8d1f..487dbabf3 100644
--- a/Library/Formula/multimarkdown.rb
+++ b/Library/Formula/multimarkdown.rb
@@ -18,7 +18,7 @@ class Multimarkdown < Formula
     bin.install 'multimarkdown'
     bin.install Dir['scripts/*']
     # The support stuff will be put into the Cellar only
-    prefix.install Dir['Support']
+    prefix.install 'Support'
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/otx.rb b/Library/Formula/otx.rb
index 255f3583f..757306ffa 100644
--- a/Library/Formula/otx.rb
+++ b/Library/Formula/otx.rb
@@ -13,7 +13,7 @@ class Otx < Formula
 
     system 'xcodebuild SYMROOT=build'
     build = buildpath/'build/Release'
-    bin.install build+"otx"
-    prefix.install build+"otx.app"
+    bin.install build/"otx"
+    prefix.install build/"otx.app"
   end
 end
diff --git a/Library/Formula/pax-construct.rb b/Library/Formula/pax-construct.rb
index 88a1d4cb7..7f7ae0715 100644
--- a/Library/Formula/pax-construct.rb
+++ b/Library/Formula/pax-construct.rb
@@ -7,7 +7,7 @@ class PaxConstruct < Formula
 
   def install
     rm_rf Dir['bin/*.bat']
-    prefix.install 'bin/LICENSE', 'bin/NOTICE'
+    prefix.install_metafiles 'bin' # Don't put these in bin!
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
diff --git a/Library/Formula/playdar.rb b/Library/Formula/playdar.rb
index 90f9fa3c6..a254302ca 100644
--- a/Library/Formula/playdar.rb
+++ b/Library/Formula/playdar.rb
@@ -16,7 +16,7 @@ class Playdar < Formula
     File.unlink 'playdar_modules/library/priv/taglib_driver/taglib_json_reader.cpp'
 
     # otherwise playdar crashes
-    prefix.install ['ebin', 'playdar_modules', 'priv', 'etc']
+    prefix.install 'ebin', 'playdar_modules', 'priv', 'etc'
 
     inreplace 'playdarctl', 'cd `dirname $0`', "cd #{prefix}"
     inreplace 'playdarctl', 'EBIN=./ebin/', "EBIN=#{prefix}/ebin"
diff --git a/Library/Formula/plod.rb b/Library/Formula/plod.rb
index b539132e1..8ad8fb9f9 100644
--- a/Library/Formula/plod.rb
+++ b/Library/Formula/plod.rb
@@ -20,7 +20,7 @@ class Plod < Formula
     end
     man1.install "plod.man" => "plod.1"
     bin.install "plod"
-    prefix.install ['plod.el.v1', 'plod.el.v2']
+    prefix.install 'plod.el.v1', 'plod.el.v2'
     ohai "Creating #{prefix}/plodrc"
     (prefix + "plodrc").write plodrc
   end
diff --git a/Library/Formula/qi.rb b/Library/Formula/qi.rb
index b107f60a6..f641eadf8 100644
--- a/Library/Formula/qi.rb
+++ b/Library/Formula/qi.rb
@@ -20,14 +20,14 @@ class Qi < Formula
       end
 
       system "echo \"#!/bin/bash\nsbcl --core #{prefix}/Qi.core $*\" > qi"
-      prefix.install ['Lisp/Qi.core']
+      prefix.install 'Lisp/Qi.core'
     else
       cd 'Lisp' do
         system "clisp", "install.lsp"
       end
 
       system "echo \"#!/bin/bash\nclisp -M #{prefix}/Qi.mem $*\" > qi"
-      prefix.install ['Lisp/Qi.mem']
+      prefix.install 'Lisp/Qi.mem'
     end
     system "chmod 755 qi"
     bin.install ['qi']
diff --git a/Library/Formula/qtplay.rb b/Library/Formula/qtplay.rb
index aed9379e6..449b3e8a0 100644
--- a/Library/Formula/qtplay.rb
+++ b/Library/Formula/qtplay.rb
@@ -10,7 +10,6 @@ class Qtplay < Formula
     system ENV.cc, "qtplay.c", "-arch", "i386", "-framework", "QuickTime", "-framework", "Carbon", "-o", "qtplay"
     bin.install 'qtplay'
     man1.install 'qtplay.1'
-    prefix.install 'Readme.rtf'
   end
 
   def test
diff --git a/Library/Formula/rfcdiff.rb b/Library/Formula/rfcdiff.rb
index 9bf128cd4..3b8415c51 100644
--- a/Library/Formula/rfcdiff.rb
+++ b/Library/Formula/rfcdiff.rb
@@ -10,6 +10,5 @@ class Rfcdiff < Formula
 
   def install
     bin.install "rfcdiff"
-    prefix.install "todo"
   end
 end
diff --git a/Library/Formula/rfcmarkup.rb b/Library/Formula/rfcmarkup.rb
index 3d5dd470c..a0eddcffa 100644
--- a/Library/Formula/rfcmarkup.rb
+++ b/Library/Formula/rfcmarkup.rb
@@ -7,6 +7,5 @@ class Rfcmarkup < Formula
 
   def install
     bin.install "rfcmarkup"
-    prefix.install 'todo'
   end
 end
diff --git a/Library/Formula/root.rb b/Library/Formula/root.rb
index 258a1cf9f..dfa86ce5e 100644
--- a/Library/Formula/root.rb
+++ b/Library/Formula/root.rb
@@ -29,7 +29,7 @@ class Root < Formula
     system "make"
     system "make install"
 
-    prefix.install ['test'] # needed to run test suite
+    prefix.install 'test' # needed to run test suite
 
   end
 
diff --git a/Library/Formula/rsense.rb b/Library/Formula/rsense.rb
index 44e336d27..fbf91d1b8 100644
--- a/Library/Formula/rsense.rb
+++ b/Library/Formula/rsense.rb
@@ -6,9 +6,9 @@ class Rsense < Formula
   sha1 '497510e7048120af01bac619e50aa72ebd825c49'
 
   def install
-    prefix.install 'README.txt'
+    prefix.install_metafiles
     libexec.install Dir['*']
-    (libexec+'bin/rsense').chmod 0755
+    (libexec/'bin/rsense').chmod 0755
     bin.write_exec_script libexec/'bin/rsense'
   end
 
diff --git a/Library/Formula/s3sync.rb b/Library/Formula/s3sync.rb
index 1dc4b16dc..8412a7fc1 100644
--- a/Library/Formula/s3sync.rb
+++ b/Library/Formula/s3sync.rb
@@ -1,14 +1,13 @@
 require 'formula'
 
 class S3sync < Formula
+  homepage 'http://s3sync.net'
   url 'http://s3sync-s3cmd.googlecode.com/svn/trunk/', :revision => '4'
   version '1.2.6'
-  homepage 'http://s3sync.net'
 
   def install
     bin.install Dir['s3sync/*.rb']
-    prefix.install Dir['s3sync/*.txt']
-    prefix.install Dir['s3sync/*.example']
+    prefix.install Dir['s3sync/*.{example,txt}']
   end
 
   def caveats
diff --git a/Library/Formula/scalate.rb b/Library/Formula/scalate.rb
index 246bba541..12314b8fa 100644
--- a/Library/Formula/scalate.rb
+++ b/Library/Formula/scalate.rb
@@ -13,7 +13,7 @@ class Scalate < Formula
       Pathname.new(name).find { |path| path.chmod(0644) if path.file? }
     end
 
-    prefix.install %w{ license.txt readme.html }
+    prefix.install_metafiles
     libexec.install Dir['*']
     bin.write_exec_script libexec/'bin/scalate'
   end
diff --git a/Library/Formula/shakespeare.rb b/Library/Formula/shakespeare.rb
index 3721bb2b0..cd5f7fe2f 100644
--- a/Library/Formula/shakespeare.rb
+++ b/Library/Formula/shakespeare.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Shakespeare < Formula
-  url 'http://shakespearelang.sf.net/download/spl-1.2.1.tar.gz'
   homepage 'http://shakespearelang.sourceforge.net/'
+  url 'http://shakespearelang.sf.net/download/spl-1.2.1.tar.gz'
   sha1 '17adea7bbf5e1de1a29e71b19e5271f186e9698d'
 
   def install
@@ -10,6 +10,5 @@ class Shakespeare < Formula
     bin.install 'spl/bin/spl2c'
     include.install 'spl/include/spl.h'
     lib.install 'spl/lib/libspl.a'
-    prefix.install 'NEWS'   # Also include NEWS file in prefix, why not?
   end
 end
diff --git a/Library/Formula/sleepwatcher.rb b/Library/Formula/sleepwatcher.rb
index acec5b686..e7cf6618d 100644
--- a/Library/Formula/sleepwatcher.rb
+++ b/Library/Formula/sleepwatcher.rb
@@ -24,9 +24,6 @@ class Sleepwatcher < Formula
       system "make", "install", "PREFIX=#{prefix}"
     end
 
-    # Write the usage ReadMe
-    prefix.install "ReadMe.rtf"
-
     # Write the sleep/wakeup scripts
     (prefix + 'etc/sleepwatcher').install Dir["config/rc.*"]
 
diff --git a/Library/Formula/ssss.rb b/Library/Formula/ssss.rb
index 8414517ba..d513eea4b 100644
--- a/Library/Formula/ssss.rb
+++ b/Library/Formula/ssss.rb
@@ -17,7 +17,6 @@ class Ssss < Formula
 
     ENV.append 'CFLAGS', "-I#{HOMEBREW_PREFIX}/include"
     system "make"
-    prefix.install %w{ HISTORY LICENSE THANKS }
     man1.install %w{ ssss.1 }
     bin.install %w{ ssss-combine ssss-split }
   end