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

Eric Belanger eric at archlinux.org
Mon Sep 15 03:50:54 UTC 2008


    Date: Sunday, September 14, 2008 @ 23:50:54
  Author: eric
Revision: 12529

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

........
  r12130 | hugo | 2008-09-10 14:24:48 -0400 (Wed, 10 Sep 2008) | 1 line
  
  mono-zeroconf added
........
  r12274 | hugo | 2008-09-12 07:48:50 -0400 (Fri, 12 Sep 2008) | 1 line
  
  upgpkg: tomcat 5.5.26-2
........

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

----------+
 PKGBUILD |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)


Property changes on: tomcat/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /tomcat/trunk:1-7448
   + /tomcat/trunk:1-12528

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-15 03:46:30 UTC (rev 12528)
+++ extra-x86_64/PKGBUILD	2008-09-15 03:50:54 UTC (rev 12529)
@@ -2,8 +2,8 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=tomcat
-pkgver=5.5.23
-pkgrel=3
+pkgver=5.5.26
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
 url="http://tomcat.apache.org/"
@@ -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
 }




More information about the arch-commits mailing list