openjdk: update to 8u60 build 05 (close #1076).

srcpkgs/openjdk/files/001_adjust-mflags-for-gmake-4.patch

@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User henryjen
-# Date 1390363634 28800
-# Node ID e8d4d0db1f06c26defcbf68e6713afab632f3f30
-# Parent  c4b78cbea876aa86112cfda16c0026796848d582
-8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I<path contains j>
-Reviewed-by: erikj
-
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/bsd/makefiles/adjust-mflags.sh
---- a/make/bsd/makefiles/adjust-mflags.sh	Thu Dec 05 00:36:42 2013 -0800
-+++ b/make/bsd/makefiles/adjust-mflags.sh	Tue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- 	echo "$MFLAGS" \
- 	| sed '
- 		s/^-/ -/
--		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
-+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
- 		s/ -j[0-9][0-9]*/ -j/
- 		s/ -j\([^ 	]\)/ -j -\1/
- 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/linux/makefiles/adjust-mflags.sh
---- a/make/linux/makefiles/adjust-mflags.sh	Thu Dec 05 00:36:42 2013 -0800
-+++ b/make/linux/makefiles/adjust-mflags.sh	Tue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- 	echo "$MFLAGS" \
- 	| sed '
- 		s/^-/ -/
--		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
-+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
- 		s/ -j[0-9][0-9]*/ -j/
- 		s/ -j\([^ 	]\)/ -j -\1/
- 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-diff -r c4b78cbea876 -r e8d4d0db1f06 make/solaris/makefiles/adjust-mflags.sh
---- a/make/solaris/makefiles/adjust-mflags.sh	Thu Dec 05 00:36:42 2013 -0800
-+++ b/make/solaris/makefiles/adjust-mflags.sh	Tue Jan 21 20:07:14 2014 -0800
-@@ -64,7 +64,7 @@
- 	echo "$MFLAGS" \
- 	| sed '
- 		s/^-/ -/
--		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
-+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
- 		s/ -j[0-9][0-9]*/ -j/
- 		s/ -j\([^ 	]\)/ -j -\1/
- 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-

srcpkgs/openjdk/files/003_nonreparenting-wm.patch

@@ -1,38 +0,0 @@
---- a/src/solaris/classes/sun/awt/X11/XWM.java	2015-01-29 20:08:28.387583688 +0100
-+++ b/src/solaris/classes/sun/awt/X11/XWM.java	2015-01-29 20:12:52.955595493 +0100
-@@ -104,7 +104,8 @@
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
-         CWM_WM = 14,
--        MUTTER_WM = 15;
-+        MUTTER_WM = 15,
-+	OTHER_NONREPARENTING_WM = 16;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -596,7 +597,7 @@
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -785,6 +786,8 @@
-                 awt_wmgr = CWM_WM;
-             } else if (doIsIceWM && isIceWM()) {
-                 awt_wmgr = XWM.ICE_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             }
-             /*
-              * We don't check for legacy WM when we already know that WM
-@@ -1333,6 +1336,7 @@
-                   break;
-               case NO_WM:
-               case LG3D_WM:
-+              case OTHER_NONREPARENTING_WM:
-                   res = zeroInsets;
-                   break;
-               case MOTIF_WM:

srcpkgs/openjdk/template

@@ -4,15 +4,15 @@
 # TODO: find giflib patch for --with-giflib=system
 
 _java_ver=8
-_jdk_update=40
+_jdk_update=60
-_jdk_build=15
+_jdk_build=05
 _repo_ver="jdk${_java_ver}u${_jdk_update}-b${_jdk_build}"
 _openjdk_version="openjdk-1.8.0_${_jdk_update}"
 
 # Template file for 'openjdk'
 pkgname=openjdk
 version=${_java_ver}u${_jdk_update}
-revision=3
+revision=1
 nocross=yes
 wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
 build_style=gnu-configure
@@ -55,19 +55,21 @@ distfiles="
  http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
 
-checksum="5e97a8f7da9891584874a2167b0da0bed681d043359c9d45a2fb23d4b9d4837b
+checksum="
- 27f80714e74731a5468ff36ac09d505a4853adb6aed2c0d42e5dea2f7369f3d0
+ ac109bdcf7b683c8c1151ff334896b805a1e5a77c1a6f2ebfc861a0c9aad9f5b
- f37c3bd1da59179bf9b0e16256d6cce075e135efb073e34eb85e939158c41b74
+ 05532b78726ea27617b219b40dd8ef061ecb8803b93d795696e5a4f33dd59aed
- b0b0830d0db5dac65934e8f6fe7b95f638cfb5f95a906c8660e34826dfec60d8
+ e91399a4882ddad4b9cb70cd41081c54915cc84e2553742e2a3de11a4bd9231a
- 3a980f14373899bbfb7217b514313562e3e75cca3d538eae41a39f61dcf91bab
+ e0b78561ea300aa9ad803ff08237ea1e89e2a384f3df5d90e2b9d5e3166fa0da
- 74f816d59cc9e95c26732a44010185a21939b752da337b075f1b6b1f5a677631
+ ca4a0bcf118ab74ae7a7a230f549ba3a583e3864ed6f8b15e197849376349481
- f80960114b8148878c36c8210013100e3f2fcad08d245c21a32eacdb468c0dab
+ 92caf350d5a596bd4bd301e2bf7a7e4b62b7a762cf9c961cb21c70bdebf6802f
- daed783d035ca241f41c81691c29a0c49948f7c724e81b5c36aa21f38c3e5fe2"
+ 679d9b2ac707b5de62842d3570c63c682f2c4787bf4afc358a1bc50113674521
+ b2d562dc45ba1deb38f9bb15cbb7fe73ebb269c3bfd275539901d75d9c2fd4d5"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
 build_options="oracle_bootstrap"
+build_options_default="oracle_bootstrap"
 desc_option_oracle_bootstrap="Bootstrap using Oracle JDK"
 
 post_extract() {
@@ -76,12 +78,8 @@ post_extract() {
 		ln -s ../${subrepo}-${_repo_ver} ${subrepo}
 	done
 	cd hotspot
-	# https://bugs.openjdk.java.net/browse/JDK-8028407
-	patch -p1 < ${FILESDIR}/001_adjust-mflags-for-gmake-4.patch
 	# https://bugs.openjdk.java.net/browse/JDK-8041658
 	patch -p1 < ${FILESDIR}/002_gcc.make-4.9.patch
-	cd ../jdk
-	patch -p1 < ${FILESDIR}/003_nonreparenting-wm.patch
 }
 
 post_install() {
@@ -99,6 +97,7 @@ post_install() {
 }
 
 openjdk-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so"
 	short_desc="OpenJDK Java Runtime Environment"
 	provides="java-runtime-${version}_1"
 	replaces="java-runtime>=0"
@@ -114,6 +113,9 @@ EOF
 }
 
 openjdk-src_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
 	short_desc+=" -- sources"
 	pkg_install() {
 		vmove "usr/lib/jvm/$_openjdk_version/src.zip"
@@ -121,6 +123,9 @@ openjdk-src_package() {
 }
 
 openjdk-doc_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
 	short_desc+=" -- documentation"
 	pkg_install() {
 		cd ${wrksrc}