enable ap2-jk

4 files changed, 13 insertions, 13 deletions

diff --git a/www/Makefile b/www/Makefile
index 0f5d5138c4a..8788056624c 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.463 2006/07/02 14:35:04 joerg Exp $
+# $NetBSD: Makefile,v 1.464 2006/07/22 19:43:55 abs Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -44,6 +44,7 @@ SUBDIR+=	ap2-auth-pgsql
 SUBDIR+=	ap2-bw
 SUBDIR+=	ap2-chroot
 SUBDIR+=	ap2-fastcgi
+SUBDIR+=	ap2-jk
 SUBDIR+=	ap2-perl
 SUBDIR+=	ap2-python
 SUBDIR+=	ap2-ruby
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index 1af6d12e52a..f8c4a3a17bc 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/07/07 03:12:19 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2006/07/22 19:43:55 abs Exp $
 
 DISTNAME=       apache-tomcat-${TOMCAT_VERSION}
-PKGREVISION=	2
 CATEGORIES=	www java
 # The list of sites to download is generated by an apache website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -11,7 +10,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.14
+TOMCAT_VERSION=	5.5.17
 
 USE_JAVA=	run
 # This needs java 1.5 or higher.
diff --git a/www/apache-tomcat55/PLIST b/www/apache-tomcat55/PLIST
index dbcb80cf05d..888c28d314c 100644
--- a/www/apache-tomcat55/PLIST
+++ b/www/apache-tomcat55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:43:55 abs Exp $
 share/examples/rc.d/tomcat
 tomcat/LICENSE
 tomcat/NOTICE
@@ -57,11 +57,11 @@ tomcat/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar
 tomcat/server/webapps/host-manager/WEB-INF/web.xml
 tomcat/server/webapps/host-manager/host-manager.xml
 tomcat/server/webapps/host-manager/images/add.gif
+tomcat/server/webapps/host-manager/images/asf-logo.gif
 tomcat/server/webapps/host-manager/images/code.gif
 tomcat/server/webapps/host-manager/images/design.gif
 tomcat/server/webapps/host-manager/images/docs.gif
 tomcat/server/webapps/host-manager/images/fix.gif
-tomcat/server/webapps/host-manager/images/jakarta-logo.gif
 tomcat/server/webapps/host-manager/images/tomcat.gif
 tomcat/server/webapps/host-manager/images/update.gif
 tomcat/server/webapps/host-manager/images/void.gif
@@ -71,11 +71,11 @@ tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.0.jar
 tomcat/server/webapps/manager/WEB-INF/web.xml
 tomcat/server/webapps/manager/html-manager-howto.html
 tomcat/server/webapps/manager/images/add.gif
+tomcat/server/webapps/manager/images/asf-logo.gif
 tomcat/server/webapps/manager/images/code.gif
 tomcat/server/webapps/manager/images/design.gif
 tomcat/server/webapps/manager/images/docs.gif
 tomcat/server/webapps/manager/images/fix.gif
-tomcat/server/webapps/manager/images/jakarta-logo.gif
 tomcat/server/webapps/manager/images/tomcat.gif
 tomcat/server/webapps/manager/images/update.gif
 tomcat/server/webapps/manager/images/void.gif
@@ -93,9 +93,9 @@ tomcat/webapps/ROOT/RELEASE-NOTES.txt
 tomcat/webapps/ROOT/WEB-INF/lib/catalina-root.jar
 tomcat/webapps/ROOT/WEB-INF/web.xml
 tomcat/webapps/ROOT/admin/index.html
+tomcat/webapps/ROOT/asf-logo-wide.gif
 tomcat/webapps/ROOT/favicon.ico
 tomcat/webapps/ROOT/index.jsp
-tomcat/webapps/ROOT/jakarta-banner.gif
 tomcat/webapps/ROOT/tomcat-power.gif
 tomcat/webapps/ROOT/tomcat.gif
 tomcat/webapps/balancer/META-INF/context.xml
@@ -540,11 +540,11 @@ tomcat/webapps/tomcat-docs/deployer-howto.html
 tomcat/webapps/tomcat-docs/developers.html
 tomcat/webapps/tomcat-docs/html-manager-howto.html
 tomcat/webapps/tomcat-docs/images/add.gif
+tomcat/webapps/tomcat-docs/images/asf-logo.gif
 tomcat/webapps/tomcat-docs/images/code.gif
 tomcat/webapps/tomcat-docs/images/design.gif
 tomcat/webapps/tomcat-docs/images/docs.gif
 tomcat/webapps/tomcat-docs/images/fix.gif
-tomcat/webapps/tomcat-docs/images/jakarta-logo.gif
 tomcat/webapps/tomcat-docs/images/printer.gif
 tomcat/webapps/tomcat-docs/images/tomcat.gif
 tomcat/webapps/tomcat-docs/images/update.gif
diff --git a/www/apache-tomcat55/distinfo b/www/apache-tomcat55/distinfo
index 0964c2d7ffa..72730621136 100644
--- a/www/apache-tomcat55/distinfo
+++ b/www/apache-tomcat55/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $
+$NetBSD: distinfo,v 1.2 2006/07/22 19:43:55 abs Exp $
 
-SHA1 (apache-tomcat-5.5.14.tar.gz) = 669b096e67169b66cc4a3818532f5a575d06c6b5
-RMD160 (apache-tomcat-5.5.14.tar.gz) = 6979b10d3420d66222cc826b9934e3a45d24daf7
-Size (apache-tomcat-5.5.14.tar.gz) = 5965614 bytes
+SHA1 (apache-tomcat-5.5.17.tar.gz) = 5289b2e6302bb0ed792f45d730c13b3868368a7f
+RMD160 (apache-tomcat-5.5.17.tar.gz) = cf7520bc17d851c48d49fb14458bead97eb9a44b
+Size (apache-tomcat-5.5.17.tar.gz) = 5994530 bytes