update apache-ant, move it (and dependencies) from [java] to [libre]

12 files changed, 41 insertions, 46 deletions

diff --git a/java/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index de5262698..a17f070ae 100644
--- a/java/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Giorgidze <giorgidze (at) gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -10,12 +10,19 @@ pkgdesc="ANother Tool for Language Recognition"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=4.1
+pkgrel=5.1 # newer than Arch's 2.7.7-5
 arch=('i686' 'x86_64')
+options=('staticlibs')
 makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
+md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
+         '78af3de823003f6d8dded39c70bc30ae'
+         '78e9bf86bd44722f232f80bc7b04dcfe'
+         '158677e4c0f357afbb56656231a54815'
+         '0d1960d27ff81f2fea0dd35a8290216f')
 
 build() {
   cd "${srcdir}/antlr-${pkgver}"
@@ -91,9 +98,3 @@ package_antlr2-sharp() {
 
   _install_license
 }
-
-md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
-         '78af3de823003f6d8dded39c70bc30ae'
-         '78e9bf86bd44722f232f80bc7b04dcfe'
-         '158677e4c0f357afbb56656231a54815'
-         '0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch
index 15e25fb00..15e25fb00 100644
--- a/java/antlr2/gcc4.4.patch
+++ b/libre/antlr2/gcc4.4.patch
diff --git a/java/antlr2/mono.patch b/libre/antlr2/mono.patch
index 59c78d811..59c78d811 100644
--- a/java/antlr2/mono.patch
+++ b/libre/antlr2/mono.patch
diff --git a/java/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
index aebc9dfa7..aebc9dfa7 100644
--- a/java/antlr2/runantlr2.sh
+++ b/libre/antlr2/runantlr2.sh
diff --git a/java/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index ae8967a2f..1883b7682 100644
--- a/java/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.9.2
+pkgver=1.9.3
 pkgdesc="A Java-based build tool"
 license=('Apache' 'custom:BSD3')
 url="http://ant.apache.org/"
@@ -12,7 +12,7 @@ provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=3.2 # newer than Arch's 1.9.2-3
+pkgrel=2.1 # newer than Arch's 1.9.3-2
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
@@ -20,6 +20,9 @@ makedepends=('jh')
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
+md5sums=('995f21618acdf35beacc465c84d79534'
+         'bd63c881be406f515fc4d22635e8326a'
+         'aaa615512cbe1ed7f3b62c1ff46802f8')
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 # The format is:
@@ -40,7 +43,7 @@ _library_dependencies=(
   #tcljava.jar:'TCL with <script> task':???????:???????
   beanshell.jar:'BeanShell with <script> task':'beanshell>=1.3':/usr/share/java/bsh.jar
   jruby.jar:'Ruby with <script> task':jruby:/opt/jruby/lib/jruby.jar
-  #judo.jar:Judoscript with <script> task:???????:??????
+  #judo.jar:'Judoscript with <script> task':???????:??????
   commons-logging.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging/commons-logging.jar
   #log4j.jar:'Log4jListener':???????:???????
   commons-net.jar:'<ftp>, <rexec> and <telnet> tasks':'java-commons-net1>=1.4.0':/usr/share/java/commons-net.jar
@@ -48,9 +51,7 @@ _library_dependencies=(
   mail.jar:'<mimemail> task, mime encoding with <mail>':java-gnumail:/usr/share/java/gnumail.jar
   activation.jar:'<mimemail> task, mime encoding with <mail>':java-activation-gnu:/usr/share/java/activation.jar
   jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar
-# FIXME: When FS#38243 is fixed, 'xerces2-java' should be changed to 'java-resolver'.
-# We use xerces in the mean time because xalan depends on it.
-  resolver.jar:"external files for 'xmlcatalog' datatype":xerces2-java:/usr/share/java/resolver.jar
+  resolver.jar:"external files for 'xmlcatalog' datatype":java-resolver:/usr/share/java/resolver.jar
   jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
   #jai.jar:'<image> task':???????:???????
 )
@@ -81,14 +82,6 @@ build() {
   sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
 }
 
-# Create a relative symlink
-_rellink() {
-  local src=$1
-  local dst=$2
-  mkdir -p "${pkgdir}/${dst%/*}"
-  ln -sfv "$(realpath -m "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}-bin
   source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
@@ -111,7 +104,7 @@ package() {
   local _dep _jarname _desc _pkgname _jarpath
   for _dep in "${_library_dependencies[@]}"; do
     IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
-    _rellink "${_jarpath}" "${ANT_HOME}/lib/${_jarname}"
+    ln -svfr "${pkgdir}/${_jarpath}" "${pkgdir}${ANT_HOME}/lib/${_jarname}"
   done
 
   ## Symlink the /opt distribution to the normal places
@@ -121,22 +114,21 @@ package() {
   for pom in *.pom; do
     a=${pom%.pom}
     base=$(jh mvn-basename org.apache.ant $a $pkgver)
-    _rellink "${ANT_HOME}/lib/$a.pom" "${base}.pom"
-    _rellink "${ANT_HOME}/lib/$a.jar" "${base}.jar"
+    install -d "${pkgdir}/${base%/*}"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.pom" "${pkgdir}/${base}.pom"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.jar" "${pkgdir}/${base}.jar"
   done
 
   cd "${pkgdir}"/${ANT_HOME}/bin
+  install -d "${pkgdir}"/usr/bin
   local prog
   for prog in *; do
-    _rellink "${ANT_HOME}/bin/$prog" "/usr/bin/$prog"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/bin/$prog" "${pkgdir}/usr/bin/$prog"
   done
-  _rellink "${ANT_HOME}/README"   "/usr/share/doc/${pkgname}/README"
-  _rellink "${ANT_HOME}/WHATSNEW" "/usr/share/doc/${pkgname}/WHATSNEW"
-  _rellink "${ANT_HOME}/docs"     "/usr/share/doc/${pkgname}/html"
-  _rellink "${ANT_HOME}/LICENSE"  "/usr/share/licenses/${pkgname}/LICENSE"
-  _rellink "${ANT_HOME}/NOTICE"   "/usr/share/licenses/${pkgname}/NOTICE"
+  install -d "${pkgdir}"/usr/share/{doc,licenses}/${pkgname}
+  ln -sfvr "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/docs"     "${pkgdir}/usr/share/doc/${pkgname}/html"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
 }
-
-md5sums=('8f610c1a0183507c2beebbf230f456af'
-         'bd63c881be406f515fc4d22635e8326a'
-         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
index fdc04b2f8..fdc04b2f8 100644
--- a/java/apache-ant/apache-ant.csh
+++ b/libre/apache-ant/apache-ant.csh
diff --git a/java/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh
index 6e4809da5..6e4809da5 100644
--- a/java/apache-ant/apache-ant.sh
+++ b/libre/apache-ant/apache-ant.sh
diff --git a/java/jakarta-oro/PKGBUILD b/libre/jakarta-oro/PKGBUILD
index 24f7a2772..18e0ade64 100644
--- a/java/jakarta-oro/PKGBUILD
+++ b/libre/jakarta-oro/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Rationale: Build dependency of apache-ant
 
 pkgname=jakarta-oro
 pkgver=2.0.8
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Java regular expression and text-processing library"
 arch=('any')
 url="https://jakarta.apache.org/oro"
diff --git a/java/java-commons-bsf2/PKGBUILD b/libre/java-commons-bsf2/PKGBUILD
index 57a9dfc1a..2f00b024b 100644
--- a/java/java-commons-bsf2/PKGBUILD
+++ b/libre/java-commons-bsf2/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of apache-ant
 
 pkgname=java-commons-bsf2
 pkgver=2.4.0
@@ -6,7 +7,7 @@ url="https://commons.apache.org/proper/commons-bsf/"
 license=('Apache')
 pkgdesc="Bean Scripting Framework"
 
-pkgrel=1
+pkgrel=1.1
 arch=('any')
 depends=('java-commons-logging')
 makedepends=('apache-ant')
@@ -24,11 +25,8 @@ _opts[java-rhino]="/usr/share/java/js.jar"
 _opts[xalan-java]="/usr/share/java/xalan.jar"
 _opts[junit]="/usr/share/java/junit.jar"
 
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg")
-  makedepends+=("$pkg")
-  _jars+="${_opts[$pkg]} "
-done
+optdepends+=("${!_opts[@]}")
+makedepends+=("${!_opts[@]}")
 
 prepare() {
   cd "${srcdir}/bsf-${pkgver}"
@@ -38,7 +36,8 @@ prepare() {
 build() {
   cd "${srcdir}/bsf-${pkgver}"
 
-  for jar in $_jars; do
+  local jar
+  for jar in "${_opts[@]}"; do
 	  ln -s "$jar" lib/
   done
 
diff --git a/java/junit/PKGBUILD b/libre/junit/PKGBUILD
index 04dbcb2ac..5c10cc43f 100644
--- a/java/junit/PKGBUILD
+++ b/libre/junit/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+# Rationale: Arch version isn't built from source.
 
 pkgname=junit
 pkgver=4.11
@@ -7,12 +8,12 @@ pkgdesc="Automated testing framework for Java"
 url="http://www.junit.org/"
 license=('CPL')
 
-pkgrel=3.2
+pkgrel=3.3
 arch=('any')
 depends=('java-runtime' 'java-hamcrest')
 makedepends=('apache-ant' 'jakarta-oro' 'jh')
 
-source=("libre://$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
 
 mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
diff --git a/java/nant/PKGBUILD b/libre/nant/PKGBUILD
index f57c8519f..9f62c70dd 100644
--- a/java/nant/PKGBUILD
+++ b/libre/nant/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of antlr2
 
 pkgname=nant
 pkgver=0.92
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A free .NET build tool"
 arch=('i686' 'x86_64')
 url="http://nant.sourceforge.net"
diff --git a/java/nant/mono3.patch b/libre/nant/mono3.patch
index 94518d6cd..94518d6cd 100644
--- a/java/nant/mono3.patch
+++ b/libre/nant/mono3.patch