[54508] trunk/dports/java/tomcat6

[jberry at macports.org]

Revision: 54508
          http://trac.macports.org/changeset/54508
Author:   jberry at macports.org
Date:     2009-07-28 15:22:00 -0700 (Tue, 28 Jul 2009)
Log Message:
-----------
Cleanups to tomcat6, including fixing the name of the pid file used, to prevent a tug of war with daemondo and launchctl over this issue.

Modified Paths:
--------------
    trunk/dports/java/tomcat6/Portfile
    trunk/dports/java/tomcat6/files/setenv.sh
    trunk/dports/java/tomcat6/files/tomcat6.sh
    trunk/dports/java/tomcat6/files/tomcatctl

Modified: trunk/dports/java/tomcat6/Portfile
===================================================================
--- trunk/dports/java/tomcat6/Portfile	2009-07-28 21:53:16 UTC (rev 54507)
+++ trunk/dports/java/tomcat6/Portfile	2009-07-28 22:22:00 UTC (rev 54508)
@@ -4,6 +4,7 @@
 
 name				tomcat6
 version				6.0.18
+revision			1
 
 categories			java www
 maintainers			ricci openmaintainer
@@ -51,8 +52,6 @@
 					port:jaxen \
 					port:saxpath
 				
-## worksrcdir			${distname}
-
 set javaLibs		${prefix}/share/java
 set home			share/java/tomcat6
 set tomcatuser		www
@@ -92,11 +91,6 @@
 
 build.args			$antArgs
 
-## # Remove compatibility for pre-JRE 1.5 systems
-## variant nocompat {
-## 	build.target-delete compat
-## }
-
 pre-build {
 	#
 	# Tomcat in this version requires ant 1.6.5.
@@ -133,10 +127,7 @@
 	
 	# Install Tomcat
 	ui_msg "# installing tomcat..."
-## 	file copy ${worksrcpath}/bin/ ${destroot}/${prefix}/bin
-## 	file copy ${worksrcpath}/bin ${target}
-##  	system "cd ${worksrcpath} &&  ant $antArgs deploy"
- 	system "cd ${worksrcpath} &&  ant $antArgs deploy"
+ 	system "cd ${worksrcpath} && ant $antArgs deploy"
 	## build space:
  	file copy ${worksrcpath}/output/build/bin ${target}
  	file copy ${worksrcpath}/output/build/conf ${target}
@@ -146,11 +137,6 @@
 	## and classes:
  	file copy ${worksrcpath}/output/classes ${target}/shared/
 	
-## 	# Add compat files as needed
-## 	if { ! [variant_isset nocompat] } {
-## 		system "tar -cf - -C ${worksrcpath}/compat . | tar xpf - -C ${target}"
-## 	}
-	
 	# Add the jstl libs to tomcat6/shared/lib so that they're available to all
 	ui_msg "# adding the jstl libs "
 	xinstall -m 755 -d ${target}/shared/lib
@@ -185,11 +171,6 @@
 		${filespath}/setenv.local \
 		${target}/conf
 	
-	# Don't install startup script, as we're now generating a startupitem
-	#xinstall -m 755 ${filespath}/tomcat6.sh \
-	#	${destroot}${prefix}/etc/rc.d
-	#reinplace s|TOMCATPREFIX=$|TOMCATPREFIX=${prefix}/${home}| ${destroot}${prefix}/etc/rc.d/tomcat6.sh
-		
 	# Add a symlink from bin directory to tomcatctl
 	system "cd ${destroot}${prefix}/bin && ln -s ../${home}/bin/tomcatctl"
 	
@@ -241,7 +222,7 @@
 	ui_msg "#"
 	ui_msg "# Under Apple Java, control over the Java version used to launch ${name} is"
 	ui_msg "# through the shell variable JAVA_JVM_VERSION. This variable should be set"
-	ui_msg "# to a java version such as 1.4, 1.5, or CurrentJDK (for the default version)."
+	ui_msg "# to a java version such as 1.5, 1.6, or CurrentJDK (for the default version)."
 	ui_msg "# You may set JAVA_JVM_VERSION in ${prefix}/${home}/bin/setenv.sh."
 	ui_msg "#"
 }

Modified: trunk/dports/java/tomcat6/files/setenv.sh
===================================================================
--- trunk/dports/java/tomcat6/files/setenv.sh	2009-07-28 21:53:16 UTC (rev 54507)
+++ trunk/dports/java/tomcat6/files/setenv.sh	2009-07-28 22:22:00 UTC (rev 54508)
@@ -22,9 +22,6 @@
 	# Set JAVA_JVM_VERSION and JAVA_HOME for Darwin
 	if [ `uname -s` = "Darwin" ]; then
 	
-		# To specify that a particular Java version be run, set it here
-		#export JAVA_JVM_VERSION=1.5
-	
 		# Look for a java version specified by JAVA_JVM_VERSION, falling back to current version
 		# Set JAVA_HOME to reflect the version
 		for jversion in $JAVA_JVM_VERSION CurrentJDK ; do

Modified: trunk/dports/java/tomcat6/files/tomcat6.sh
===================================================================
--- trunk/dports/java/tomcat6/files/tomcat6.sh	2009-07-28 21:53:16 UTC (rev 54507)
+++ trunk/dports/java/tomcat6/files/tomcat6.sh	2009-07-28 22:22:00 UTC (rev 54508)
@@ -4,10 +4,10 @@
 
 case "$1" in
 start)
-	[ -x ${TOMCATCTL} ] && ${TOMCATCTL} start > /dev/null && echo -n ' tomcat5'
+	[ -x ${TOMCATCTL} ] && ${TOMCATCTL} start > /dev/null && echo -n ' tomcat6'
 	;;
 stop)
-	[ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop > /dev/null && echo -n ' tomcat5'
+	[ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop > /dev/null && echo -n ' tomcat6'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2

Modified: trunk/dports/java/tomcat6/files/tomcatctl
===================================================================
--- trunk/dports/java/tomcat6/files/tomcatctl	2009-07-28 21:53:16 UTC (rev 54507)
+++ trunk/dports/java/tomcat6/files/tomcatctl	2009-07-28 22:22:00 UTC (rev 54508)
@@ -50,7 +50,7 @@
 [ -z "$CATALINA_BASE" ]     	&& CATALINA_BASE="${CATALINA_HOME}"
 [ -z "$CATALINA_TMPDIR" ]   	&& CATALINA_TMPDIR="${CATALINA_BASE}/temp"
 
-[ -z "$TOMCAT_PIDNAME" ]    	&& TOMCAT_PIDNAME="tomcat5.pid"
+[ -z "$TOMCAT_PIDNAME" ]    	&& TOMCAT_PIDNAME="tomcat6.pid"
 [ -z "$TOMCAT_PIDFILE" ]    	&& TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
 [ -z "$TOMCAT_USER" ]       	&& TOMCAT_USER=tomcat
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090728/7dfc2f91/attachment.html>