Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

Conflicts:
	x11-libs/wine/HISTORY

4 files changed, 18 insertions, 19 deletions

diff --git a/java/ant/DETAILS b/java/ant/DETAILS
index ee3846a9b2..c5a97ad624 100755
--- a/java/ant/DETAILS
+++ b/java/ant/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ant
-         VERSION=1.7.1
+         VERSION=1.8.2
           SOURCE=apache-$SPELL-$VERSION-src.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION
    SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE
    SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
-     SOURCE_HASH=sha512:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc
+     SOURCE_HASH=sha512:d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c
       LICENSE[0]=APACHE
         WEB_SITE=http://ant.apache.org/
         KEYWORDS="java"
diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD
index 5c5cb06d8f..0460c7c3d7 100755
--- a/java/ant/PRE_BUILD
+++ b/java/ant/PRE_BUILD
@@ -3,5 +3,5 @@ cd $SOURCE_DIRECTORY  &&
 
 # fix bugs #13749 and #3230 : removing junit task if not installed
 if ! spell_ok junit; then
-	patch -p0 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
+	patch -p1 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
 fi
diff --git a/java/ant/ant-buildfile-junit.patch b/java/ant/ant-buildfile-junit.patch
index 21a4a0de3b..eea64e706d 100644
--- a/java/ant/ant-buildfile-junit.patch
+++ b/java/ant/ant-buildfile-junit.patch
@@ -1,11 +1,11 @@
---- build.xml.old       2008-08-30 13:59:52.000000000 +0200
-+++ build.xml   2008-08-30 14:00:00.000000000 +0200
-@@ -925,7 +925,7 @@
-        ===================================================================
-   -->
-   <target name="dist-lite"
--    depends="jars,test-jar"
-+    depends="jars"
-     description="--> creates a minimum distribution to run Apache Ant">
-
-     <mkdir dir="${dist.dir}"/>
+--- apache-ant-1.8.2/build.xml.orig	2011-03-16 11:53:17.304405762 +0100
++++ apache-ant-1.8.2/build.xml	2011-03-16 11:53:50.674255313 +0100
+@@ -791,7 +791,7 @@
+        ===================================================================

+   -->

+   <target name="dist-lite"

+-    depends="jars,test-jar"

++    depends="jars"

+     description="--> creates a minimum distribution to run Apache Ant">

+ 

+     <mkdir dir="${dist.dir}"/>

diff --git a/java/antlr/DETAILS b/java/antlr/DETAILS
index 43edfbdc7b..594a287d5c 100755
--- a/java/antlr/DETAILS
+++ b/java/antlr/DETAILS
@@ -1,11 +1,10 @@
            SPELL=antlr
-         VERSION=2.7.7
+         VERSION=3.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://antlr2.org/download/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-#     SOURCE_HASH=sha512:4f37f77223af918b95c5649a9c24eacc87c806c3c926271bd04e67f3daddcb273e944eb56b5754ce1a7898e00d9e63ad44470860708b60c3de4465281f705ba8
+   SOURCE_URL[0]=http://www.antlr.org/download/${SOURCE}
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+     SOURCE_HASH=sha512:d45c6e6d20bdab04272ef8baf465443226d203eb7e9ac77bb2699f824261c08e721cef58b523bf4c4b2537bdc3a3d197e12929593019a82c7943a248e46d7c9b
       LICENSE[0]=PD
         KEYWORDS="java"
         WEB_SITE=http://antlr2.org/