caveat and other cleanups

Formula/android-sdk.rb

@@ -67,7 +67,7 @@ class AndroidSdk < Formula
     updates. If you want to try and fix this then see the comment in this formula.
 
     You may need to add the following to your .bashrc:
-      export ANDROID_SDK_ROOT=#{prefix}
+      export ANDROID_SDK_ROOT=#{opt_prefix}
     EOS
   end
 

Formula/aplus.rb

@@ -31,13 +31,10 @@ class Aplus < Formula
     system "make", "install"
   end
 
-  def caveats
-    return <<-EOS.undent
+  def caveats; <<-EOS.undent
     This package contains a custom APL font; it doesn't display APL characters
     using the usual Unicode codepoints.  Install it by running
-
-    open #{prefix}/fonts/TrueType/KAPL.TTF
-
+      open #{opt_prefix}/fonts/TrueType/KAPL.TTF
     and clicking on the "Install Font" button.
     EOS
   end

Formula/autoenv.rb

@@ -13,10 +13,10 @@ class Autoenv < Formula
 
   def caveats; <<-EOS.undent
       Autoenv was installed to:
-       #{prefix}
+       #{opt_prefix}
 
       To finish the installation, source activate.sh in your shell:
-          source #{prefix}/activate.sh
+        source #{opt_prefix}/activate.sh
     EOS
   end
 end

Formula/autopsy.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Autopsy < Formula
-  url 'http://downloads.sourceforge.net/project/autopsy/autopsy/2.24/autopsy-2.24.tar.gz'
   homepage 'http://www.sleuthkit.org/autopsy/index.php'
+  url 'http://downloads.sourceforge.net/project/autopsy/autopsy/2.24/autopsy-2.24.tar.gz'
   sha1 '084a6554a1494f5f34df4a5a3635c8d3dc3b8822'
 
   depends_on 'sleuthkit'
@@ -61,9 +61,8 @@ class Autopsy < Formula
   end
 
   def caveats; <<-EOS.undent
-    To start autopsy:
-      autopsy
-    By default, the evidence locker is in #{var}/lib/autopsy
+    By default, the evidence locker is in:
+      #{var}/lib/autopsy
     EOS
   end
 end

Formula/aws-iam-tools.rb

@@ -34,7 +34,7 @@ class AwsIamTools < AmazonWebServicesFormula
       * On Zsh, add them to `~/.zprofile` instead.
 
     export JAVA_HOME="$(/usr/libexec/java_home)"
-    export AWS_IAM_HOME="#{prefix}/jars"
+    export AWS_IAM_HOME="#{opt_prefix}/jars"
     export AWS_CREDENTIAL_FILE=$HOME/.aws-credentials-master
     EOS
   end

Formula/bash-completion.rb

@@ -20,7 +20,6 @@ class BashCompletion < Formula
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
-
     unless (compdir/'brew_bash_completion.sh').exist?
       compdir.install_symlink HOMEBREW_CONTRIB/'brew_bash_completion.sh'
     end

Formula/cantera.rb

@@ -57,7 +57,7 @@ class Cantera < Formula
 
   def caveats; <<-EOS.undent
     The license, demos, tutorials, data, etc. can be found in:
-      #{prefix}
+      #{opt_prefix}
 
     Try the following in python to find the equilibrium composition of a
     stoichiometric methane/air mixture at 1000 K and 1 atm:

Formula/coreutils.rb

@@ -34,12 +34,12 @@ class Coreutils < Formula
     If you really need to use these commands with their normal names, you
     can add a "gnubin" directory to your PATH from your bashrc like:
 
-        PATH="$(brew --prefix coreutils)/libexec/gnubin:$PATH"
+        PATH="#{opt_prefix}/libexec/gnubin:$PATH"
 
     Additionally, you can access their man pages with normal names if you add
     the "gnuman" directory to your MANPATH from your bashrc as well:
 
-        MANPATH="$(brew --prefix coreutils)/libexec/gnuman:$MANPATH"
+        MANPATH="#{opt_prefix}/libexec/gnuman:$MANPATH"
 
     EOS
   end

Formula/cpansearch.rb

@@ -16,7 +16,7 @@ class Cpansearch < Formula
 
   def caveats; <<-EOS.undent
     For usage instructions:
-        more #{prefix}/README.md
+        more #{opt_prefix}/README.md
     EOS
   end
 end

Formula/cppcheck.rb

@@ -48,9 +48,9 @@ class Cppcheck < Formula
       #{bin}
 
     To link the application to a normal Mac OS X location:
-        brew linkapps
+      brew linkapps
     or:
-        ln -s #{bin}/cppcheck-gui.app /Applications
+      ln -s #{bin}/cppcheck-gui.app /Applications
     EOS
   end
 end

Formula/csmith.rb

@@ -15,10 +15,9 @@ class Csmith < Formula
     runtime.install Dir['runtime/*.h']
   end
 
-  def caveats
-    <<-EOS.undent
-      It is recommended that you set the environment variable 'CSMITH_PATH' to
-          #{include}/csmith-#{version}
+  def caveats; <<-EOS.undent
+    It is recommended that you set the environment variable 'CSMITH_PATH' to
+      #{include}/csmith-#{version}
     EOS
   end
 end

Formula/cups-pdf.rb

@@ -1,9 +1,9 @@
 require 'formula'
 
 class CupsPdf < Formula
+  homepage 'http://www.cups-pdf.de/'
   url 'http://www.cups-pdf.de/src/cups-pdf_2.6.1.tar.gz'
   sha1 '6806f0004dfed5216625ab60cfe307ded23c2f6a'
-  homepage 'http://www.cups-pdf.de/'
 
   # Patch derived from MacPorts.
   def patches; DATA; end
@@ -17,23 +17,23 @@ class CupsPdf < Formula
   end
 
   def caveats; <<-EOF.undent
-      In order to use cups-pdf with the Mac OS X printing system change the file
-      permissions, symlink the necessary files to their System location and
-      have cupsd re-read its configuration using:
+    In order to use cups-pdf with the Mac OS X printing system change the file
+    permissions, symlink the necessary files to their System location and
+    have cupsd re-read its configuration using:
 
-      chmod 0700 #{lib}/cups/backend/cups-pdf
-      sudo chown root #{lib}/cups/backend/cups-pdf
-      sudo ln -sf #{etc}/cups/cups-pdf.conf /etc/cups/cups-pdf.conf
-      sudo ln -sf #{lib}/cups/backend/cups-pdf /usr/libexec/cups/backend/cups-pdf
-      sudo chmod -h 0700 /usr/libexec/cups/backend/cups-pdf
-      sudo ln -sf #{share}/cups/model/CUPS-PDF.ppd /usr/share/cups/model/CUPS-PDF.ppd
+    chmod 0700 #{lib}/cups/backend/cups-pdf
+    sudo chown root #{lib}/cups/backend/cups-pdf
+    sudo ln -sf #{etc}/cups/cups-pdf.conf /etc/cups/cups-pdf.conf
+    sudo ln -sf #{lib}/cups/backend/cups-pdf /usr/libexec/cups/backend/cups-pdf
+    sudo chmod -h 0700 /usr/libexec/cups/backend/cups-pdf
+    sudo ln -sf #{share}/cups/model/CUPS-PDF.ppd /usr/share/cups/model/CUPS-PDF.ppd
 
-      sudo mkdir -p /var/spool/cups-pdf/${USER}
-      sudo chown ${USER}:staff /var/spool/cups-pdf/${USER}
-      ln -s /var/spool/cups-pdf/${USER} ${HOME}/Documents/cups-pdf
-      sudo killall -HUP cupsd
+    sudo mkdir -p /var/spool/cups-pdf/${USER}
+    sudo chown ${USER}:staff /var/spool/cups-pdf/${USER}
+    ln -s /var/spool/cups-pdf/${USER} ${HOME}/Documents/cups-pdf
+    sudo killall -HUP cupsd
 
-      NOTE: When uninstalling cups-pdf these symlinks need to be removed manually.
+    NOTE: When uninstalling cups-pdf these symlinks need to be removed manually.
     EOF
   end
 end

Formula/cvs2svn.rb

@@ -21,8 +21,8 @@ class PythonWithGdbm < Requirement
 end
 
 class Cvs2svn < Formula
-  url 'http://trac.macports.org/export/70472/distfiles/cvs2svn/cvs2svn-2.3.0.tar.gz'
   homepage 'http://cvs2svn.tigris.org/'
+  url 'http://trac.macports.org/export/70472/distfiles/cvs2svn/cvs2svn-2.3.0.tar.gz'
   sha1 '545237805ddb241054ba40b105b9c29b705539b8'
 
   depends_on PythonWithGdbm.new
@@ -35,17 +35,16 @@ class Cvs2svn < Formula
       cvs2bzr-example.options cvs2git-example.options cvs2hg-example.options
       cvs2svn-example.options contrib ]
 
-    doc.install Dir['doc/*']
-    doc.install Dir['www/*']
+    doc.install Dir['{doc,www}/*']
   end
 
-  def caveats; <<-EOF
+  def caveats; <<-EOS.undent
     NOTE: man pages have been installed, but for better documentation see:
       #{HOMEBREW_PREFIX}/share/doc/cvs2svn/cvs2svn.html
     or http://cvs2svn.tigris.org/cvs2svn.html.
 
     Contrib scripts and example options files are installed in:
-      #{prefix}
-    EOF
+      #{opt_prefix}
+    EOS
   end
 end

Formula/denyhosts.rb

@@ -60,20 +60,18 @@ class Denyhosts < Formula
     EOS
   end
 
-  def caveats
-    <<-EOS.undent
-      Unless it exists already, a denyhosts.cfg file has been written to:
-        #{etc}/denyhosts.cfg
+  def caveats; <<-EOS.undent
+    Unless it exists already, a denyhosts.cfg file has been written to:
+      #{etc}/denyhosts.cfg
 
-      All DenyHosts scripts will load this file by default unless told to use
-      a different one.
-
-      A launchctl plist has been created that will run DenyHosts to update
-      /etc/hosts.deny every 10 minutes. It will need to be run by the user that
-      owns /etc/hosts.deny, usually root, and can be set to load at startup
-      via:
-        sudo cp #{plist_path} /Library/LaunchDaemons/
+    All DenyHosts scripts will load this file by default unless told to use
+    a different one.
 
+    A launchctl plist has been created that will run DenyHosts to update
+    /etc/hosts.deny every 10 minutes. It will need to be run by the user that
+    owns /etc/hosts.deny, usually root, and can be set to load at startup
+    via:
+      sudo cp #{plist_path} /Library/LaunchDaemons/
     EOS
   end
 end

Formula/disco.rb

@@ -42,7 +42,7 @@ class Disco < Formula
         ln -s #{etc}/disco/settings.py ~/.disco
 
     To run the discodex server for development:
-        cd #{prefix}/contrib/discodex/www
+        cd #{opt_prefix}/contrib/discodex/www
         ./manage.py runserver 8080
 
     The DDFS_*_REPLICA settings have been set to 1 assuming a single-machine install.

Formula/djmount.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Djmount < Formula
-  url 'http://downloads.sourceforge.net/project/djmount/djmount/0.71/djmount-0.71.tar.gz'
   homepage 'http://djmount.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/djmount/djmount/0.71/djmount-0.71.tar.gz'
   sha1 '527d4603d85b7fb86dc97d326b78c97bdcc4d687'
 
   depends_on 'libupnp'
@@ -25,10 +25,9 @@ class Djmount < Formula
     system "make install"
   end
 
-  def caveats
-    <<-EOS.undent
-      Make sure to follow the directions given by `brew info fuse4x-kext`
-      before trying to use a FUSE-based filesystem.
+  def caveats; <<-EOS.undent
+    Make sure to follow the directions given by `brew info fuse4x-kext`
+    before trying to use a FUSE-based filesystem.
     EOS
   end
 end

Formula/djview4.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Djview4 < Formula
-  url 'http://sourceforge.net/projects/djvu/files/DjView/4.8/djview-4.8.tar.gz'
   homepage 'http://djvu.sourceforge.net/djview4.html'
+  url 'http://sourceforge.net/projects/djvu/files/DjView/4.8/djview-4.8.tar.gz'
   sha1 '266d207afb63a1ee63eed054190bf88888fda572'
 
   depends_on 'pkg-config' => :build
@@ -24,14 +24,14 @@ class Djview4 < Formula
     system "make", "CC=#{ENV.cc}", "CXX=#{ENV.cxx}"
 
     # From the djview4.8 README:
-    #     Note3: Do not use command "make install".
-    #     Simply copy the application bundle where you want it.
+    # Note3: Do not use command "make install".
+    # Simply copy the application bundle where you want it.
     prefix.install 'src/djview.app'
   end
 
   def caveats; <<-EOS
     djview.app was installed in:
-      #{prefix}
+      #{opt_prefix}
 
     To symlink into ~/Applications, you can do:
       brew linkapps

Formula/dnsmasq.rb

@@ -35,7 +35,7 @@ class Dnsmasq < Formula
     To configure dnsmasq, copy the example configuration to #{etc}/dnsmasq.conf
     and edit to taste.
 
-      cp #{prefix}/dnsmasq.conf.example #{etc}/dnsmasq.conf
+      cp #{opt_prefix}/dnsmasq.conf.example #{etc}/dnsmasq.conf
 
     To load dnsmasq automatically on startup, install and load the provided launchd
     item as follows:

Formula/dwm.rb

@@ -1,9 +1,10 @@
 require 'formula'
 
 class Dwm < Formula
-  url 'http://dl.suckless.org/dwm/dwm-6.0.tar.gz'
   homepage 'http://dwm.suckless.org/'
+  url 'http://dl.suckless.org/dwm/dwm-6.0.tar.gz'
   sha1 '35346f873a27f219ae266594b3690407f95d06ef'
+
   head 'http://hg.suckless.org/dwm'
 
   depends_on :x11
@@ -18,8 +19,7 @@ class Dwm < Formula
     system "make", "PREFIX=#{prefix}", "install"
   end
 
-  def caveats
-    <<-EOS
+  def caveats; <<-EOS.undent
     In order to use the Mac OS X command key for dwm commands,
     change the X11 keyboard modifier map using xmodmap (1).
 

Formula/dylibbundler.rb

@@ -15,9 +15,6 @@ class Dylibbundler < Formula
   end
 
   def caveats; <<-EOS.undent
-    Documentation at:
-      #{homepage}
-
     Usage example:
       dylibbundler -od -b -x ./HelloWorld.app/Contents/MacOS/helloworld  -d ./HelloWorld.app/Contents/libs/
     EOS

Formula/encfs.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Encfs < Formula
-  url 'http://encfs.googlecode.com/files/encfs-1.7.4.tgz'
   homepage 'http://www.arg0.net/encfs'
+  url 'http://encfs.googlecode.com/files/encfs-1.7.4.tgz'
   sha1 '3d824ba188dbaabdc9e36621afb72c651e6e2945'
 
   depends_on 'pkg-config' => :build
@@ -11,13 +11,6 @@ class Encfs < Formula
   depends_on 'rlog'
   depends_on 'fuse4x'
 
-  def caveats
-    <<-EOS.undent
-      Make sure to follow the directions given by `brew info fuse4x-kext`
-      before trying to use a FUSE-based filesystem.
-    EOS
-  end
-
   def install
     inreplace "configure", "-lfuse", "-lfuse4x"
     system "./configure", "--disable-dependency-tracking",
@@ -26,4 +19,10 @@ class Encfs < Formula
     system "make"
     system "make install"
   end
+
+  def caveats; <<-EOS.undent
+    Make sure to follow the directions given by `brew info fuse4x-kext`
+    before trying to use a FUSE-based filesystem.
+    EOS
+  end
 end

Formula/expat.rb

@@ -1,8 +1,8 @@
 require 'formula'
 
 class Expat < Formula
-  url 'http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz'
   homepage 'http://expat.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz'
   sha1 'b08197d146930a5543a7b99e871cba3da614f6f0'
 
   def install

Formula/flume-ng.rb

@@ -16,8 +16,7 @@ class FlumeNg < Formula
     EOS
   end
 
-  def caveats
-    <<-EOS.undent
+  def caveats; <<-EOS.undent
     See https://cwiki.apache.org/FLUME/getting-started.html for example configurations.
     Your flume config dir is #{libexec}/conf/
 

Formula/fontforge.rb

@@ -113,7 +113,7 @@ class Fontforge < Formula
       To install the Mac OS X wrapper application run:
         brew linkapps
       or:
-        ln -s #{prefix}/FontForge.app /Applications
+        ln -s #{opt_prefix}/FontForge.app /Applications
     EOS
 
     python_caveats = <<-EOS.undent

Formula/fping.rb

@@ -8,15 +8,14 @@ class Fping < Formula
   head 'https://github.com/schweikert/fping.git'
 
   def install
-    system './configure', "--prefix=#{prefix}", '--disable-dependency-tracking'
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 
   def caveats; <<-EOS.undent
     fping can only be run by root by default so either use sudo to run fping or
         setuid root #{sbin}/fping
-
     EOS
   end
-
 end

Formula/funcoeszz.rb

@@ -11,7 +11,7 @@ class Funcoeszz < Formula
 
   def caveats; <<-EOS.undent
     To use this software add to your profile:
-      source #{prefix}/funcoeszz-10.12.sh
+      source #{opt_prefix}/funcoeszz-10.12.sh
     EOS
   end
 end

Formula/gdal-grass.rb

@@ -23,13 +23,12 @@ class GdalGrass < Formula
     system "make install"
   end
 
-  def caveats
-    caveats = <<-EOS
-This formula provides a plugin that allows GDAL and OGR to access geospatial
-data stored using the GRASS vector and raster formats. In order to use the
-plugin, you will need to add the following path to the GDAL_DRIVER_PATH
-enviroment variable:
-    #{HOMEBREW_PREFIX}/lib/gdalplugins
+  def caveats; <<-EOS.undent
+    This formula provides a plugin that allows GDAL and OGR to access geospatial
+    data stored using the GRASS vector and raster formats. In order to use the
+    plugin, you will need to add the following path to the GDAL_DRIVER_PATH
+    enviroment variable:
+      #{HOMEBREW_PREFIX}/lib/gdalplugins
     EOS
   end
 end

Formula/geoserver.rb

@@ -18,7 +18,7 @@ class Geoserver < Formula
   end
 
   def caveats; <<-EOS.undent
-      To start geoserver
+      To start geoserver:
         geoserver path/to/data/dir
 
       See the Geoserver homepage for more setup information:

Formula/gnome-doc-utils.rb

@@ -40,10 +40,10 @@ class GnomeDocUtils < Formula
   end
 
   def caveats; <<-EOS.undent
-  Gnome-doc-utils requires libxml2 to be compiled
-  with the python modules enabled, to do so:
-    $ brew install libxml2 --with-python
-  EOS
+    Gnome-doc-utils requires libxml2 to be compiled
+    with the python modules enabled, to do so:
+      $ brew install libxml2 --with-python
+    EOS
   end
 end
 

Formula/griffon.rb

@@ -14,7 +14,7 @@ class Griffon < Formula
   end
 
   def caveats; <<-EOS.undent
-    You should set the environment variable GRIFFON_HOME to
+    You should set the environment variable GRIFFON_HOME to:
       #{libexec}
     EOS
   end