[arch-commits] Commit in tomcat/trunk (PKGBUILD)

[Ionut Biru]

    Date: Saturday, July 31, 2010 @ 06:31:30
  Author: ibiru
Revision: 86383

upgpkg: tomcat 5.5.30-1 update to 5.5.30

Modified:
  tomcat/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-30 23:07:27 UTC (rev 86382)
+++ PKGBUILD	2010-07-31 10:31:30 UTC (rev 86383)
@@ -1,8 +1,8 @@
 # $Id$
 # Contributor: Hugo Doria <hugo at archlinux.org>
-
+# Contributor: Guillaume ALAUX <guillaume at alaux dot net>
 pkgname=tomcat
-pkgver=5.5.29
+pkgver=5.5.30
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
@@ -15,7 +15,7 @@
 source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
 	'tomcat'
 	'tomcat.conf.d')
-md5sums=('228496a9cfe3aaa3b7e79386ccd9380a'
+md5sums=('661dd3fbc25249e9ceb86652eb6a4f07'
          '20e6a8e89a148e2b0ac81ca03ceea6b1'
          '368322d8a51ce20cc5dbdb505706a16a')
 
@@ -23,17 +23,18 @@
   unset LDFLAGS
   # build jsvc
   cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  tar xzf jsvc.tar.gz
-  cd jsvc-src
+  tar xzf commons-daemon-native.tar.gz
+  cd commons-daemon-1.0.2-native-src/unix
   sh configure --with-java=/usr/lib/jvm/java-6-openjdk
+  make clean
   make || return 1
-  cp jsvc ..
-  
+  cp jsvc ../..
+
   # get rid of some cruft
   cd ${srcdir}/apache-${pkgname}-${pkgver}
   rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
   rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
-  
+
   # install everything
   mkdir -p ${pkgdir}/opt/tomcat
   cp -R * ${pkgdir}/opt/tomcat