summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/apache-tomcat55/Makefile18
-rw-r--r--www/apache-tomcat55/PLIST4
-rw-r--r--www/apache-tomcat55/distinfo8
3 files changed, 15 insertions, 15 deletions
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index ebe442f97f5..9f592abe05f 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/04/25 06:14:45 obache Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2007/11/22 21:19:13 ghen Exp $
DISTNAME= apache-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
@@ -9,7 +9,7 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://tomcat.apache.org/
COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server
-TOMCAT_VERSION= 5.5.23
+TOMCAT_VERSION= 5.5.25
USE_JAVA= run
# This needs java 1.5 or higher.
@@ -68,13 +68,13 @@ do-install:
.endfor
${INSTALL_DATA_DIR} ${TOMCAT_LIB}
${RM} -rf ${WRKSRC}/temp/*
- @(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \
- ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \
- ${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
- | ${XARGS} ${CHMOD} a+rx; \
- ${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx; \
- ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | \
- ${XARGS} ${RM} -f)
+ @cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}
+
+ ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f
+ ${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+ ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+ ${FIND} ${TOMCAT_LIB} -type f -name \*.sh -print | \
+ ${XARGS} ${CHMOD} ${BINMODE}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache-tomcat55/PLIST b/www/apache-tomcat55/PLIST
index e2078e44b25..d0e1270a421 100644
--- a/www/apache-tomcat55/PLIST
+++ b/www/apache-tomcat55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/04/25 06:14:45 obache Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2007/11/22 21:19:13 ghen Exp $
share/examples/rc.d/tomcat
tomcat/LICENSE
tomcat/NOTICE
@@ -41,7 +41,7 @@ tomcat/server/lib/catalina-cluster.jar
tomcat/server/lib/catalina-optional.jar
tomcat/server/lib/catalina-storeconfig.jar
tomcat/server/lib/catalina.jar
-tomcat/server/lib/commons-modeler-2.0.jar
+tomcat/server/lib/commons-modeler-2.0.1.jar
tomcat/server/lib/servlets-cgi.renametojar
tomcat/server/lib/servlets-default.jar
tomcat/server/lib/servlets-invoker.jar
diff --git a/www/apache-tomcat55/distinfo b/www/apache-tomcat55/distinfo
index ec2a765c32a..8a176186765 100644
--- a/www/apache-tomcat55/distinfo
+++ b/www/apache-tomcat55/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/04/25 06:14:45 obache Exp $
+$NetBSD: distinfo,v 1.4.4.1 2007/11/22 21:19:14 ghen Exp $
-SHA1 (apache-tomcat-5.5.23.tar.gz) = 81a095ccd3c6b03a882b8b91bdfe46a32fa373b5
-RMD160 (apache-tomcat-5.5.23.tar.gz) = 9173e12cf70d741c8b3b73812a3f9c49c7147417
-Size (apache-tomcat-5.5.23.tar.gz) = 5977561 bytes
+SHA1 (apache-tomcat-5.5.25.tar.gz) = a0b45be80eeee7373d5e122245aa7bdc4f56b601
+RMD160 (apache-tomcat-5.5.25.tar.gz) = 12968c99720f8241b1bc9296c31b8099498075a5
+Size (apache-tomcat-5.5.25.tar.gz) = 6034852 bytes