diff options
Diffstat (limited to 'libre/apache-ant')
| -rw-r--r-- | libre/apache-ant/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/apache-ant/apache-ant.csh | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index b6b429442..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.2 +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' - '298e8ba2e99ccda7706113ea37e030f2') + 'aaa615512cbe1ed7f3b62c1ff46802f8') diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh index 490a17b65..fdc04b2f8 100644 --- a/libre/apache-ant/apache-ant.csh +++ b/libre/apache-ant/apache-ant.csh @@ -1,3 +1,2 @@ #!/bin/csh -setenv ANT_HOME /usr/share/java/apache-ant -setenv PATH ${PATH}:${ANT_HOME}/bin +setenv ANT_HOME /opt/apache-ant |