Fri Dec 27 23:54:04 UTC 2013

7 files changed, 98 insertions, 84 deletions

diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 6fdf7dd29..de5262698 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -6,11 +6,11 @@
 pkgbase=antlr2
 pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
 pkgver=2.7.7
-pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
+pkgdesc="ANother Tool for Language Recognition"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=3.2
+pkgrel=4.1
 arch=('i686' 'x86_64')
 makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
@@ -94,6 +94,6 @@ package_antlr2-sharp() {
 
 md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
          '78af3de823003f6d8dded39c70bc30ae'
-         'e4aa827cf78f97c4e5fae086831192d6'
+         '78e9bf86bd44722f232f80bc7b04dcfe'
          '158677e4c0f357afbb56656231a54815'
          '0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh
index 716f6f887..aebc9dfa7 100644
--- a/java/antlr2/runantlr2.sh
+++ b/java/antlr2/runantlr2.sh
@@ -2,4 +2,4 @@
 echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
 export CLASSPATH
 CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
-java antlr.Tool $*
+java antlr.Tool "$@"
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index dfda3c28d..ae8967a2f 100755
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.9.1
+pkgver=1.9.2
 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
+pkgrel=3.2 # newer than Arch's 1.9.2-3
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
@@ -22,37 +22,45 @@ source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
 
 # 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[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::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'
-#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
-_opts[jython]='Python with <script> task;/opt/jython/jython.jar'
-#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
-#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
-_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
-#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
-_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
-#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
-#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
-#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
-#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
-
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg: ${_opts[$pkg]%;*}")
-  makedepends+=("$pkg")
-  _jars+="${_opts[$pkg]#*;} "
+# The format is:
+#   jarname:description:pkgname:jarpath
+_library_dependencies=(
+  #jakarta-regexp-1.3.jar:Disregard
+  jakarta-oro-2.0.8.jar:'<ftp task>':jakarta-oro:/usr/share/java/jakarta-oro.jar
+  junit.jar:'<junit> task':junit:/usr/share/java/junit.jar
+  xalan.jar:'<junitreport> task':xalan-java:/usr/share/java/xalan.jar
+  antlr.jar:'<antlr> task':java-antlr2:/usr/share/java/antlr2.jar
+  bsf.jar:'<script> task':java-commons-bsf2:/usr/share/java/bsf2.jar
+  groovy-all.jar:'Groovy with <script> and <scriptdef> tasks':groovy:/usr/share/groovy/embeddable/groovy-all.jar
+  #netrexx.jar:'<netrexx> task, Rexx with <script> task':???????:???????
+  js.jar:'Javascript with <script> task':java-rhino:/usr/share/java/js.jar
+  jython.jar:'Python with <script> task':jython:/opt/jython/jython.jar
+  #jpython.jar:Disregard
+  #jacl.jar:'TCL with <script> task':???????:???????
+  #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:???????:??????
+  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
+  bcel.jar:"'classfileset' data type, JavaClassHelper for ClassConstants filter reader":java-bcel:/usr/share/java/bcel.jar
+  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
+  jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
+  #jai.jar:'<image> task':???????:???????
+)
+
+for _dep in "${_library_dependencies[@]}"; do
+  IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+  optdepends+=("${_pkgname}: ${_desc}")
+  makedepends+=("${_pkgname}")
 done
+unset _dep _jarname _desc _pkgname _jarpath
 
 build() {
   # This directory is what becomes
@@ -63,14 +71,24 @@ build() {
 
   cd "${srcdir}"/${pkgname}-${pkgver}
   # Symlink to external optional libraries/
-  for jar in $_jars; do
-    ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
+  local _dep _jarname _desc _pkgname _jarpath
+  for _dep in "${_library_dependencies[@]}"; do
+    IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+    ln -sfv "${_jarpath}" lib/optional/${_jarname}
   done
   # Build
   source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
   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
@@ -90,33 +108,35 @@ 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 $_jars; do
-    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
+  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}"
   done
 
   ## Symlink the /opt distribution to the normal places
-  install -d "${pkgdir}"/usr/bin
-  install -d "${pkgdir}"/usr/share/doc/${pkgname}
-  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
   cd "${pkgdir}"/${ANT_HOME}/lib
+  local pom a
   for pom in *.pom; do
     a=${pom%.pom}
     base=$(jh mvn-basename org.apache.ant $a $pkgver)
-    install -d "${pkgdir}${base%/*}"
-    ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
-    ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+    _rellink "${ANT_HOME}/lib/$a.pom" "${base}.pom"
+    _rellink "${ANT_HOME}/lib/$a.jar" "${base}.jar"
   done
 
-  cd "${pkgdir}"/${ANT_HOME}
-  for prog in bin/*; do
-    ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+  cd "${pkgdir}"/${ANT_HOME}/bin
+  local prog
+  for prog in *; do
+    _rellink "${ANT_HOME}/bin/$prog" "/usr/bin/$prog"
   done
-  ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
-  ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
-  ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
+  _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"
 }
 
-md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
+md5sums=('8f610c1a0183507c2beebbf230f456af'
          'bd63c881be406f515fc4d22635e8326a'
          'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/closure-compiler/PKGBUILD b/java/closure-compiler/PKGBUILD
index 25d5d60ad..8c9ea0c34 100644
--- a/java/closure-compiler/PKGBUILD
+++ b/java/closure-compiler/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=closure-compiler
-pkgver=20130603
+pkgver=20131118
 pkgdesc="A JavaScript optimizing compiler."
 url="https://code.google.com/closure/compiler/"
-license=('Apache2')
+license=('Apache')
 
 pkgrel=1
 arch=('any')
@@ -19,10 +19,13 @@ makedepends=(
   #'java-jsr305' # does not exist
   'junit'
   #'java-protobuf' # does not build
-  # maven-ant-tasks
-  'jh')
+  #'maven-ant-tasks' # does not exist
+  'jh'
+)
 
 source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
+md5sums=('0fceda3f4d43a6d266f9888e7683bdc9'
+         'd4ead4585fcc7039d3c32eb5c4491bb9')
 
 mksource=("$pkgname-$pkgver::git+https://code.google.com/p/closure-compiler/#tag=v${pkgver}")
 mkmd5sums=('SKIP')
@@ -62,6 +65,3 @@ package() {
     build/pom.xml build/compiler.jar \
     closure-compiler.jar
 }
-
-md5sums=('00b89084401b9550166a1f1294f9ba39'
-         'd4ead4585fcc7039d3c32eb5c4491bb9')
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
index 9bc3e11b9..24f7a2772 100644
--- a/java/jakarta-oro/PKGBUILD
+++ b/java/jakarta-oro/PKGBUILD
@@ -1,30 +1,30 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
 pkgname=jakarta-oro
 pkgver=2.0.8
-pkgrel=1
-pkgdesc="Full regular expressions API"
+pkgrel=1.1
+pkgdesc="Java regular expression and text-processing library"
 arch=('any')
-url="http://jakarta.apache.org/oro"
+url="https://jakarta.apache.org/oro"
 license=('Apache')
 makedepends=('apache-ant')
-source=("http://archive.apache.org/dist/jakarta/oro/jakarta-oro-${pkgver}.tar.gz")
+source=("http://archive.apache.org/dist/jakarta/oro/${pkgname}-${pkgver}.tar.gz")
 sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  find . \( -name '*.jar' -o -name '*.class' \) -delete
+}
 
-  find . -name '*.jar' -o -name '*.class' -delete
-
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ant jar
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  install -dm755 "${pkgdir}/usr/share/java/"
-  install -m644 ${pkgname}-${pkgver}.jar \
+  install -Dm644 ${pkgname}-${pkgver}.jar \
     "${pkgdir}/usr/share/java/${pkgname}.jar"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
index a5ec08c9f..7a9113529 100644
--- a/java/java-json-android/PKGBUILD
+++ b/java/java-json-android/PKGBUILD
@@ -10,14 +10,14 @@ pkgver=${_pkgver//_/.}
 provides=(java-json)
 conflicts=(java-json)
 
-pkgrel=2
+pkgrel=3
 arch=(any)
 
 depends=(java-runtime)
 makedepends=(java-environment junit)
 
 source=("libre://android-libcore-$_pkgver.tar.gz")
-md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+md5sums=('546a4614552615a12f45b62db27acddf')
 
 mkdepends=(git)
 mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
index 5e466a029..04dbcb2ac 100644
--- a/java/junit/PKGBUILD
+++ b/java/junit/PKGBUILD
@@ -7,24 +7,18 @@ pkgdesc="Automated testing framework for Java"
 url="http://www.junit.org/"
 license=('CPL')
 
-pkgrel=3.1
+pkgrel=3.2
 arch=('any')
 depends=('java-runtime' 'java-hamcrest')
 makedepends=('apache-ant' 'jakarta-oro' 'jh')
 
 source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('47c8879e05effb2ab98461c43243cc65')
+md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
 
-mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
 mkmd5sums=('SKIP')
 mksource() {
-  cd "${srcdir}"p
-  if [[ -d $pkgname ]]; then
-    rm -rf "$pkgname"-*
-    mv "$pkgname" "$pkgname-$pkgver"
-  fi
-
-  cd "${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   find . -name '*.jar' -delete
 }