[arch-commits] Commit in tomcat/repos (extra-i686 extra-i686/PKGBUILD)

[Hugo Doria]

    Date: Wednesday, September 10, 2008 @ 14:41:53
  Author: hugo
Revision: 12133

Merged revisions 7448,12130 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/tomcat/trunk

........
  r7448 | eric | 2008-08-02 02:00:57 -0300 (Sat, 02 Aug 2008) | 2 lines
  
  upgpkg: tomcat 5.5.23-3
      added x86_64 arch tag
........
  r12130 | hugo | 2008-09-10 15:24:48 -0300 (Wed, 10 Sep 2008) | 1 line
  
  mono-zeroconf added
........

Modified:
  tomcat/repos/extra-i686/	(properties)
  tomcat/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)


Property changes on: tomcat/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /tomcat/trunk:1-7434
   + /tomcat/trunk:1-12132

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-10 18:26:51 UTC (rev 12132)
+++ extra-i686/PKGBUILD	2008-09-10 18:41:53 UTC (rev 12133)
@@ -2,9 +2,9 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=tomcat
-pkgver=5.5.23
-pkgrel=3
-arch=('i686')
+pkgver=5.5.26
+pkgrel=1
+arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
 url="http://tomcat.apache.org/"
 license=('Apache')
@@ -13,14 +13,14 @@
 backup=(opt/tomcat/conf/server.xml opt/tomcat/conf/tomcat-users.xml \
         etc/conf.d/tomcat)
 install=tomcat.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-5/v$pkgver/bin/apache-tomcat-$pkgver.tar.gz \
+source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz \
         tomcat tomcat.conf.d)
-md5sums=('7a4cc2e00c7d2c9d9c4437ede337f832' 'c93bad359c8d2ffd6b31947a81d29fff'\
+md5sums=('d7d1ac1505a295ca304dc4e8b5bafdeb' 'c93bad359c8d2ffd6b31947a81d29fff'\
          '4da263803378b208144183c9f7df66a7')
 
 build() {
   # build jsvc
-  cd $startdir/src/apache-tomcat-$pkgver/bin
+  cd ${srcdir}/apache-tomcat-${pkgver}/bin
   tar xzf jsvc.tar.gz
   cd jsvc-src
   sh configure --with-java=/opt/java
@@ -28,16 +28,16 @@
   cp jsvc ..
   
   # get rid of some cruft
-  cd $startdir/src/apache-tomcat-$pkgver
+  cd ${srcdir}/apache-tomcat-${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 $startdir/pkg/opt/tomcat
-  cp -R * $startdir/pkg/opt/tomcat
-  install -D -m755 $startdir/src/tomcat $startdir/pkg/etc/rc.d/tomcat
-  install -D -m755 $startdir/src/tomcat.conf.d $startdir/pkg/etc/conf.d/tomcat
-  chgrp -R 66 $startdir/pkg/opt/tomcat/conf $startdir/pkg/opt/tomcat/work
-  chmod 0660 $startdir/pkg/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 $startdir/pkg/opt/tomcat/conf $startdir/pkg/opt/tomcat/work
+  mkdir -p ${pkgdir}/opt/tomcat
+  cp -R * ${pkgdir}/opt/tomcat
+  install -D -m755 ${srcdir}tomcat ${pkgdir}/etc/rc.d/tomcat
+  install -D -m755 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
+  chgrp -R 66 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work
+  chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
+  chmod 775 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work
 }