--- a/open-src/xserver/xvnc/Makefile	Fri Feb 20 14:26:15 2015 -0800
+++ b/open-src/xserver/xvnc/Makefile	Wed Feb 25 13:39:12 2015 -0800
@@ -4,7 +4,7 @@
 # Based on Fedora's tigervnc.spec revision 1.20 from
 # http://cvs.fedoraproject.org/viewvc/rpms/tigervnc/devel/tigervnc.spec
 #
-# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -73,7 +73,7 @@
 SOURCE_PATCHES += no-nasm.patch,-p1
 SOURCE_PATCHES += applet-html.patch
 SOURCE_PATCHES += icon.patch,-p1
-SOURCE_PATCHES += jdk17.patch,-p1
+SOURCE_PATCHES += jdk-version.patch,-p1
 SOURCE_PATCHES += solaris-libraries.patch,-p1
 SOURCE_PATCHES += vnc-nobuildtime.patch,-p1
 SOURCE_PATCHES += vnc-nohttpd.patch,-p1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/jdk-version.patch	Wed Feb 25 13:39:12 2015 -0800
@@ -0,0 +1,14 @@
+--- a/java/src/com/tigervnc/vncviewer/Makefile	Thu Jul 10 14:52:31 2014
++++ b/java/src/com/tigervnc/vncviewer/Makefile	Thu Jul 10 14:52:51 2014
+@@ -3,8 +3,9 @@
+ #
+ 
+ CP = cp
+-JC = javac
+-JCFLAGS = -target 1.5 -classpath ../../../
++JDK_VERSION = 1.8.0
++JC = /usr/jdk/instances/jdk$(JDK_VERSION)/bin/javac
++JCFLAGS = -target 1.8 -classpath ../../../
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF

--- a/pkg/manifests/developer-opensolaris-X.p5m	Fri Feb 20 14:26:15 2015 -0800
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Wed Feb 25 13:39:12 2015 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -98,7 +98,7 @@
 depend type=require fmri=pkg:/developer/gperf
 
 # tigervnc builds a java applet with javac
-depend type=require fmri=pkg:/developer/java/jdk-7
+depend type=require fmri=pkg:/developer/java/jdk-8
 
 # Various modules need flex to generate lexers
 depend type=require fmri=pkg:/developer/lexer/flex