Straightforward update to 5.5.23.
-Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 25 Nov 2006 07:42:58 -0000 1.2
+++ Makefile 27 Mar 2007 21:11:34 -0000
@@ -4,11 +4,12 @@
COMMENT-admin= "administration web application"
COMMENT-examples="example applications and documentation"
-V= 5.5.20
+V= 5.5.23
DISTNAME= apache-tomcat-${V}
-PKGNAME-main= tomcat-${V}p0
-PKGNAME-admin= tomcat-admin-${V}p0
-PKGNAME-examples=tomcat-examples-${V}p0
+PKGNAME= tomcat-${V}
+PKGNAME-main= tomcat-${V}
+PKGNAME-admin= tomcat-admin-${V}
+PKGNAME-examples=tomcat-examples-${V}
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 25 Oct 2006 18:10:18 -0000 1.1.1.1
+++ distinfo 27 Mar 2007 21:11:34 -0000
@@ -1,12 +1,15 @@
-MD5 (apache-tomcat-5.5.20-admin.tar.gz) = e779d0694dad09b4adbe890eb04c5057
-MD5 (apache-tomcat-5.5.20-fulldocs.tar.gz) = dbb500aa9cd8c75a784062ebdca25778
-MD5 (apache-tomcat-5.5.20.tar.gz) = 2efa171cddb9f85ed19ef6f21b2c7d31
-RMD160 (apache-tomcat-5.5.20-admin.tar.gz) =
3d4172856c27360764ab888481f39de557157ccd
-RMD160 (apache-tomcat-5.5.20-fulldocs.tar.gz) =
1ae90360e292871d038b18d24e9f6fd548407bbb
-RMD160 (apache-tomcat-5.5.20.tar.gz) = 93c422347a28b5159301f8f7799d59fdb58c43c6
-SHA1 (apache-tomcat-5.5.20-admin.tar.gz) =
b4575c721d0c035dad1241ccbf893158c80f3a1d
-SHA1 (apache-tomcat-5.5.20-fulldocs.tar.gz) =
7090c1e398a940b45bf2893469ab33e896d8a724
-SHA1 (apache-tomcat-5.5.20.tar.gz) = 70316421f72291bbce3fe6e79bff39f526132946
-SIZE (apache-tomcat-5.5.20-admin.tar.gz) = 2330527
-SIZE (apache-tomcat-5.5.20-fulldocs.tar.gz) = 2992420
-SIZE (apache-tomcat-5.5.20.tar.gz) = 5949295
+MD5 (apache-tomcat-5.5.23-admin.tar.gz) = 7d48a07234c68289435df9694e068039
+MD5 (apache-tomcat-5.5.23-fulldocs.tar.gz) = 033fca9535e2efa536ebeed317b2091e
+MD5 (apache-tomcat-5.5.23.tar.gz) = 7a4cc2e00c7d2c9d9c4437ede337f832
+RMD160 (apache-tomcat-5.5.23-admin.tar.gz) =
dd5fd831c8ba646524c21b4da988e34d5a43485b
+RMD160 (apache-tomcat-5.5.23-fulldocs.tar.gz) =
9be62386550b235784b7baa769124a0dcd9a7271
+RMD160 (apache-tomcat-5.5.23.tar.gz) = 9173e12cf70d741c8b3b73812a3f9c49c7147417
+SHA1 (apache-tomcat-5.5.23-admin.tar.gz) =
5a4874d9b339e32ff2377e9c0057fd9c88d09465
+SHA1 (apache-tomcat-5.5.23-fulldocs.tar.gz) =
2121353ef7a7164588989981e50490f6eecbe8ad
+SHA1 (apache-tomcat-5.5.23.tar.gz) = 81a095ccd3c6b03a882b8b91bdfe46a32fa373b5
+SHA256 (apache-tomcat-5.5.23-admin.tar.gz) =
83167ca2ca17ef39c6b91f284050762ead5d294d1a18f2619b56075538ed315b
+SHA256 (apache-tomcat-5.5.23-fulldocs.tar.gz) =
e44ce839a1424738570033057182b573ca259cd5b4388e9f509278721a637273
+SHA256 (apache-tomcat-5.5.23.tar.gz) =
2948a0d6da10ff3760d58a4c73857424cfcdf7ce267ca030d94efaad11b59f81
+SIZE (apache-tomcat-5.5.23-admin.tar.gz) = 2323422
+SIZE (apache-tomcat-5.5.23-fulldocs.tar.gz) = 3021063
+SIZE (apache-tomcat-5.5.23.tar.gz) = 5977561
Index: patches/patch-bin_catalina_sh
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/patches/patch-bin_catalina_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-bin_catalina_sh
--- patches/patch-bin_catalina_sh 25 Oct 2006 18:10:18 -0000 1.1.1.1
+++ patches/patch-bin_catalina_sh 27 Mar 2007 21:11:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-bin_catalina_sh,v 1.1.1.1 2006/10/25 18:10:18 kurt Exp $
---- bin/catalina.sh.orig Sat Aug 28 20:02:20 2004
-+++ bin/catalina.sh Thu Oct 14 09:14:40 2004
-@@ -107,7 +107,7 @@ fi
+--- bin/catalina.sh.orig Mon Mar 5 10:26:02 2007
++++ bin/catalina.sh Tue Mar 27 13:37:25 2007
+@@ -135,7 +135,7 @@ fi
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
if [ -z "$CATALINA_BASE" ] ; then
Index: patches/patch-bin_setclasspath_sh
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/patches/patch-bin_setclasspath_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-bin_setclasspath_sh
--- patches/patch-bin_setclasspath_sh 25 Oct 2006 18:10:18 -0000 1.1.1.1
+++ patches/patch-bin_setclasspath_sh 27 Mar 2007 21:11:34 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-bin_setclasspath_sh,v 1.1.1.1 2006/10/25 18:10:18 kurt Exp $
---- bin/setclasspath.sh.orig Mon Jul 31 13:01:05 2006
-+++ bin/setclasspath.sh Mon Jul 31 13:02:44 2006
+--- bin/setclasspath.sh.orig Mon Mar 5 10:26:01 2007
++++ bin/setclasspath.sh Tue Mar 27 13:37:25 2007
@@ -8,6 +8,11 @@
# First clear out the user classpath
CLASSPATH=
@@ -13,7 +13,7 @@
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
# Bugzilla 37284
-@@ -16,6 +21,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]
+@@ -16,6 +21,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
else
echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is
defined"
echo "At least one of these environment variable is needed to run this
program"
Index: patches/patch-conf_server_xml
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/patches/patch-conf_server_xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-conf_server_xml
--- patches/patch-conf_server_xml 25 Oct 2006 18:10:18 -0000 1.1.1.1
+++ patches/patch-conf_server_xml 27 Mar 2007 21:11:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-conf_server_xml,v 1.1.1.1 2006/10/25 18:10:18 kurt Exp $
---- conf/server.xml.orig Mon Jul 31 12:58:18 2006
-+++ conf/server.xml Mon Jul 31 12:58:40 2006
-@@ -188,7 +188,7 @@
+--- conf/server.xml.orig Mon Mar 5 10:27:07 2007
++++ conf/server.xml Tue Mar 27 13:37:26 2007
+@@ -196,7 +196,7 @@
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
Index: pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-examples,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-examples
--- pkg/PLIST-examples 25 Oct 2006 18:10:19 -0000 1.1.1.1
+++ pkg/PLIST-examples 27 Mar 2007 21:11:34 -0000
@@ -2,7 +2,6 @@
@pkgpath www/jakarta-tomcat/v5,-examples
@owner _tomcat
@group _tomcat
[EMAIL PROTECTED] webapps/
webapps/ROOT/
webapps/ROOT/RELEASE-NOTES.txt
webapps/ROOT/WEB-INF/
@@ -624,6 +623,13 @@
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/MembershipListener.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/MembershipService.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/MessageListener.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/package-frame.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/package-summary.html
+webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/authenticator/package-tree.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/deploy/
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/deploy/FarmWarDeployer.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/deploy/FileChangeListener.html
@@ -1788,6 +1794,7 @@
webapps/tomcat-docs/printer/ssi-howto.html
webapps/tomcat-docs/printer/ssl-howto.html
webapps/tomcat-docs/printer/status.html
+webapps/tomcat-docs/printer/virtual-hosting-howto.html
webapps/tomcat-docs/printer/windows-service-howto.html
webapps/tomcat-docs/proxy-howto.html
webapps/tomcat-docs/realm-howto.html
@@ -1906,6 +1913,7 @@
webapps/tomcat-docs/ssi-howto.html
webapps/tomcat-docs/ssl-howto.html
webapps/tomcat-docs/status.html
+webapps/tomcat-docs/virtual-hosting-howto.html
webapps/tomcat-docs/windows-service-howto.html
webapps/webdav/
webapps/webdav/WEB-INF/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- pkg/PLIST-main 25 Nov 2006 07:42:58 -0000 1.1
+++ pkg/PLIST-main 27 Mar 2007 21:11:34 -0000
@@ -128,7 +128,7 @@
tomcat/server/lib/catalina-optional.jar
tomcat/server/lib/catalina-storeconfig.jar
tomcat/server/lib/catalina.jar
-tomcat/server/lib/commons-modeler.jar
+tomcat/server/lib/commons-modeler-2.0.jar
tomcat/server/lib/servlets-cgi.renametojar
tomcat/server/lib/servlets-default.jar
tomcat/server/lib/servlets-invoker.jar
