summaryrefslogtreecommitdiff
path: root/www/tomcat55
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2010-08-20 20:55:05 +0000
committerRene Ladan <rene@FreeBSD.org>2010-08-20 20:55:05 +0000
commit875c0a02f72f10f94aa6c98fc700fe2e94bcca71 (patch)
treec5ab9944c1d17ec278985b680955b48415737a0f /www/tomcat55
parent- Grab maintainership of these ports for python@ (diff)
- update to 5.5.30
- remove some unneeded Windows-only libraries - pkg-plist fixes PR: ports/148611 Submitted by: L Pacey [lpfreebsd gmail.com] Approved by: Jason [jgh experts-exchange.com] (maintainer)
Notes
Notes: svn path=/head/; revision=259649
Diffstat (limited to 'www/tomcat55')
-rw-r--r--www/tomcat55/Makefile6
-rw-r--r--www/tomcat55/distinfo6
-rw-r--r--www/tomcat55/pkg-plist11
3 files changed, 9 insertions, 14 deletions
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 5bdc5bb15306..4fc727676863 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tomcat
-PORTVERSION= 5.5.28
-PORTREVISION= 1
+PORTVERSION= 5.5.30
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-5/v${PORTVERSION}/bin
@@ -87,7 +86,8 @@ pre-patch:
post-patch:
@${ECHO_MSG} -n ">> Removing unneeded files..."
- @${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
+ @${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'` `${FIND} ${WRKSRC} -name '*.dll'`
+ @${RMDIR} ${WRKSRC}/bin/[i,x]64
@${ECHO_MSG} " [ DONE ]"
.for file in ${REPLACE_FILES}
diff --git a/www/tomcat55/distinfo b/www/tomcat55/distinfo
index feee2901d749..504e3c3eb670 100644
--- a/www/tomcat55/distinfo
+++ b/www/tomcat55/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-5.5.28.tar.gz) = ffe786075c2cdd9c1fde7640bce79d35
-SHA256 (apache-tomcat-5.5.28.tar.gz) = 6bbf7d15574fecc8ed75bf661d525596e86aec13a38ead5ed0ff2930c7b7f769
-SIZE (apache-tomcat-5.5.28.tar.gz) = 6662580
+MD5 (apache-tomcat-5.5.30.tar.gz) = 661dd3fbc25249e9ceb86652eb6a4f07
+SHA256 (apache-tomcat-5.5.30.tar.gz) = ba6a25b642a5d034869a1f8a456cbebb8eb556fc788fe266286d78b344350f84
+SIZE (apache-tomcat-5.5.30.tar.gz) = 8274143
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index c957b8604835..03de3fe434c1 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -17,12 +17,11 @@
%%T%%/bin/catalina-tasks.xml
%%T%%/bin/catalina.sh
%%T%%/bin/commons-daemon.jar
+%%T%%/bin/commons-daemon-native.tar.gz
%%T%%/bin/commons-logging-api-1.1.1.jar
%%T%%/bin/digest.sh
%%JAVA14%%%%T%%/bin/jmx.jar
-%%T%%/bin/jkstatus-tasks.xml
%%T%%/bin/jmxaccessor-tasks.xml
-%%T%%/bin/jsvc.tar.gz
%%T%%/bin/setclasspath.sh
%%T%%/bin/shutdown.sh
%%T%%/bin/startup.sh
@@ -74,7 +73,6 @@
%%T%%/server/lib/tomcat-apr.jar
%%T%%/server/lib/tomcat-coyote.jar
%%T%%/server/lib/tomcat-http.jar
-%%T%%/server/lib/tomcat-jkstatus-ant.jar
%%T%%/server/lib/tomcat-util.jar
%%T%%/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar
%%T%%/server/webapps/host-manager/WEB-INF/web.xml
@@ -843,12 +841,12 @@
%%T%%/webapps/webdav/tomcat.gif
@exec mkdir %D/%%T%%/work || true
@exec mkdir %D/%%T%%/webapps/balancer/images || true
-@exec mkdir %D/%%T%%/temp || true
@exec mkdir %D/%%T%%/shared || true
@exec mkdir %D/%%T%%/shared/lib || true
@exec mkdir %D/%%T%%/shared/classes || true
@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/common/endorsed ||true
+@exec mkdir %D/%%T%%/common/endorsed || true
+@exec mkdir %D/%%T%%/common/classes || true
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
@dirrm %%T%%/work
@dirrm %%T%%/webapps/webdav/WEB-INF
@@ -1022,8 +1020,5 @@
@dirrm %%T%%/common/endorsed
@dirrm %%T%%/common/classes
@dirrm %%T%%/common
-@dirrm %%T%%/bin/procrun/ia64
-@dirrm %%T%%/bin/procrun/amd64
-@dirrm %%T%%/bin/procrun
@dirrm %%T%%/bin
@dirrm %%T%%