--- build.xml	2007-05-15 11:29:45.000000000 -0400
+++ portage/www-servers/tomcat-6.0.13/work/apache-tomcat-6.0.13-src/build.xml	2007-05-15 11:41:46.000000000 -0400
@@ -96,6 +96,7 @@
       <classpath refid="tomcat.classpath" />
       <exclude name="org/apache/tomcat/util/net/puretls/**" />
       <exclude name="org/apache/naming/factory/webservices/**" />
+      <exclude name="javax/servlet/**" />
     </javac>
     <tstamp>
       <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
@@ -135,27 +136,27 @@
       </fileset>
     </jar>
 
-    <!-- Servlet 2.5 Implementation JAR File -->
+    <!-- Servlet 2.5 Implementation JAR File
     <jar  jarfile="${servlet-api.jar}">
       <fileset dir="${tomcat.classes}">
         <include name="javax/servlet/*" />
         <include name="javax/servlet/http/*" />
         <include name="javax/servlet/resources/*" />
-        <!-- Javadoc and i18n exclusions -->
         <exclude name="**/package.html" />
         <exclude name="**/LocalStrings_*" />
       </fileset>
     </jar>
+    -->
 
-    <!-- JSP 2.1 Implementation JAR File -->
+    <!-- JSP 2.1 Implementation JAR File
     <jar  jarfile="${jsp-api.jar}">
       <fileset dir="${tomcat.classes}">
         <include name="javax/servlet/jsp/**" />
-        <!-- Javadoc and i18n exclusions -->
         <exclude name="**/package.html" />
         <exclude name="**/LocalStrings_*" />
       </fileset>
     </jar>
+    -->
 
     <!-- JSP 2.1 EL Implementation JAR File -->
     <jar  jarfile="${el-api.jar}">
@@ -302,7 +303,7 @@
 
   </target>
 
-  <target name="build-docs">
+  <target name="build-docs" unless="nobuild.docs">
 
     <copy todir="${tomcat.build}/webapps">
       <fileset dir="webapps">
@@ -453,11 +454,16 @@
 
   <target name="deploy" depends="build-only,build-docs">
 
+<!--
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
             file="${tomcat-native.tar.gz}" />
+-->
 
     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+
+<!--
     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
+-->
 
   	<!-- Copy scripts -->
     <copy todir="${tomcat.build}/bin">
@@ -494,7 +500,7 @@
              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              optimize="${compile.optimize}"
-    	     classpath="${tomcat.classes}"
+    	     classpath="${tomcat.classes}:${jsp-api.jar}"
              excludes="**/CVS/**,**/.svn/**">
     </javac>
   	
@@ -506,8 +512,10 @@
              excludes="**/CVS/**,**/.svn/**">
     </javac>
 
+<!--
   	<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
     <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
+-->
 
   </target>