Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=fd895fec277c041de03e4ee12313cf54b2349793

commit fd895fec277c041de03e4ee12313cf54b2349793
Author: Marius Cirsta <mcir...@frugalware.org>
Date:   Sat Jul 14 18:09:33 2012 +0000

apache-ant-1.8.4-2-x86_64

* rebuild with optional junit, needed by new lucene

diff --git a/source/devel-extra/apache-ant/FrugalBuild 
b/source/devel-extra/apache-ant/FrugalBuild
index a8ce579..894e4a8 100644
--- a/source/devel-extra/apache-ant/FrugalBuild
+++ b/source/devel-extra/apache-ant/FrugalBuild
@@ -3,27 +3,27 @@

pkgname=apache-ant
pkgver=1.8.4
-pkgrel=1
+pkgrel=2
pkgdesc="Ant is a Java-based build tool."
url="http://ant.apache.org";
groups=('devel-extra')
archs=('i686' 'x86_64')
+Finclude openjava
up2date="lynx -dump $url/srcdownload.cgi|grep bz2$|sed 's/.*-\(.*\)-.*/\1/'"
-source=(http://www.apache.org/dist/ant/source/apache-ant-$pkgver-src.tar.gz)
-signatures=($source.asc)
-_F_java_no_gcj=1
-Finclude java
-depends=('openjre')
-makedepends=('openjdk')
+#we need to boostrap this with binary junit as junit depends on this
+#this should be kept in sync with junit version
+junit_ver="4.10"
+source=(http://www.apache.org/dist/ant/source/apache-ant-$pkgver-src.tar.gz \
+       https://github.com/downloads/KentBeck/junit/junit-${junit_ver}.jar)
+signatures=($source.asc '')

build()
{
Fcd
export ANT_OPTS="-Xmx512M"
Fjavacleanup
-
-       # no java 1.2, thx
-       Fsed '1\.2' '1.3' build.xml
+
+       mv ../junit-${junit_ver}.jar ./lib/optional/junit.jar || Fdie

# disable junit as it depends on stuff that requires ant
Fsed "depends=\"jars,test-jar\"" "depends=\"jars\"" build.xml
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to