From f210e54331d3599fef6d03d2ed4d76c2be7cadf9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 25 Sep 2014 22:42:16 -0300 Subject: apache-ant: updating revision from Arch and jdk.sh has been replaced by jre.sh to get the JAVA_HOME env var -> https://wiki.parabolagnulinux.org/Java#Installation --- libre/apache-ant/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre/apache-ant/PKGBUILD') diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index 4fba0fcb2..d220586f8 100644 --- a/libre/apache-ant/PKGBUILD +++ b/libre/apache-ant/PKGBUILD @@ -11,7 +11,7 @@ url="http://ant.apache.org/" replaces=("$pkgname-libre") conflicts=("$pkgname-libre") -pkgrel=1.parabola1 +pkgrel=2.parabola1 arch=('any') depends=('java-environment') makedepends=('jh') @@ -77,14 +77,14 @@ build() { ln -sfv "${_jarpath}" lib/optional/${_jarname} done # Build - source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var + source "/etc/profile.d/jre.sh" # Get the JAVA_HOME env var sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist } package() { cd "${srcdir}"/${pkgname}-${pkgver}-bin source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var - source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var + source "/etc/profile.d/jre.sh" # Get the JAVA_HOME env var ## Install profile.d script install -d "${pkgdir}"/etc/profile.d -- cgit v1.2.3