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

[andyrtr at archlinux.org]

    Date: Wednesday, March 2, 2011 @ 18:26:46
  Author: andyrtr
Revision: 111999

upgpkg: openjdk6 6.b22_1.10-1
upstream update 1.10

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   50 ++++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-02 22:48:17 UTC (rev 111998)
+++ PKGBUILD	2011-03-02 23:26:46 UTC (rev 111999)
@@ -6,23 +6,23 @@
 pkgbase="openjdk6"
 #_date=20100715
 _javaver=6
-_icedteaver=1.9.7
-_openjdk_version=b20
-_openjdk_date=21_jun_2010
+_icedteaver=1.10
+_openjdk_version=b22
+_openjdk_date=28_feb_2011
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
 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' 'libxt' 'nss'
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio') #'xulrunner>=1.9.2' 
+	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
 options=('!emptydirs') # 'force') # force needed for hg shots
 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
-	https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip
+	http://icedtea.classpath.org/download/drops/jaxp144_01.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
@@ -33,9 +33,9 @@
 	openjdk6.profile
 	openjdk6.profile.csh)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('54a327a9591dab15049b81ec3c0af724'
-         '0b36adbf67e4f261e1b827ed4be4f447'
-         '22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
+md5sums=('fd3f35e8a8a2ef9a64c035ed66cea06d'
+         '2d2bbbb0f9b81f1fec41ec730da8a933'
+         'ef7a8b3624ea904bf584bc46d79b5e75'
          '91adfd41e6f001add4f92ae31216b1e3'
          'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
@@ -82,34 +82,22 @@
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
   unset MAKEFLAGS
 
-#  if [ -x ${_jvmdir}/bin/javac ]; then
-#    JCONF="--with-openjdk --with-javac"
-#  elif [ -x /opt/java/bin/javac ]; then
-#    JCONF="--with-openjdk"
-#      else
-#    echo "No supported java installation found, install either openjdk6 or jdk"
-#    return 1
-#  fi
-
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF \
-	--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \
+	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
+	--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
 	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
 	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-webstart --disable-plugin --with-openjdk
-
+	--disable-bootstrap
   LD_PRELOAD="" make 
 }
 
 package_openjdk6() {
  pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
  backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') #'desktop-file-utils'
- optdepends=( #'xulrunner: for the browser plugin'
-            #'gtk2: for the browser plugin'
-	    'icedtea-web: web browser plugin + Java Web Start'
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ optdepends=('icedtea-web: web browser plugin + Java Web Start'
             'alsa-lib: for sound'
             'giflib: for gif format support')
  conflicts=('java-environment' 'java-runtime')
@@ -145,9 +133,6 @@
   install -m755 -d ${pkgdir}/usr/share/man/man1
   install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
   
-  # https://bugs.archlinux.org/task/22953 - only i686 affected - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=633
-  rm -f  ${pkgdir}/usr/share/man/man1/javaws.1 || /bin/true
-
    # Install demos and samples.
   cp -a demo ${pkgdir}/${_jvmdir}/ 
   install -m755 -d sample/rmi
@@ -163,16 +148,9 @@
   done
 
   # Install desktop files.
-#  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
   install -m755 -d ${pkgdir}/usr/share/applications
-#  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps 
-#  install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications 
   install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
 
-  # 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}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ 
-
   # link binaries into /usr/bin
   install -m755 -d ${pkgdir}/usr/bin
   pushd ${pkgdir}/${_jvmdir}/bin