Only in build/svn/macports/macports-trunk/dports/java/tomcat6/: .svn
diff -r -U2 -x entries build/svn/macports/macports-trunk/dports/java/tomcat6/Portfile build/ports/java/tomcat6/Portfile
--- build/svn/macports/macports-trunk/dports/java/tomcat6/Portfile	2009-06-25 15:42:35.000000000 +0200
+++ build/ports/java/tomcat6/Portfile	2009-07-12 09:48:02.000000000 +0200
@@ -4,5 +4,5 @@
 
 name				tomcat6
-version				6.0.18
+version				6.0.20
 
 categories			java www
@@ -19,8 +19,7 @@
 master_sites		apache:tomcat/tomcat-6/v${version}/src/
 
-checksums           md5     9bdbb1c1d79302c80057a70b18fe6721 \
-                    sha1    9182b0d6b2d0cb2d60f04be6211f3b3516bc518e \
-                    rmd160  ef85db0d65a4f3bdd3ca821420d06535050b6a93
-
+checksums		md5	44f49e7e14028b6a53c3c346bd18c72f \
+			sha1	ab538484d8d05c83a69c70ab6bf07606282633d8 \
+			rmd160	65b1b56132c03855e352e44a24b761bccd65b90c
 					
 patchfiles			patch-bin-catalina.sh	\
@@ -64,4 +63,6 @@
 build.target		download 
 set antArgs		 [join "
+					-Dversion=${version}
+					-Dversion.build=[lindex [split ${version} .] 2]
 					-Dbase.path=${worksrcpath}/Repository
 					-Dnsis.exe=${worksrcpath}/.bogus
diff -r -U2 -x entries build/svn/macports/macports-trunk/dports/java/tomcat6/files/tomcatctl build/ports/java/tomcat6/files/tomcatctl
--- build/svn/macports/macports-trunk/dports/java/tomcat6/files/tomcatctl	2009-06-25 15:42:35.000000000 +0200
+++ build/ports/java/tomcat6/files/tomcatctl	2009-07-11 12:20:13.000000000 +0200
@@ -51,5 +51,5 @@
 [ -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