Wed Jan 16 00:05:27 PST 2013

1 files changed, 30 insertions, 20 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 99c677557..b611231dc 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 169300 2012-10-18 22:41:27Z andyrtr $
+# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
- # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
+pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
+         'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u9
-_icedtea_ver=2.3.3
+_icedtea_ver=2.3.4
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=9a95d714d136
-_HOTSPOT_CHANGESET=d2d0a106917c # see "${srcdir}/icedtea7"/hotspot.map
-_JAXP_CHANGESET=f45296ac69be
-_JAXWS_CHANGESET=03f54ef33914
-_JDK_CHANGESET=5ec94d162f05
-_LANGTOOLS_CHANGESET=ec73c6927fb7
-_OPENJDK_CHANGESET=301e79a966b4
+_CORBA_CHANGESET=dc9234e25ab0
+_JAXP_CHANGESET=aa3654afea12
+_JAXWS_CHANGESET=7182233cc27e
+_JDK_CHANGESET=96d4f04f2b7c
+_LANGTOOLS_CHANGESET=946195011b30
+_OPENJDK_CHANGESET=8bd8e70d4a03
+
+_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -49,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('e5ac5564e00c4a8d7b3376ed6de91b18a2587c8abdad802ccc92c780765b1073'
-            'dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b'
-            '4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb'
-            'b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141'
-            '86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a'
-            '11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6'
-            'c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6'
-            '872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b'
+sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8'
+            '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd'
+            '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8'
+            'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7'
+            '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590'
+            'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b'
+            'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144'
+            'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
@@ -296,7 +297,7 @@ package_jdk7-openjdk() {
   # Main files
   install -m755 -d ${pkgdir}/${_jvmdir}/
 
-  cp -a demo include lib sample ${pkgdir}/${_jvmdir}
+  cp -a include lib ${pkgdir}/${_jvmdir}
 
   # 'bin' files
   pushd bin
@@ -340,3 +341,12 @@ package_openjdk7-src() {
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }
+
+package_openjdk7-doc() {
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation"
+
+  install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc
+  for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+    cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/
+  done
+}