diff options
| -rw-r--r-- | java/apache-ant/PKGBUILD | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD index 77e0dfe94..80a75335e 100644 --- a/java/apache-ant/PKGBUILD +++ b/java/apache-ant/PKGBUILD @@ -3,27 +3,28 @@ # Contributor: Andrew Wright <andreww@photism.org> pkgname=apache-ant -pkgver=1.8.4 +pkgver=1.9.1 +pkgdesc="A Java-based build tool" +license=('Apache' 'custom:BSD3') +url="http://ant.apache.org/" provides=("apache-ant-libre=$pkgver") replaces=("apache-ant-libre") conflicts=("apache-ant-libre") -pkgrel=1.1 -pkgdesc="A Java-based build tool" +pkgrel=1 arch=('any') -license=('Apache') -url="http://ant.apache.org/" +depends=('java-environment') + _mirror=http://archive.apache.org/dist source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2 ${pkgname}.sh ${pkgname}.csh) -depends=('java-environment') # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies declare -A _opts _opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar' _opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar' -_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar' +_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar' #_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar' #_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar' _opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar' @@ -49,6 +50,7 @@ _opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logg for pkg in "${!_opts[@]}"; do optdepends+=("$pkg: ${_opts[$pkg]%;*}") makedepends+=("$pkg") + _jars+="${_opts[$pkg]#*;} " done build() { @@ -59,9 +61,9 @@ build() { mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin cd "${srcdir}"/${pkgname}-${pkgver} - # Symlink to external optional libraries - for jar in ${_opts[@]#*;}; do - ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}` + # Symlink to external optional libraries/ + for jar in $_jars; do + ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}` done # Build source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var @@ -87,8 +89,8 @@ package() { # Fix python2 path sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py # Symlink to external optional libraries - for jar in ${_opts[@]#*;}; do - ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}` + for jar in $_jars; do + ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}` done ## Symlink the /opt distribution to the normal places @@ -105,6 +107,6 @@ package() { ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname} } -md5sums=('c474fa9d0c35a24037c23b6e476862c1' +md5sums=('39771fd8b4ba87cd77ff6f27001cce4e' 'bd63c881be406f515fc4d22635e8326a' 'aaa615512cbe1ed7f3b62c1ff46802f8') |