From ffb185fcad6c5b78fd98a9c67bdebeb8eb4ad307 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 31 Mar 2019 12:13:17 +0200
Subject: [PATCH] ant_core: bump version.

---
 ...re-1.9.2.recipe => ant_core-1.10.5.recipe} | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)
 rename dev-java/ant_core/{ant_core-1.9.2.recipe => ant_core-1.10.5.recipe} (75%)

diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.10.5.recipe
similarity index 75%
rename from dev-java/ant_core/ant_core-1.9.2.recipe
rename to dev-java/ant_core/ant_core-1.10.5.recipe
index 35606eec4..71012fac6 100644
--- a/dev-java/ant_core/ant_core-1.9.2.recipe
+++ b/dev-java/ant_core/ant_core-1.10.5.recipe
@@ -18,14 +18,17 @@ dependency management can use Ant in combination with Apache Ivy.
 The Apache Ant project is part of the Apache Software Foundation.
 "
 HOMEPAGE="http://ant.apache.org/"
-COPYRIGHT="1999-2013 The Apache Software Foundation"
+COPYRIGHT="1999-2018 The Apache Software Foundation"
 LICENSE="Apache v2"
 REVISION="1"
-SOURCE_URI="http://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2"
-CHECKSUM_SHA256="cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3"
+SOURCE_URI="http://archive.apache.org/dist/ant/source/apache-ant-$portVersion-src.tar.bz2"
+CHECKSUM_SHA256="71a5cdd45a54901b6321d5a140d882f7580c38f766a4e4959bcc36555da9f3ac"
 SOURCE_DIR="apache-ant-$portVersion"
 
 ARCHITECTURES="any"
+GLOBAL_WRITABLE_FILES="
+	settings/etc/ant.conf auto-merge
+	"
 
 PROVIDES="
 	ant_core = $portVersion compat >= 1
@@ -33,15 +36,13 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:java
+	java:environment >= 8
 	"
 
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	cmd:java
-	cmd:java_config
-	cmd:javac
+	java:environment == 8
 	"
 
 PATCH()
@@ -51,22 +52,24 @@ PATCH()
 
 BUILD()
 {
-	export JAVA_HOME=$(java-config -H)
+	source /system/data/profile.d/openjdk8.sh
+	export PATH=$JDK8_HOME/bin:$PATH
 	ANT_HOME= ./build.sh
 }
 
 INSTALL()
 {
-	export JAVA_HOME=$(java-config -H)
+	source /system/data/profile.d/openjdk8.sh
+	export JAVA_HOME=$JDK8_HOME
 	export ANT_HOME=$libDir/ant
 	./build.sh install-lite
 
 	# symlink the executable to binDir
 	mkdir -p $binDir
-	symlinkRelative -s $ANT_HOME/bin/ant $binDir
+	ln -s $ANT_HOME/bin/ant $binDir
 
-	# create a profile.d file that sets up ANT_HOME
-	mkdir -p $dataDir/profile.d
-	echo ANT_HOME=$ANT_HOME > $dataDir/profile.d/ant.sh
-	echo "export ANT_HOME" >> $dataDir/profile.d/ant.sh
+	mkdir -p $settingsDir/etc
+	echo ANT_HOME=$ANT_HOME > $settingsDir/etc/ant.conf
+	
+	rm $ANT_HOME/bin/*{.bat,.cmd}
 }