diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-06-07 00:01:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-06-07 00:01:32 -0400 |
| commit | 7d9fd819184077488278e847462415e80abb7c40 (patch) | |
| tree | fd85d889019f3625733a6de952bc5d50d7d8a72f /libre | |
| parent | ea038dc643b579f1bb3cb35d26cb3c7a9cd7f4b1 (diff) | |
update libre/apache-ant to 1.8.4
Also, get JAVA_HOME from /`etc/profile.d/jdk.sh'. It must be set to
compile, but it was only sometimes set (with makepkg it would inherit from
the environment, with libremakepkg it wouldn't be set, but would if you
added -cu, which reinstalled the JDK before compiling)
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/apache-ant/PKGBUILD | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index 47e539085..77e0dfe94 100644 --- a/libre/apache-ant/PKGBUILD +++ b/libre/apache-ant/PKGBUILD @@ -3,13 +3,13 @@ # Contributor: Andrew Wright <andreww@photism.org> pkgname=apache-ant -pkgver=1.8.2 +pkgver=1.8.4 provides=("apache-ant-libre=$pkgver") replaces=("apache-ant-libre") conflicts=("apache-ant-libre") -pkgrel=4.3 +pkgrel=1.1 pkgdesc="A Java-based build tool" arch=('any') license=('Apache') @@ -64,12 +64,14 @@ build() { ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}` done # Build + source "/etc/profile.d/jdk.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 "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var + source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var ## Install profile.d script install -d "${pkgdir}"/etc/profile.d @@ -103,6 +105,6 @@ package() { ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname} } -md5sums=('0d9e108afcd15b820150b8085c96d2b1' +md5sums=('c474fa9d0c35a24037c23b6e476862c1' 'bd63c881be406f515fc4d22635e8326a' 'aaa615512cbe1ed7f3b62c1ff46802f8') |