[69689] trunk/dports/java/tomcat6

[ricci at macports.org]

Revision: 69689
          http://trac.macports.org/changeset/69689
Author:   ricci at macports.org
Date:     2010-07-13 09:04:43 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
upgrade to 6.0.28
refresh patches for 6.0.28

Modified Paths:
--------------
    trunk/dports/java/tomcat6/Portfile
    trunk/dports/java/tomcat6/files/patch-bin-catalina.sh
    trunk/dports/java/tomcat6/files/patch-build.xml.diff

Modified: trunk/dports/java/tomcat6/Portfile
===================================================================
--- trunk/dports/java/tomcat6/Portfile	2010-07-13 16:02:09 UTC (rev 69688)
+++ trunk/dports/java/tomcat6/Portfile	2010-07-13 16:04:43 UTC (rev 69689)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name				tomcat6
-version				6.0.20
+version				6.0.28
 
 categories			java www
 maintainers			ricci openmaintainer
@@ -19,10 +19,10 @@
 distname			apache-tomcat-${version}-src
 master_sites		apache:tomcat/tomcat-6/v${version}/src/
 
-checksums           md5     44f49e7e14028b6a53c3c346bd18c72f \
-                    sha1    ab538484d8d05c83a69c70ab6bf07606282633d8 \
-                    rmd160  65b1b56132c03855e352e44a24b761bccd65b90c
-					
+checksums           md5     fb36ed47cb358006a29e1a86037356df \
+                    sha1    0df5e58518607ff738bbf440d829747df6acb9ce \
+                    rmd160  4a699324f332b8c32fa79615f14681a0fa9924b1
+
 patchfiles			patch-bin-catalina.sh	\
 					patch-build.xml.diff
 
@@ -48,8 +48,9 @@
 					port:jakarta-log4j \
 					port:mx4j \
 					port:junit \
-					port:jaxen \
 					port:saxpath
+
+##					port:jaxen \
 				
 set javaLibs		${prefix}/share/java
 set home			share/java/tomcat6
@@ -84,11 +85,11 @@
 					-Dlog4j.jar=${javaLibs}/jakarta-log4j.jar
 					-Djmx.lib=${javaLibs}
 					-Djunit.jar=${javaLibs}/junit.jar
-					-Djaxen.jar=${javaLibs}/jaxen.jar
 					-Dsaxpath.jar=${javaLibs}/saxpath.jar
 					-Djasper.home=${worksrcpath}/../jasper
 					"]
 #					-Dstruts.lib=${javaLibs}/struts/lib
+##					-Djaxen.jar=${javaLibs}/jaxen.jar
 
 build.args			$antArgs
 

Modified: trunk/dports/java/tomcat6/files/patch-bin-catalina.sh
===================================================================
--- trunk/dports/java/tomcat6/files/patch-bin-catalina.sh	2010-07-13 16:02:09 UTC (rev 69688)
+++ trunk/dports/java/tomcat6/files/patch-bin-catalina.sh	2010-07-13 16:04:43 UTC (rev 69689)
@@ -1,7 +1,7 @@
---- bin/catalina.sh.orig	2009-01-02 11:57:54.000000000 -0800
-+++ bin/catalina.sh	2009-01-02 11:58:16.000000000 -0800
-@@ -185,6 +185,11 @@
-   LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+--- bin/catalina.sh.orig	2010-06-29 07:33:40.000000000 -0700
++++ bin/catalina.sh	2010-07-13 08:47:10.000000000 -0700
+@@ -220,6 +220,11 @@
+   JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
  fi
  
 +# Run conf_setup.sh to check and repair the conf directory

Modified: trunk/dports/java/tomcat6/files/patch-build.xml.diff
===================================================================
--- trunk/dports/java/tomcat6/files/patch-build.xml.diff	2010-07-13 16:02:09 UTC (rev 69688)
+++ trunk/dports/java/tomcat6/files/patch-build.xml.diff	2010-07-13 16:04:43 UTC (rev 69689)
@@ -1,11 +1,34 @@
---- build.xml.orig	2008-07-21 17:01:29.000000000 -0700
-+++ build.xml	2009-01-02 17:00:38.000000000 -0800
-@@ -471,7 +471,7 @@
-             file="${tomcat-native.tar.gz}" />
+--- build.xml.orig	2010-06-29 07:33:40.000000000 -0700
++++ build.xml	2010-07-13 08:39:59.000000000 -0700
+@@ -140,6 +140,7 @@
  
-     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
--    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
-+  <!---  <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" /> -->
+     <!-- Compile internal server components -->
+     <javac srcdir="java" destdir="${tomcat.classes}"
++           fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+            source="${compile.source}"
+@@ -531,6 +532,7 @@
  
-   	<!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
+     <!-- Build classes for examples webapp -->
+     <javac   srcdir="webapps/examples/WEB-INF/classes"
++             fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
+              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
+              debug="${compile.debug}" deprecation="${compile.deprecation}"
+              source="${compile.source}"
+@@ -542,6 +544,7 @@
+     </javac>
+ 
+     <javac   srcdir="webapps/examples/jsp/plugin/applet"
++             fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
+              destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
+              debug="${compile.debug}" deprecation="${compile.deprecation}"
+              source="${compile.source}"
+@@ -801,6 +804,7 @@
+     </move>
+     <mkdir dir="${tomcat-dbcp.home}/classes"/>
+     <javac destdir="${tomcat-dbcp.home}/classes"
++           fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
+            optimize="off"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100713/5837073a/attachment.html>