[30857] trunk/dports/java/tomcat5

[source_changes at macosforge.org]

Revision: 30857
          http://trac.macosforge.org/projects/macports/changeset/30857
Author:   jberry at macports.org
Date:     2007-11-08 10:56:15 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Update tomcat5 --> 5.5.25. Should resolve #13112.

Modified Paths:
--------------
    trunk/dports/java/tomcat5/Portfile
    trunk/dports/java/tomcat5/files/tomcatctl

Modified: trunk/dports/java/tomcat5/Portfile
===================================================================
--- trunk/dports/java/tomcat5/Portfile	2007-11-08 16:21:58 UTC (rev 30856)
+++ trunk/dports/java/tomcat5/Portfile	2007-11-08 18:56:15 UTC (rev 30857)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name				tomcat5
-version				5.5.23
+version				5.5.25
 
 categories			java www
 maintainers			jberry at macports.org openmaintainer
@@ -17,8 +17,8 @@
 
 distname			apache-tomcat-${version}-src
 master_sites		apache:tomcat/tomcat-5/v${version}/src/
-checksums			md5 362d1d8b15dc09882440dcab8c592dd7 \
-					sha1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 
+checksums			md5 2d6cc9a16aceeef4ec3610cd782d5c9d \
+					sha1 81ef41e25f805831aa63353f52e5b498c74a3414 
 					
 patchfiles			patch-catalina.sh
 
@@ -45,8 +45,7 @@
 					port:mx4j \
 					port:junit \
 					port:jaxen \
-					port:saxpath \
-					port:struts
+					port:saxpath
 				
 worksrcdir			${distname}/build
 
@@ -83,9 +82,9 @@
 					-Djunit.jar=${javaLibs}/junit.jar
 					-Djaxen.jar=${javaLibs}/jaxen.jar
 					-Dsaxpath.jar=${javaLibs}/saxpath.jar
-					-Dstruts.lib=${javaLibs}/struts/lib
 					-Djasper.home=${worksrcpath}/../jasper
 					"]
+#					-Dstruts.lib=${javaLibs}/struts/lib
 
 # Remove compatibility for pre-JRE 1.5 systems
 variant nocompat {

Modified: trunk/dports/java/tomcat5/files/tomcatctl
===================================================================
--- trunk/dports/java/tomcat5/files/tomcatctl	2007-11-08 16:21:58 UTC (rev 30856)
+++ trunk/dports/java/tomcat5/files/tomcatctl	2007-11-08 18:56:15 UTC (rev 30857)
@@ -102,11 +102,11 @@
 		CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
 	fi
 
-    echo -n "Starting Tomcat..."
+    printf "Starting Tomcat..."
     check
     
     if [ -n "$RUNNING" ]; then
-        echo "already $STATUS"
+        printf "already $STATUS\n"
     else
         # Remove any existing pid file
         rm -f "$TOMCAT_PIDFILE"
@@ -128,16 +128,16 @@
         # Wait for it to really start
         for ((CNT=0; CNT < 15; ++CNT)); do
             [ -f "$TOMCAT_PIDFILE" ] && break
-            echo -n "."
+            printf "."
             sleep 1
         done
         
         # Let 'em know what happened
         check
         if [ -n "$RUNNING" ]; then
-            echo " started. (pid $PID)"
+            printf " started. (pid $PID)\n"
         else
-            echo " giving up."
+            printf " giving up.\n"
         fi
     fi
 }
@@ -145,13 +145,13 @@
 
 stop()
 {
-    echo -n "Stopping Tomcat..."
+    printf "Stopping Tomcat..."
     check
     
     if [ -z "$RUNNING" ]; then
-        echo "already $STATUS"
+        printf "already $STATUS\n"
     else
-        echo -n "(pid $PID)"
+        printf "(pid $PID)"
         
         # Stop Tomcat
         kill $PID
@@ -159,16 +159,16 @@
         # Wait for it to really stop
         for ((CNT=0; CNT < 15; ++CNT)); do
             [ -f "$TOMCAT_PIDFILE" ] || break
-            echo -n "."
+            printf "."
             sleep 1
         done
         
         # Let 'em know what happened
         check
         if [ -z "$RUNNING" ]; then
-            echo " stopped."
+            printf " stopped.\n"
         else
-            echo " giving up."
+            printf " giving up.\n"
         fi
     fi
 }
@@ -202,7 +202,7 @@
 		
 	status)
 		check
-		echo "Tomcat is $STATUS"
+		printf "Tomcat is $STATUS\n"
 		;;
 		
 	info)
@@ -223,7 +223,7 @@
 		;;
 		
 	*)
-		echo "$0: unrecognized option '$1'"
+		printf "$0: unrecognized option '$1'\n"
 		usage
 		exit 1
 		;;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071108/8ff276fa/attachment.html