[arch-commits] Commit in openjdk6/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, September 11, 2010 @ 05:09:59
  Author: andyrtr
Revision: 90390

prepare 1.9

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-11 08:48:47 UTC (rev 90389)
+++ PKGBUILD	2010-09-11 09:09:59 UTC (rev 90390)
@@ -15,8 +15,6 @@
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-# cat src/icedtea6/hotspot.map or what it downlopads itself / remove from configure to get it
-_hotspotver=62926c7f67a3 
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
 	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.2' 
 	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
@@ -24,10 +22,9 @@
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
 	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
 	https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip
-	http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaxws-2009_10_27.zip
-	http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_10_27.zip
+	https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip
+	https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	aatext_by_default.diff
@@ -37,10 +34,9 @@
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
 md5sums=('24191e3974ea58cb2bc410590221486c'
          '0b36adbf67e4f261e1b827ed4be4f447'
-         'd683eb501e7ce710198f20f0c127ebbb'
          '22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
-         '3ea5728706169498b722b898a1008acf'
-         '7a50bb540a27cdd0001885630088b758'
+         '91adfd41e6f001add4f92ae31216b1e3'
+         'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ef60d567c0d9bad111212851220deafd'
@@ -73,7 +69,6 @@
 
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
-#  ln -s ${srcdir}/jdk6-jaxp-b20.zip .
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
 
@@ -98,14 +93,10 @@
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF \
-	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
-	--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-2009_10_13.zip \
-	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-2009_10_27.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-2009_10_27.zip
+	--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \
+	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip
 
-
-# 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
-
   LD_PRELOAD="" make || return 1
 }
 
@@ -133,7 +124,7 @@
   cd ${srcdir}/icedtea6-${_icedteaver}
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
 
    # Install main files.
   cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
@@ -207,7 +198,7 @@
   cd ${srcdir}/icedtea6-${_icedteaver}
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
   
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
    # Install src.zip file
   cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
 }