From 6e083f28fc54ab90bd2c2d2ba3b431cffb85b5d1 Mon Sep 17 00:00:00 2001
From: Minto van der Sluis <misl@opensde.org>
Date: Mon, 27 Aug 2007 12:28:31 +0200
Subject: [PATCH] Updated apache-ant (1.6.5 -> 1.7.0)

- Updating package
- added patch to prevent running junit test cases (circular dependency)
- Appears not to build with jukes, so removed that section from .conf
---
 java/apache-ant/apache-ant.conf  |  6 ------
 java/apache-ant/apache-ant.desc  |  4 ++--
 java/apache-ant/skip-junit.patch | 11 +++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 java/apache-ant/skip-junit.patch

diff --git a/java/apache-ant/apache-ant.conf b/java/apache-ant/apache-ant.conf
index f97b223aa..c35a005ea 100644
--- a/java/apache-ant/apache-ant.conf
+++ b/java/apache-ant/apache-ant.conf
@@ -13,11 +13,6 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-# Use jikes for faster compilation if it is available.
-if pkginstalled jikes; then
-	export ANT_OPTS="-Dbuild.compiler=jikes -Djavac.source=1.3"
-fi
-
 # Check if a java development kit was installed.
 if [ -z $JAVA_HOME ]; then
 	abort "JDK required for building $pkg"
@@ -30,7 +25,6 @@ set_confopt
 
 # Custom package building and installation.
 ant_postmake() {
-	# Todo check return value (building and installation success?).
 	# The next command will start the build and when finished
 	# it will automatically install the new build in ANT_HOME
 	./build.sh install
diff --git a/java/apache-ant/apache-ant.desc b/java/apache-ant/apache-ant.desc
index 4062c43a1..de8392071 100644
--- a/java/apache-ant/apache-ant.desc
+++ b/java/apache-ant/apache-ant.desc
@@ -28,10 +28,10 @@
 
 [L] APL
 [S] Stable
-[V] 1.6.5
+[V] 1.7.0
 [P] X -----5---9 300.000
 
 [O] . $base/package/*/*/java-conf.in NO_AUTO_DETECT
 
-[D] 438470393 apache-ant-1.6.5-src.tar.bz2 http://www.apache.org/dist/ant/source/
+[D] 3541490080 apache-ant-1.7.0-src.tar.bz2 http://www.apache.org/dist/ant/source/
 
diff --git a/java/apache-ant/skip-junit.patch b/java/apache-ant/skip-junit.patch
new file mode 100644
index 000000000..81e399c12
--- /dev/null
+++ b/java/apache-ant/skip-junit.patch
@@ -0,0 +1,11 @@
+--- apache-ant-1.7.0.orig/build.xml	2006-12-13 13:16:25.000000000 +0100
++++ apache-ant-1.7.0/build.xml	2007-08-27 11:47:52.000000000 +0200
+@@ -924,7 +924,7 @@
+        ===================================================================
+   -->
+   <target name="dist-lite"
+-    depends="jars,test-jar"
++    depends="jars"
+     description="--> creates a minimum distribution to run Apache Ant">
+ 
+     <mkdir dir="${dist.dir}"/>