From ccb9d72bbf1ee4f7a54113eac76a16b0b5014869 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 27 Sep 2011 23:14:33 +0000
Subject: Tue Sep 27 23:14:33 UTC 2011

---
 extra/tomcat/PKGBUILD | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'extra/tomcat/PKGBUILD')

diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
index b58268347..8875fed4f 100644
--- a/extra/tomcat/PKGBUILD
+++ b/extra/tomcat/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117492 2011-04-04 07:40:54Z guillaume $
+# $Id: PKGBUILD 138508 2011-09-26 12:20:21Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 pkgname=tomcat
-pkgver=5.5.33
+pkgver=5.5.34
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
+pkgdesc="Servlet-2.4/JSP-2.0 Container"
 url="http://tomcat.apache.org/"
 license=('APACHE')
 depends=('java-environment')
@@ -15,7 +15,7 @@ install=tomcat.install
 source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
 	'tomcat'
 	'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
+md5sums=('d09a09bc84409510574a673d35939f16'
          '20e6a8e89a148e2b0ac81ca03ceea6b1'
          '368322d8a51ce20cc5dbdb505706a16a')
 
@@ -24,12 +24,15 @@ build() {
   # build jsvc
   cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
   tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.5-native-src/unix
+  cd commons-daemon-1.0.7-native-src/unix
   sh configure --with-java=/usr/lib/jvm/java-6-openjdk
   make clean
   make
   cp jsvc ../..
+}
 
+package() {
+  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
   # get rid of some cruft
   cd ${srcdir}/apache-${pkgname}-${pkgver}
   rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
@@ -40,7 +43,7 @@ build() {
   cp -R * ${pkgdir}/opt/tomcat
   install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
   install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
-  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
   chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
 }
-- 
cgit v1.2.3-54-g00ecf