summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-25 22:42:16 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-25 22:57:55 -0300
commitf210e54331d3599fef6d03d2ed4d76c2be7cadf9 (patch)
tree9911c9f50510495e151fd31977a79b836c3eac42
parente93873ac5805f3e97597c3b75821632b2466847f (diff)
downloadabslibre-f210e54331d3599fef6d03d2ed4d76c2be7cadf9.tar.gz
abslibre-f210e54331d3599fef6d03d2ed4d76c2be7cadf9.tar.bz2
abslibre-f210e54331d3599fef6d03d2ed4d76c2be7cadf9.zip
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
-rw-r--r--libre/apache-ant/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
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