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

[andyrtr at archlinux.org]

    Date: Wednesday, April 14, 2010 @ 14:44:56
  Author: andyrtr
Revision: 77495

upgpkg: openjdk6 6.b18_1.8-1
new icedtea version 1.8 using openjdk source 6.b18

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-14 17:07:25 UTC (rev 77494)
+++ PKGBUILD	2010-04-14 18:44:56 UTC (rev 77495)
@@ -4,11 +4,11 @@
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
-_date=20100129
+#_date=20100129
 _javaver=6
-_icedteaver=1.7.3
-_openjdk_version=b17
-_openjdk_date=14_oct_2009
+_icedteaver=1.8
+_openjdk_version=b18
+_openjdk_date=16_feb_2010
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
 pkgrel=1
@@ -19,12 +19,15 @@
 _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>=1.7.1-3' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
+	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
 options=('!emptydirs' 'force')
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
 	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/147329/jdk6-jaxp-2009_10_13.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
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	aatext_by_default.diff
@@ -32,9 +35,12 @@
 	nonreparenting-wm.diff
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('9ad707a5edc471e883a66c882adeab46'
-         '078fe0ab744c98694decc77f2456c560'
+md5sums=('e08dd0762749fb50ec6c273c366ee8ae'
+         '94db01691ab38f98b7d42b2ebf4d5c0b'
          'd683eb501e7ce710198f20f0c127ebbb'
+         'a2f7b972124cd776ff71e7754eb9a429'
+         '3ea5728706169498b722b898a1008acf'
+         '7a50bb540a27cdd0001885630088b758'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ef60d567c0d9bad111212851220deafd'
@@ -91,8 +97,12 @@
 	--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-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
 
+
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
 
   LD_PRELOAD="" make || return 1
@@ -160,7 +170,7 @@
 
   # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
   install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaNPPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
+  ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
 
   # link binaries into /usr/bin
   install -m755 -d ${pkgdir}/usr/bin