summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/apache-tomcat6/Makefile5
-rw-r--r--www/apache-tomcat6/PLIST4
-rw-r--r--www/apache-tomcat6/distinfo8
3 files changed, 9 insertions, 8 deletions
diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile
index 9e5f618fe56..f5d182d94c9 100644
--- a/www/apache-tomcat6/Makefile
+++ b/www/apache-tomcat6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/09/24 16:20:57 spz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2011/12/14 07:20:13 tron Exp $
#
DISTNAME= apache-tomcat-${TOMCAT_VER}
@@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-6/v${TOMCAT_VER}/bin/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tomcat.apache.org/
COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
+LICENSE= apache-2.0
CONFLICTS+= jakarta-tomcat55-[0-9]*
CONFLICTS+= jakarta-tomcat-[0-9]*
@@ -22,7 +23,7 @@ PKG_DESTDIR_SUPPORT= destdir
.include "../../mk/bsd.prefs.mk"
-TOMCAT_VER= 6.0.33
+TOMCAT_VER= 6.0.35
TOMCAT_HOME= ${PREFIX}/share/tomcat
EGDIR= ${PREFIX}/share/examples/tomcat
DOCDIR= ${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST
index 7697388e255..8f6a652ffaa 100644
--- a/www/apache-tomcat6/PLIST
+++ b/www/apache-tomcat6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/15 07:03:11 spz Exp $
+@comment $NetBSD: PLIST,v 1.5.6.1 2011/12/14 07:20:13 tron Exp $
share/doc/tomcat/LICENSE
share/doc/tomcat/NOTICE
share/doc/tomcat/RELEASE-NOTES
@@ -29,7 +29,7 @@ share/tomcat/lib/catalina-ant.jar
share/tomcat/lib/catalina-ha.jar
share/tomcat/lib/catalina-tribes.jar
share/tomcat/lib/catalina.jar
-share/tomcat/lib/ecj-3.3.1.jar
+share/tomcat/lib/ecj-3.7.jar
share/tomcat/lib/el-api.jar
share/tomcat/lib/jasper-el.jar
share/tomcat/lib/jasper.jar
diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo
index 9a5a89e07b9..455c50d9d3e 100644
--- a/www/apache-tomcat6/distinfo
+++ b/www/apache-tomcat6/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/09/24 16:20:57 spz Exp $
+$NetBSD: distinfo,v 1.6.2.1 2011/12/14 07:20:13 tron Exp $
-SHA1 (apache-tomcat-6.0.33.tar.gz) = 004bed8b2e231d3913249680a3b40d1f7f612f71
-RMD160 (apache-tomcat-6.0.33.tar.gz) = 535a9a8dd12efaea69febd7418691b50d846a788
-Size (apache-tomcat-6.0.33.tar.gz) = 6531699 bytes
+SHA1 (apache-tomcat-6.0.35.tar.gz) = bc3af89308990be16b12cc7d6b3ff8278a7cda84
+RMD160 (apache-tomcat-6.0.35.tar.gz) = 50c6cb7b729cc28145ff7d3669b10924c2604907
+Size (apache-tomcat-6.0.35.tar.gz) = 6697806 bytes