Date: Thu, 15 Jul 2010 00:29:35 +0000 (UTC) From: L Pacey <lpfreebsd@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tomasv@megalogika.lt Subject: ports/148611: [PATCH] www/tomcat: update to 5.5.30 Message-ID: <20100715002935.EE97D1CC1B@mail.aara.ca> Resent-Message-ID: <201007150100.o6F10FwA020190@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148611
>Category: ports
>Synopsis: [PATCH] www/tomcat: update to 5.5.30
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 15 01:00:15 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: L Pacey
>Release: FreeBSD 8.0-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update to 5.5.30
- Remove additional not needed files (Windows libraries)
- Some other pkg-plist fixes
Port maintainer (tomasv@megalogika.lt) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- tomcat-5.5.30.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/tomcat55-orig/Makefile /usr/ports/www/tomcat55/Makefile
--- /usr/ports/www/tomcat55-orig/Makefile 2010-06-29 10:39:30.000000000 +0000
+++ /usr/ports/www/tomcat55/Makefile 2010-07-14 10:59:39.000000000 +0000
@@ -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
@@ -86,7 +85,8 @@
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 -ruN --exclude=CVS /usr/ports/www/tomcat55-orig/distinfo /usr/ports/www/tomcat55/distinfo
--- /usr/ports/www/tomcat55-orig/distinfo 2010-02-26 01:18:54.000000000 +0000
+++ /usr/ports/www/tomcat55/distinfo 2010-07-14 11:03:26.000000000 +0000
@@ -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 -ruN --exclude=CVS /usr/ports/www/tomcat55-orig/pkg-plist /usr/ports/www/tomcat55/pkg-plist
--- /usr/ports/www/tomcat55-orig/pkg-plist 2010-02-26 01:18:54.000000000 +0000
+++ /usr/ports/www/tomcat55/pkg-plist 2010-07-14 14:10:45.000000000 +0000
@@ -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%%
--- tomcat-5.5.30.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100715002935.EE97D1CC1B>