[arch-commits] Commit in apache-ant/repos/extra-any (3 files)

[Guillaume Alaux]

    Date: Monday, May 28, 2012 @ 09:38:25
  Author: guillaume
Revision: 160039

archrelease: copy trunk to extra-any

Modified:
  apache-ant/repos/extra-any/PKGBUILD
  apache-ant/repos/extra-any/apache-ant.csh
  apache-ant/repos/extra-any/apache-ant.sh

----------------+
 PKGBUILD       |   70 ++++++++++++++++++++++++-------------------------------
 apache-ant.csh |    3 +-
 apache-ant.sh  |    4 ++-
 3 files changed, 36 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-28 13:38:03 UTC (rev 160038)
+++ PKGBUILD	2012-05-28 13:38:25 UTC (rev 160039)
@@ -2,61 +2,53 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Andrew Wright <andreww at photism.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
+
 pkgname=apache-ant
 pkgver=1.8.3
-pkgrel=2
+pkgrel=1
 pkgdesc="A java-based build tool"
 arch=('any')
+license=('APACHE')
 url="http://ant.apache.org/"
-license=('APACHE')
 depends=('java-environment')
-makedepends=('java-environment' 'xalan-java' 'junit')
 optdepends=('junit: to jave junit on the classpath in javac tasks')
-source=(http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
-        ${pkgname}.sh
-        ${pkgname}.csh)
-md5sums=('d7e0bdd538481b7c15dfb7fbcdd81b0e'
-         'dbfa1e8dd4bab2f5821f5abe50835c83'
-         'b3f67824043b6fb00667bb7a4007af42')
+source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+        ${pkgname}.sh ${pkgname}.csh
+        ant_diagnostics.patch)
+md5sums=('f5959aff4ab061cac37ff1f84f3b874a'
+         '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
+         'cbaab423be40a6e63f0fde901b91eb50')
 
-_ant_home=/usr/share/${pkgname}
+package() {
+  # install profile.d script
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  # Get the ANT_HOME env var
+  source "${srcdir}"/${pkgname}.sh
 
-  ln -s /usr/share/java/junit.jar lib/optional/junit.jar
-  sh build.sh dist
-}
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
 
-  install -dm755 ${pkgdir}/${_ant_home}/bin
-  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 \;
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
 
-  install -dm755 ${pkgdir}/usr/bin
-  ln -s ${_ant_home}/bin/ant ${pkgdir}/usr/bin/ant
-
-  install -dm755 ${pkgdir}/usr/share/java/${pkgname}
-  install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/${_ant_home}/lib
-
-  # Symlink to junit so it's on the javac build path
+  # 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
-  # http://ant.apache.org/manual/install.html#optionalTasks
-  ln -sf ../junit.jar ${pkgdir}/usr/share/java/apache-ant/
+  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}${_ant_home}/bin/runant.py
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
 
-  # install profile.d script
-  install -dm755 ${pkgdir}/etc/profile.d
-  install -m755 "${srcdir}"/${pkgname}.{csh,sh} ${pkgdir}/etc/profile.d/
-
-  # License says NOTICE file should be redistributed for derivative works
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname}
+  # The license says the NOTICE file should be redistributed for derivative
+  # works, so lets supply it.
+  cd "${srcdir}"/${pkgname}-${pkgver} 
+  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}
 }

Modified: apache-ant.csh
===================================================================
--- apache-ant.csh	2012-05-28 13:38:03 UTC (rev 160038)
+++ apache-ant.csh	2012-05-28 13:38:25 UTC (rev 160039)
@@ -1 +1,2 @@
-setenv ANT_HOME /usr/share/apache-ant
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin

Modified: apache-ant.sh
===================================================================
--- apache-ant.sh	2012-05-28 13:38:03 UTC (rev 160038)
+++ apache-ant.sh	2012-05-28 13:38:25 UTC (rev 160039)
@@ -1 +1,3 @@
-export ANT_HOME=/usr/share/apache-ant
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+