summaryrefslogtreecommitdiff
path: root/extra/tomcat/PKGBUILD
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-07 17:33:04 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-07 17:33:04 -0300
commit2302f1d28510fadb2dcfa119f28ed28f164845bf (patch)
treee7040e1c743f46bc60a7844275516e4404f6ac30 /extra/tomcat/PKGBUILD
parent2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff)
parent5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/fotoxx/PKGBUILD community/gtkdialog/PKGBUILD community/hubbub/PKGBUILD community/libgdamm/PKGBUILD community/libparserutils/PKGBUILD community/mingw32-binutils/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-gcc/PKGBUILD community/mtpaint/PKGBUILD community/netsurf/PKGBUILD community/patchage/PKGBUILD community/qgo/PKGBUILD community/tomoyo-tools/PKGBUILD community/tre/PKGBUILD community/virtualbox/PKGBUILD core/net-tools/PKGBUILD core/openldap/PKGBUILD extra/epiphany/PKGBUILD extra/evince/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/exiv2/PKGBUILD extra/folks/PKGBUILD extra/gimp-ufraw/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-power-manager/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/gnome-python-extras/PKGBUILD extra/gvfs/PKGBUILD extra/jack/PKGBUILD extra/kdelibs/PKGBUILD extra/kdepim/PKGBUILD extra/koffice/PKGBUILD extra/libreoffice/PKGBUILD extra/libwebkit/PKGBUILD extra/mutter/PKGBUILD extra/nautilus/PKGBUILD extra/openmpi/PKGBUILD extra/pavucontrol/PKGBUILD extra/php/PKGBUILD extra/pidgin/PKGBUILD extra/postgresql/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject2/PKGBUILD extra/swt/PKGBUILD extra/tomcat/PKGBUILD extra/totem/PKGBUILD extra/vigra/PKGBUILD extra/vte/PKGBUILD extra/xulrunner/PKGBUILD kde-unstable/calligra/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib/lib32-atk/PKGBUILD multilib/lib32-gdk-pixbuf2/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-jack/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-pango/PKGBUILD multilib/wine/PKGBUILD social/miniupnpc/PKGBUILD testing/icedtea-web-java7/PKGBUILD testing/sqlite3/PKGBUILD ~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/tomcat/PKGBUILD')
-rw-r--r--extra/tomcat/PKGBUILD17
1 files changed, 10 insertions, 7 deletions
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
index 273e65ae2..a1bba1b67 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' 'mips64el')
-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}
}