Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=ce9128c287c63551031a1de34449d9cb839619c6
commit ce9128c287c63551031a1de34449d9cb839619c6 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Aug 23 14:46:22 2010 +0200 apache-ant-1.8.1-1-i686 - version bump diff --git a/source/devel-extra/apache-ant/FrugalBuild b/source/devel-extra/apache-ant/FrugalBuild index 3126d73..1f5be41 100644 --- a/source/devel-extra/apache-ant/FrugalBuild +++ b/source/devel-extra/apache-ant/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna <vmik...@frugalware.org> pkgname=apache-ant -pkgver=1.7.1 +pkgver=1.8.1 pkgrel=1 pkgdesc="Ant is a Java-based build tool." url="http://ant.apache.org"; @@ -13,11 +13,7 @@ source=(http://www.apache.org/dist/ant/source/apache-ant-$pkgver-src.tar.bz2) signatures=($source.asc) Finclude java depends=('java-gcj-compat>=1.0.68') -if [ "$CARCH" != "ppc" ]; then - makedepends=('ecj' 'gcc-gcj' 'junit') -else - makedepends=('ecj' 'gcc-gcj') -fi +makedepends=('ecj' 'gcc-gcj') build() { @@ -28,10 +24,12 @@ build() # no java 1.2, thx Fsed '1\.2' '1.3' build.xml - if [ "$CARCH" = "ppc" ]; then - Fsed "depends=\"jars,test-jar\"" "depends=\"jars\"" build.xml - fi - CLASSPATH=/usr/share/java/junit.jar ./build.sh -Ddist.dir=dist/ dist || return 1 + # disable junit as it depends on stuff that requires ant + Fsed "depends=\"jars,test-jar\"" "depends=\"jars\"" build.xml + # disable javadoc, gjdoc is known to be broken, but openjdk + # already requires ant + Fsed "depends=\"dist-lite,dist_javadocs\"" "depends=\"dist-lite\"" build.xml + ./build.sh -Ddist.dir=dist/ dist || return 1 Fmkdir /usr/bin /usr/share/doc/$pkgname-$pkgver Fsed '^ANT_LIB=.*' 'ANT_LIB="/usr/share/java"' dist/bin/ant _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
