Upgrade to 3.2.3.

20 files changed, 70 insertions, 40 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index efda6536dafc..99e1b3829469 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index 9f69bda323dc..cc66be5696cd 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1 +1 @@
-MD5 (jakarta/tomcat/3.2.1/jakarta-tomcat-3.2.1.tar.gz) = 43178931ed737cfd92bdde22ed37c98c
+MD5 (jakarta/tomcat/3.2.3/jakarta-tomcat-3.2.3.tar.gz) = 0228e1fca40a77cbb2cbf376503b3473
diff --git a/www/jakarta-tomcat/files/tomcat.sh b/www/jakarta-tomcat/files/tomcat.sh
index 0b3990d7d84c..ac29e67ca817 100644
--- a/www/jakarta-tomcat/files/tomcat.sh
+++ b/www/jakarta-tomcat/files/tomcat.sh
@@ -7,13 +7,13 @@ export TOMCAT_HOME
 
 case "$1" in
 	start)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
 		fi
 		;;
 	stop)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
 		fi
 		;;
 	*)
diff --git a/www/jakarta-tomcat/pkg-plist b/www/jakarta-tomcat/pkg-plist
index 12d5c80cc664..116ac18fb084 100644
--- a/www/jakarta-tomcat/pkg-plist
+++ b/www/jakarta-tomcat/pkg-plist
@@ -1,4 +1,6 @@
+tomcat/KEYS
 tomcat/LICENSE
+tomcat/RELEASE-NOTES
 tomcat/bin/ant
 tomcat/bin/ant.bat
 tomcat/bin/antRun
@@ -30,9 +32,11 @@ tomcat/conf/web.dtd
 tomcat/conf/web.xml
 tomcat/conf/workers.properties
 tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
 tomcat/doc/JDBCRealm.howto
 tomcat/doc/NT-Service-howto.html
 tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
 tomcat/doc/appdev/build.xml.txt
 tomcat/doc/appdev/contents.html
 tomcat/doc/appdev/deployment.html
@@ -46,6 +50,7 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -59,11 +64,13 @@ tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
 tomcat/doc/tomcat-apache-howto.html
 tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
 tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
 tomcat/doc/uguide/images/tomcat.gif
 tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
 tomcat/lib/ant.jar
@@ -77,12 +84,12 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
-@dirrm tomcat/logs
 @dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample/etc
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index efda6536dafc..99e1b3829469 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
diff --git a/www/jakarta-tomcat3/distinfo b/www/jakarta-tomcat3/distinfo
index 9f69bda323dc..cc66be5696cd 100644
--- a/www/jakarta-tomcat3/distinfo
+++ b/www/jakarta-tomcat3/distinfo
@@ -1 +1 @@
-MD5 (jakarta/tomcat/3.2.1/jakarta-tomcat-3.2.1.tar.gz) = 43178931ed737cfd92bdde22ed37c98c
+MD5 (jakarta/tomcat/3.2.3/jakarta-tomcat-3.2.3.tar.gz) = 0228e1fca40a77cbb2cbf376503b3473
diff --git a/www/jakarta-tomcat3/files/tomcat.sh b/www/jakarta-tomcat3/files/tomcat.sh
index 0b3990d7d84c..ac29e67ca817 100644
--- a/www/jakarta-tomcat3/files/tomcat.sh
+++ b/www/jakarta-tomcat3/files/tomcat.sh
@@ -7,13 +7,13 @@ export TOMCAT_HOME
 
 case "$1" in
 	start)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
 		fi
 		;;
 	stop)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
 		fi
 		;;
 	*)
diff --git a/www/jakarta-tomcat3/pkg-plist b/www/jakarta-tomcat3/pkg-plist
index 12d5c80cc664..116ac18fb084 100644
--- a/www/jakarta-tomcat3/pkg-plist
+++ b/www/jakarta-tomcat3/pkg-plist
@@ -1,4 +1,6 @@
+tomcat/KEYS
 tomcat/LICENSE
+tomcat/RELEASE-NOTES
 tomcat/bin/ant
 tomcat/bin/ant.bat
 tomcat/bin/antRun
@@ -30,9 +32,11 @@ tomcat/conf/web.dtd
 tomcat/conf/web.xml
 tomcat/conf/workers.properties
 tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
 tomcat/doc/JDBCRealm.howto
 tomcat/doc/NT-Service-howto.html
 tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
 tomcat/doc/appdev/build.xml.txt
 tomcat/doc/appdev/contents.html
 tomcat/doc/appdev/deployment.html
@@ -46,6 +50,7 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -59,11 +64,13 @@ tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
 tomcat/doc/tomcat-apache-howto.html
 tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
 tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
 tomcat/doc/uguide/images/tomcat.gif
 tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
 tomcat/lib/ant.jar
@@ -77,12 +84,12 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
-@dirrm tomcat/logs
 @dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample/etc
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index efda6536dafc..99e1b3829469 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
diff --git a/www/jakarta-tomcat4/distinfo b/www/jakarta-tomcat4/distinfo
index 9f69bda323dc..cc66be5696cd 100644
--- a/www/jakarta-tomcat4/distinfo
+++ b/www/jakarta-tomcat4/distinfo
@@ -1 +1 @@
-MD5 (jakarta/tomcat/3.2.1/jakarta-tomcat-3.2.1.tar.gz) = 43178931ed737cfd92bdde22ed37c98c
+MD5 (jakarta/tomcat/3.2.3/jakarta-tomcat-3.2.3.tar.gz) = 0228e1fca40a77cbb2cbf376503b3473
diff --git a/www/jakarta-tomcat4/files/tomcat.sh b/www/jakarta-tomcat4/files/tomcat.sh
index 0b3990d7d84c..ac29e67ca817 100644
--- a/www/jakarta-tomcat4/files/tomcat.sh
+++ b/www/jakarta-tomcat4/files/tomcat.sh
@@ -7,13 +7,13 @@ export TOMCAT_HOME
 
 case "$1" in
 	start)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
 		fi
 		;;
 	stop)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
 		fi
 		;;
 	*)
diff --git a/www/jakarta-tomcat4/pkg-plist b/www/jakarta-tomcat4/pkg-plist
index 12d5c80cc664..116ac18fb084 100644
--- a/www/jakarta-tomcat4/pkg-plist
+++ b/www/jakarta-tomcat4/pkg-plist
@@ -1,4 +1,6 @@
+tomcat/KEYS
 tomcat/LICENSE
+tomcat/RELEASE-NOTES
 tomcat/bin/ant
 tomcat/bin/ant.bat
 tomcat/bin/antRun
@@ -30,9 +32,11 @@ tomcat/conf/web.dtd
 tomcat/conf/web.xml
 tomcat/conf/workers.properties
 tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
 tomcat/doc/JDBCRealm.howto
 tomcat/doc/NT-Service-howto.html
 tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
 tomcat/doc/appdev/build.xml.txt
 tomcat/doc/appdev/contents.html
 tomcat/doc/appdev/deployment.html
@@ -46,6 +50,7 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -59,11 +64,13 @@ tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
 tomcat/doc/tomcat-apache-howto.html
 tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
 tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
 tomcat/doc/uguide/images/tomcat.gif
 tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
 tomcat/lib/ant.jar
@@ -77,12 +84,12 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
-@dirrm tomcat/logs
 @dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample/etc
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index efda6536dafc..99e1b3829469 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
diff --git a/www/jakarta-tomcat41/distinfo b/www/jakarta-tomcat41/distinfo
index 9f69bda323dc..cc66be5696cd 100644
--- a/www/jakarta-tomcat41/distinfo
+++ b/www/jakarta-tomcat41/distinfo
@@ -1 +1 @@
-MD5 (jakarta/tomcat/3.2.1/jakarta-tomcat-3.2.1.tar.gz) = 43178931ed737cfd92bdde22ed37c98c
+MD5 (jakarta/tomcat/3.2.3/jakarta-tomcat-3.2.3.tar.gz) = 0228e1fca40a77cbb2cbf376503b3473
diff --git a/www/jakarta-tomcat41/files/tomcat.sh b/www/jakarta-tomcat41/files/tomcat.sh
index 0b3990d7d84c..ac29e67ca817 100644
--- a/www/jakarta-tomcat41/files/tomcat.sh
+++ b/www/jakarta-tomcat41/files/tomcat.sh
@@ -7,13 +7,13 @@ export TOMCAT_HOME
 
 case "$1" in
 	start)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
 		fi
 		;;
 	stop)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
 		fi
 		;;
 	*)
diff --git a/www/jakarta-tomcat41/pkg-plist b/www/jakarta-tomcat41/pkg-plist
index 12d5c80cc664..116ac18fb084 100644
--- a/www/jakarta-tomcat41/pkg-plist
+++ b/www/jakarta-tomcat41/pkg-plist
@@ -1,4 +1,6 @@
+tomcat/KEYS
 tomcat/LICENSE
+tomcat/RELEASE-NOTES
 tomcat/bin/ant
 tomcat/bin/ant.bat
 tomcat/bin/antRun
@@ -30,9 +32,11 @@ tomcat/conf/web.dtd
 tomcat/conf/web.xml
 tomcat/conf/workers.properties
 tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
 tomcat/doc/JDBCRealm.howto
 tomcat/doc/NT-Service-howto.html
 tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
 tomcat/doc/appdev/build.xml.txt
 tomcat/doc/appdev/contents.html
 tomcat/doc/appdev/deployment.html
@@ -46,6 +50,7 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -59,11 +64,13 @@ tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
 tomcat/doc/tomcat-apache-howto.html
 tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
 tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
 tomcat/doc/uguide/images/tomcat.gif
 tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
 tomcat/lib/ant.jar
@@ -77,12 +84,12 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
-@dirrm tomcat/logs
 @dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample/etc
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index efda6536dafc..99e1b3829469 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
diff --git a/www/tomcat41/distinfo b/www/tomcat41/distinfo
index 9f69bda323dc..cc66be5696cd 100644
--- a/www/tomcat41/distinfo
+++ b/www/tomcat41/distinfo
@@ -1 +1 @@
-MD5 (jakarta/tomcat/3.2.1/jakarta-tomcat-3.2.1.tar.gz) = 43178931ed737cfd92bdde22ed37c98c
+MD5 (jakarta/tomcat/3.2.3/jakarta-tomcat-3.2.3.tar.gz) = 0228e1fca40a77cbb2cbf376503b3473
diff --git a/www/tomcat41/files/tomcat.sh b/www/tomcat41/files/tomcat.sh
index 0b3990d7d84c..ac29e67ca817 100644
--- a/www/tomcat41/files/tomcat.sh
+++ b/www/tomcat41/files/tomcat.sh
@@ -7,13 +7,13 @@ export TOMCAT_HOME
 
 case "$1" in
 	start)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
 		fi
 		;;
 	stop)
-		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
-			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		if [ -f %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			/bin/sh %%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
 		fi
 		;;
 	*)
diff --git a/www/tomcat41/pkg-plist b/www/tomcat41/pkg-plist
index 12d5c80cc664..116ac18fb084 100644
--- a/www/tomcat41/pkg-plist
+++ b/www/tomcat41/pkg-plist
@@ -1,4 +1,6 @@
+tomcat/KEYS
 tomcat/LICENSE
+tomcat/RELEASE-NOTES
 tomcat/bin/ant
 tomcat/bin/ant.bat
 tomcat/bin/antRun
@@ -30,9 +32,11 @@ tomcat/conf/web.dtd
 tomcat/conf/web.xml
 tomcat/conf/workers.properties
 tomcat/conf/wrapper.properties
+tomcat/doc/AJPv13.html
 tomcat/doc/JDBCRealm.howto
 tomcat/doc/NT-Service-howto.html
 tomcat/doc/Tomcat-Workers-HowTo.html
+tomcat/doc/Tomcat-on-NetWare-HowTo.html
 tomcat/doc/appdev/build.xml.txt
 tomcat/doc/appdev/contents.html
 tomcat/doc/appdev/deployment.html
@@ -46,6 +50,7 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
+tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -59,11 +64,13 @@ tomcat/doc/mod_jk-howto.html
 tomcat/doc/readme
 tomcat/doc/tomcat-apache-howto.html
 tomcat/doc/tomcat-iis-howto.html
+tomcat/doc/tomcat-localization-howto.html
 tomcat/doc/tomcat-netscape-howto.html
 tomcat/doc/tomcat-ssl-howto.html
 tomcat/doc/uguide/images/banner.gif
 tomcat/doc/uguide/images/tomcat.gif
 tomcat/doc/uguide/style.css
+tomcat/doc/uguide/tomcat-security-unix.html
 tomcat/doc/uguide/tomcat-security.html
 tomcat/doc/uguide/tomcat_ug.html
 tomcat/lib/ant.jar
@@ -77,12 +84,12 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
-@dirrm tomcat/logs
 @dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
+@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample/etc
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev