3 files changed, 6 insertions, 102 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 4effd36e4b81..4512c2e7afd1 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	6.0.41
+PORTVERSION=	6.0.43
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 6146f8878304..bc4a94d57885 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-tomcat-6.0.41.tar.gz) = 2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953
-SIZE (apache-tomcat-6.0.41.tar.gz) = 7176167
+SHA256 (apache-tomcat-6.0.43.tar.gz) = 8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068
+SIZE (apache-tomcat-6.0.43.tar.gz) = 7185524
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 9051c998410a..c39749592eeb 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -1,4 +1,3 @@
-@stopdaemon tomcat6
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -497,103 +496,8 @@
 %%T%%/webapps/manager/images/void.gif
 %%T%%/webapps/manager/status.xsd
 %%T%%/webapps/manager/xform.xsl
-@exec mkdir %D/%%T%%/endorsed 2>/dev/null || true
-@exec mkdir %D/%%T%%/logs 2>/dev/null || true
-@exec mkdir %D/%%T%%/work 2>/dev/null || true
+@dir %%T%%/endorsed
+@dir %%T%%/logs
+@dir %%T%%/work
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work
-@dirrmtry %%T%%/work
-@dirrm %%T%%/webapps/manager/images
-@dirrm %%T%%/webapps/manager/WEB-INF/jsp
-@dirrm %%T%%/webapps/manager/WEB-INF
-@dirrm %%T%%/webapps/manager/META-INF
-@dirrm %%T%%/webapps/manager
-@dirrm %%T%%/webapps/host-manager/images
-@dirrm %%T%%/webapps/host-manager/WEB-INF/jsp
-@dirrm %%T%%/webapps/host-manager/WEB-INF
-@dirrm %%T%%/webapps/host-manager/META-INF
-@dirrm %%T%%/webapps/host-manager
-@dirrm %%T%%/webapps/examples/servlets/images
-@dirrm %%T%%/webapps/examples/servlets
-@dirrm %%T%%/webapps/examples/jsp/xml
-@dirrm %%T%%/webapps/examples/jsp/tagplugin
-@dirrm %%T%%/webapps/examples/jsp/snp
-@dirrm %%T%%/webapps/examples/jsp/simpletag
-@dirrm %%T%%/webapps/examples/jsp/sessions
-@dirrm %%T%%/webapps/examples/jsp/security/protected
-@dirrm %%T%%/webapps/examples/jsp/security
-@dirrm %%T%%/webapps/examples/jsp/plugin/applet
-@dirrm %%T%%/webapps/examples/jsp/plugin
-@dirrm %%T%%/webapps/examples/jsp/num
-@dirrm %%T%%/webapps/examples/jsp/jsptoserv
-@dirrm %%T%%/webapps/examples/jsp/jsp2/tagfiles
-@dirrm %%T%%/webapps/examples/jsp/jsp2/simpletag
-@dirrm %%T%%/webapps/examples/jsp/jsp2/misc
-@dirrm %%T%%/webapps/examples/jsp/jsp2/jspx
-@dirrm %%T%%/webapps/examples/jsp/jsp2/jspattribute
-@dirrm %%T%%/webapps/examples/jsp/jsp2/el
-@dirrm %%T%%/webapps/examples/jsp/jsp2
-@dirrm %%T%%/webapps/examples/jsp/include
-@dirrm %%T%%/webapps/examples/jsp/images
-@dirrm %%T%%/webapps/examples/jsp/forward
-@dirrm %%T%%/webapps/examples/jsp/error
-@dirrm %%T%%/webapps/examples/jsp/dates
-@dirrm %%T%%/webapps/examples/jsp/colors
-@dirrm %%T%%/webapps/examples/jsp/checkbox
-@dirrm %%T%%/webapps/examples/jsp/chat
-@dirrm %%T%%/webapps/examples/jsp/cal
-@dirrm %%T%%/webapps/examples/jsp
-@dirrm %%T%%/webapps/examples/WEB-INF/tags
-@dirrm %%T%%/webapps/examples/WEB-INF/lib
-@dirrm %%T%%/webapps/examples/WEB-INF/jsp2
-@dirrm %%T%%/webapps/examples/WEB-INF/jsp/applet
-@dirrm %%T%%/webapps/examples/WEB-INF/jsp
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/validators
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/util
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/sessions
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/num
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/listeners
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/filters
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/examples
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/error
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/dates
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/compressionFilters
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/colors
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/checkbox
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/chat
-@dirrm %%T%%/webapps/examples/WEB-INF/classes/cal
-@dirrm %%T%%/webapps/examples/WEB-INF/classes
-@dirrm %%T%%/webapps/examples/WEB-INF
-@dirrm %%T%%/webapps/examples
-@dirrm %%T%%/webapps/docs/tribes
-@dirrm %%T%%/webapps/docs/images
-@dirrm %%T%%/webapps/docs/funcspecs
-@dirrm %%T%%/webapps/docs/config
-@dirrm %%T%%/webapps/docs/architecture/startup
-@dirrm %%T%%/webapps/docs/architecture/requestProcess
-@dirrm %%T%%/webapps/docs/architecture
-@dirrm %%T%%/webapps/docs/appdev/sample/web/images
-@dirrm %%T%%/webapps/docs/appdev/sample/web/WEB-INF
-@dirrm %%T%%/webapps/docs/appdev/sample/web
-@dirrm %%T%%/webapps/docs/appdev/sample/src/mypackage
-@dirrm %%T%%/webapps/docs/appdev/sample/src
-@dirrm %%T%%/webapps/docs/appdev/sample/docs
-@dirrm %%T%%/webapps/docs/appdev/sample
-@dirrm %%T%%/webapps/docs/appdev
-@dirrm %%T%%/webapps/docs/api
-@dirrm %%T%%/webapps/docs/WEB-INF
-@dirrm %%T%%/webapps/docs
-@dirrm %%T%%/webapps/ROOT/WEB-INF
-@dirrm %%T%%/webapps/ROOT
-@dirrm %%T%%/webapps
-@dirrm %%T%%/temp
-@dirrmtry %%T%%/logs
-@dirrm %%T%%/lib
-@dirrmtry %%T%%/endorsed
-@dirrmtry %%T%%/conf
-@dirrm %%T%%/bin
-@dirrmtry %%T%%
 @unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually