3 files changed, 9 insertions, 6 deletions
diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild
index f4a0fbf3f0..42656cebe8 100644
--- a/system/apache-tomcat/apache-tomcat.SlackBuild
+++ b/system/apache-tomcat/apache-tomcat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for apache-tomcat
 
-# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2010  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-tomcat
-VERSION=6.0.26
+VERSION=7.0.11
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -68,6 +68,8 @@ mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \
 
 rm -f bin/*.exe bin/*.bat bin/*.tar.gz bin/commons-daemon.jar
 cp -rf bin lib $PKG/usr/share/tomcat/
+mv $PKG/usr/share/tomcat/bin/tomcat-juli.jar \
+  $PKG/usr/share/tomcat/lib/
 
 cp -f conf/* $PKG/etc/tomcat/
 cp -f $CWD/tomcat-java.conf $PKG/etc/tomcat/tomcat-java.conf
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info
index d45e2485d8..5665ffe04e 100644
--- a/system/apache-tomcat/apache-tomcat.info
+++ b/system/apache-tomcat/apache-tomcat.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-tomcat"
-VERSION="6.0.26"
+VERSION="7.0.11"
 HOMEPAGE="http://tomcat.apache.org/"
-DOWNLOAD="http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.zip"
-MD5SUM="6bf77c1c820a0e7c1a1fb6463c0a2a1d"
+DOWNLOAD="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.11/bin/apache-tomcat-7.0.11.zip"
+MD5SUM="2b2181beaf7dd246364e2477a34e2677"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat
index e82c6347c1..83ca5ccc9b 100644
--- a/system/apache-tomcat/rc.tomcat
+++ b/system/apache-tomcat/rc.tomcat
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Start/stop/restart apache-tomcat.
-# $Id: rc.apache-tomcat,v 1.1.3 2010/02/03
+# $Id: rc.apache-tomcat,v 1.1.4 2011/04/01
 # Authors: Heinz Wiesinger <pprkut@liwjatan.at>, Vincent Batts <vbatts@hashbangbash.com>
 # ---------------------------------------------------------------------------
 
@@ -27,6 +27,7 @@ tomcat_start() {
   if [ -e "$PIDFILE" ]; then
     echo "already running!"
   else
+    unset DISPLAY
     cd /var/lib/tomcat
       $TOMCAT_CMD
     echo "done!"