[arch-commits] Commit in openjdk6/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Friday, July 3, 2009 @ 14:15:56
  Author: jgc
Revision: 44721

Merged revisions 44382,44444 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r44382 | jgc | 2009-07-01 23:40:46 +0200 (Wed, 01 Jul 2009) | 2 lines
  
  upgpkg: openjdk6 1.5-3
      Rebuild against xulrunner 1.9.1, fix ant location
........
  r44444 | andyrtr | 2009-07-02 07:18:17 +0200 (Thu, 02 Jul 2009) | 2 lines
  
  upgpkg: openjdk6 1.5-4
      rebuild for libjpeg+xulrunner
........

Modified:
  openjdk6/repos/extra-i686/	(properties)
  openjdk6/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Property changes on: openjdk6/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-40699
   + /openjdk6/trunk:1-44720

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-03 18:15:30 UTC (rev 44720)
+++ extra-i686/PKGBUILD	2009-07-03 18:15:56 UTC (rev 44721)
@@ -8,7 +8,7 @@
 pkgver=1.5
 _hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
 _icedteaver=1.5
-pkgrel=2
+pkgrel=4
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@
 _openjdk_date=24_apr_2009
 _hotspotver=25a020f13592 # what it downlopads itself / remove from configure to get it
 depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst')
-makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11'
-	     'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.10' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
+makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg>=7' 'libx11'
+	     'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.1-2' 'apache-ant>=1.7.0-2' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
 optdepends=('xulrunner: for the browser plugin'
             'alsa-lib: for sound'
             'giflib: for gif format support')
@@ -58,6 +58,9 @@
 
   unset JAVA_HOME
   unset CLASSPATH
+  
+    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+  
   if [ "${CARCH}" = "x86_64" ]; then
     _arch=amd64
   else
@@ -97,6 +100,7 @@
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
+	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
 
 #	--enable-npplugin \