[arch-commits] Commit in apache-ant/trunk (PKGBUILD apache-ant.csh)

[Andrea Scarpino]

    Date: Tuesday, May 17, 2011 @ 14:29:38
  Author: andrea
Revision: 124228

upgpkg: apache-ant 1.8.2-2
switch to arch any; add .csh profile file (FS#23582); fix python2 path; fix wrong dependence on java-runtime (FS#24083)

Added:
  apache-ant/trunk/apache-ant.csh
Modified:
  apache-ant/trunk/PKGBUILD

----------------+
 PKGBUILD       |   42 ++++++++++++++++++++++--------------------
 apache-ant.csh |    2 ++
 2 files changed, 24 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-17 18:01:51 UTC (rev 124227)
+++ PKGBUILD	2011-05-17 18:29:38 UTC (rev 124228)
@@ -4,48 +4,50 @@
 
 pkgname=apache-ant
 pkgver=1.8.2
-pkgrel=1
-pkgdesc="A java-based build tool."
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="A java-based build tool"
+arch=('any')
 license=('APACHE')
 url="http://ant.apache.org/"
-depends=('java-runtime')
+depends=('java-environment')
 optdepends=('junit: to jave junit on the classpath in javac tasks')
 source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
-        ${pkgname}.sh
+        ${pkgname}.sh ${pkgname}.csh
         ant_diagnostics.patch)
 md5sums=('9e9ae9fc7352960191489a1286fb0928'
          '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
          'cbaab423be40a6e63f0fde901b91eb50')
 
-build() {
+package() {
   # install profile.d script
-  install -dm755 ${pkgdir}/etc/profile.d || return 1
-  install -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/ || return 1
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
 
   # Get the ANT_HOME env var
-  source ${srcdir}/${pkgname}.sh || return 1
+  source "${srcdir}"/${pkgname}.sh
 
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -dm755 ${pkgdir}/${ANT_HOME}/{bin,lib} || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
 
-  install -m644 ./lib/*.jar ${pkgdir}/${ANT_HOME}/lib || return 1
-  cp -Rp ./etc ${pkgdir}/${ANT_HOME} || return 1
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
 
   # Do not copy Windows .bat/.cmd files
   find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
-    -exec install -m755 {} ${pkgdir}/${ANT_HOME}/bin \; || return 1
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
 
   # symlink to junit so it's on the javac build path for ant
   # matches behavior on ubuntu 9 and makes sense for compatibility
   # http://bugs.archlinux.org/task/15229
-  cd $startdir/pkg/usr/share/java/apache-ant/lib || return 1
-  ln -s ../../junit.jar . || return 1
-  cd - || return 1
+  ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
 
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
   # The license says the NOTICE file should be redistributed for derivative
   # works, so lets supply it.
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-  install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname} || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver} 
+  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}
 }
-

Added: apache-ant.csh
===================================================================
--- apache-ant.csh	                        (rev 0)
+++ apache-ant.csh	2011-05-17 18:29:38 UTC (rev 124228)
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin