From ac0f605d1292afbd30d6cca68fd11640b5540c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Mart=C3=ADnez?= <xosemp@gmail.com>
Date: Mon, 23 May 2011 17:04:18 +0200
Subject: [PATCH] Tomcat 7.0.14

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Formula/tomcat.rb | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/Formula/tomcat.rb b/Formula/tomcat.rb
index 928eec198db..0b529d6b3c7 100644
--- a/Formula/tomcat.rb
+++ b/Formula/tomcat.rb
@@ -1,28 +1,22 @@
 require 'formula'
 
 class Tomcat < Formula
-  url 'http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.6/bin/apache-tomcat-7.0.6.tar.gz'
+  url 'http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.14/bin/apache-tomcat-7.0.14.tar.gz'
   homepage 'http://tomcat.apache.org/'
-  md5 '1c54578e2e695212ab3ed75170930df4'
+  md5 '6a4f1b7285b7366250c4e09307594451'
 
   skip_clean :all
 
   def install
-    rm_rf Dir['bin/*.{cmd,bat]}']
+    # Remove Windows scripts
+    rm_rf Dir['bin/*.bat']
+
+    # Install files
+    prefix.install %w{ NOTICE LICENSE RELEASE-NOTES RUNNING.txt }
     libexec.install Dir['*']
-    (libexec+'logs').mkpath
+
+    # Symlink binaries
     bin.mkpath
-    Dir["#{libexec}/bin/*.sh"].each { |f| ln_s f, bin }
-  end
-
-  def caveats; <<-EOS.undent
-    Note: Some of the support scripts used by Tomcat have very generic names.
-    These are likely to conflict with support scripts used by other Java-based
-    server software.
-
-    You may want to `brew unlink tomcat` and add:
-      #{bin}
-    to your PATH instead.
-    EOS
+    ln_s "#{libexec}/bin/catalina.sh", bin+"catalina"
   end
 end