[Midnightbsd-cvs] mports: www/tomcat55: Update to tomcat 5.5.25

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Feb 14 17:24:41 EST 2008


Log Message:
-----------
Update to tomcat 5.5.25

Modified Files:
--------------
    mports/www/tomcat55:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.3 -> r1.4)
        pkg-plist (r1.2 -> r1.3)
    mports/www/tomcat55/files:
        tomcat55.sh.in (r1.2 -> r1.3)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/tomcat55/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/tomcat55/pkg-plist -L www/tomcat55/pkg-plist -u -r1.2 -r1.3
--- www/tomcat55/pkg-plist
+++ www/tomcat55/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/www/tomcat55/pkg-plist,v 1.21 2007/03/23 19:57:48 pav Exp $
+ at comment $FreeBSD: ports/www/tomcat55/pkg-plist,v 1.22 2007/09/20 01:38:44 miwi Exp $
 @unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/host-manager.xml %D/%%T%%/conf/Catalina/localhost/host-manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/host-manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/host-manager.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/manager.xml %D/%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/manager.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.policy must be removed manually; fi
@@ -64,7 +64,7 @@
 %%T%%/server/lib/catalina-optional.jar
 %%T%%/server/lib/catalina-storeconfig.jar
 %%T%%/server/lib/catalina.jar
-%%T%%/server/lib/commons-modeler-2.0.jar
+%%T%%/server/lib/commons-modeler-2.0.1.jar
 %%T%%/server/lib/servlets-cgi.renametojar
 %%T%%/server/lib/servlets-default.jar
 %%T%%/server/lib/servlets-invoker.jar
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/tomcat55/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/tomcat55/Makefile -L www/tomcat55/Makefile -u -r1.3 -r1.4
--- www/tomcat55/Makefile
+++ www/tomcat55/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tomcat
-PORTVERSION=	5.5.23
+PORTVERSION=	5.5.25
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
@@ -129,7 +129,7 @@
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
-		${APP_HOME}/temp ${APP_HOME}/work
+		${APP_HOME}/temp ${APP_HOME}/work ${APP_HOME}/webapps
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/tomcat55/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/tomcat55/distinfo -L www/tomcat55/distinfo -u -r1.3 -r1.4
--- www/tomcat55/distinfo
+++ www/tomcat55/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-5.5.23.tar.gz) = 7a4cc2e00c7d2c9d9c4437ede337f832
-SHA256 (apache-tomcat-5.5.23.tar.gz) = 2948a0d6da10ff3760d58a4c73857424cfcdf7ce267ca030d94efaad11b59f81
-SIZE (apache-tomcat-5.5.23.tar.gz) = 5977561
+MD5 (apache-tomcat-5.5.25.tar.gz) = f273c73979bee1342134761b0497a335
+SHA256 (apache-tomcat-5.5.25.tar.gz) = 6f2ebe881ec7c9d0c963e5cfd763d58cd7d561ccd034613bc99209b7d856ad26
+SIZE (apache-tomcat-5.5.25.tar.gz) = 6034852
Index: tomcat55.sh.in
===================================================================
RCS file: /home/cvs/mports/www/tomcat55/files/tomcat55.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/tomcat55/files/tomcat55.sh.in -L www/tomcat55/files/tomcat55.sh.in -u -r1.2 -r1.3
--- www/tomcat55/files/tomcat55.sh.in
+++ www/tomcat55/files/tomcat55.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/www/tomcat55/files/tomcat55.sh.in,v 1.5 2006/09/08 09:31:07 pav Exp $
+# $FreeBSD: ports/www/tomcat55/files/tomcat55.sh.in,v 1.7 2007/09/30 22:04:02 alepulver Exp $
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
@@ -112,6 +112,9 @@
     procname=`ps -o ucomm= -p $rc_pid`
   fi
 fi
+if [ -z "$procname" ]; then
+  procname=nonexistent
+fi
 
 required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
 
@@ -128,7 +131,7 @@
 }
 
 tomcat%%TOMCAT_VERSION%%_stop() {
-	rc_pid=$(check_pidfile $pidfile *$procname*)
+	rc_pid=$(check_pidfile $pidfile $procname)
 
 	if [ -z "$rc_pid" ]; then
 		[ -n "$rc_fast" ] && return 0


More information about the Midnightbsd-cvs mailing list