Update tigervnc to 1.5.0

TigerVNC 1.5.0 - Lots of changes have been made since
the last release, but the highlights are:

  - IPv6 support in the servers
  - You can now have two passwords, one for full access and one for
    "view only".
  - syslog support in Xvnc
  - GnuTLS priority configuration
  - Performance fixes
  - You can now easily start more clients on OS X
  - More translations

TigerVNC 1.4.3 - This release addresses the following issues:

  - Upstream patches applied to the underlying Xorg code base to
    mitigate CVE-2015-0255.
  - Fixes for performance regressions introduced in 1.4.0.
  - Character encoding of clipboard text send by Java viewer now
    strictly adheres to the RFB specification.

TigerVNC 1.4.1 - This is release is in response to the recent Xorg
  Security Advisory. There are no known vulnerabilities in TigerVNC itself
  related to this advisory, however some of the changes to the Xorg
  codebase were not compatible with TigerVNC.

TigerVNC 1.4.0 - Lots of changes have been made since
the last release, but the highlights are:

 - Colour map (aka indexed, palette) mode is largely removed. TigerVNC
   is still compatible with other VNC implementations, but you can no
   longer run Xvnc in colour map mode.
 - Improvements to the keyboard handling both on the server and client
 - Support for newer Xorg versions in the server build
 - x0vncserver now supports XDamage for instant updates, making it
   slightly less useless
 - WinVNC now works in service mode on newer Windows versions
 - Better full screen mode for the Java client on OS X
 - man pages should now be up to date
 - Improved TLS implementation in the Java client
 - Lots and lots of cleanups and bug fixes

10 files changed, 169 insertions, 166 deletions

diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 9071f5e16ef..8a6a4c051b3 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2015/06/12 10:50:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/21 21:51:39 markd Exp $
 
-DISTNAME=	tigervnc-1.3.1
-PKGREVISION=	3
+DISTNAME=	tigervnc-1.5.0
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tigervnc/}
-XORG_SERVER_FILE=	xorg-server-1.12.4
+MASTER_SITES=	${MASTER_SITE_GITHUB:=TigerVNC/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+XORG_SERVER_FILE=	xorg-server-1.17.2
 SITES.${XORG_SERVER_FILE}.tar.bz2=	${MASTER_SITE_XORG:=xserver/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
 
@@ -44,14 +44,15 @@ post-extract:
 	cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
 
 post-patch:
-	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver112.patch
+	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver117.patch
 
 XORG_CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
-XORG_CONFIGURE_ARGS+=	--disable-wayland --disable-present --disable-dri3
+XORG_CONFIGURE_ARGS+=	--disable-xwayland --disable-kdrive --disable-xephyr
 XORG_CONFIGURE_ARGS+=	--disable-static --disable-xinerama --without-dtrace
 XORG_CONFIGURE_ARGS+=	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx
+XORG_CONFIGURE_ARGS+=	--disable-config-hal --disable-config-udev --with-pic
 XORG_CONFIGURE_ARGS+=	--disable-unit-tests --disable-devel-docs --disable-selective-werror
-XORG_CONFIGURE_ARGS+=	--disable-dri --enable-dri2 --enable-glx --enable-glx-tls
+XORG_CONFIGURE_ARGS+=	--disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
 
 pre-configure:
 	cd ${WRKSRC}/unix/xserver && autoreconf -fvi &&	\
@@ -71,6 +72,7 @@ pre-configure:
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.3.3
 .include "../../x11/fltk13/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/xcmiscproto/buildlink3.mk"
@@ -84,6 +86,7 @@ pre-configure:
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/presentproto/buildlink3.mk"
 .include "../../x11/resourceproto/buildlink3.mk"
 .include "../../x11/scrnsaverproto/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
diff --git a/net/tigervnc/PLIST b/net/tigervnc/PLIST
index 3aa1a4ef43c..34340fb4634 100644
--- a/net/tigervnc/PLIST
+++ b/net/tigervnc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/08 19:42:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/07/21 21:51:39 markd Exp $
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd
@@ -14,9 +14,20 @@ man/man1/vncviewer.1
 man/man1/x0vncserver.1
 share/doc/${PKGNAME}/LICENCE.TXT
 share/doc/${PKGNAME}/README.txt
+share/locale/bg/LC_MESSAGES/tigervnc.mo
+share/locale/da/LC_MESSAGES/tigervnc.mo
 share/locale/de/LC_MESSAGES/tigervnc.mo
+share/locale/el/LC_MESSAGES/tigervnc.mo
+share/locale/eo/LC_MESSAGES/tigervnc.mo
+share/locale/es/LC_MESSAGES/tigervnc.mo
+share/locale/fi/LC_MESSAGES/tigervnc.mo
 share/locale/fr/LC_MESSAGES/tigervnc.mo
+share/locale/it/LC_MESSAGES/tigervnc.mo
+share/locale/nl/LC_MESSAGES/tigervnc.mo
 share/locale/pl/LC_MESSAGES/tigervnc.mo
+share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
 share/locale/ru/LC_MESSAGES/tigervnc.mo
 share/locale/sk/LC_MESSAGES/tigervnc.mo
 share/locale/sv/LC_MESSAGES/tigervnc.mo
+share/locale/tr/LC_MESSAGES/tigervnc.mo
+share/locale/uk/LC_MESSAGES/tigervnc.mo
diff --git a/net/tigervnc/distinfo b/net/tigervnc/distinfo
index 80b06a6b2fb..c489401f19c 100644
--- a/net/tigervnc/distinfo
+++ b/net/tigervnc/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.2 2015/03/22 20:07:46 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/07/21 21:51:39 markd Exp $
 
-SHA1 (tigervnc-1.3.1.tar.gz) = 308ec9a9a627d20406eebfaeac4f3d4398278cc1
-RMD160 (tigervnc-1.3.1.tar.gz) = 522cbd74cfd0293dbc82f4a570dc5beb206c9ed8
-Size (tigervnc-1.3.1.tar.gz) = 6888105 bytes
-SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
-RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
-Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
-SHA1 (patch-CMakeLists.txt) = c5d2bd4b0f56977c8cd3c4b0a46359c765ada200
-SHA1 (patch-common_CMakeLists.txt) = e3dabe3d8ae146cf68a9660a20af2f36c2827731
+SHA1 (tigervnc-1.5.0.tar.gz) = e03e618c06153b83d1fec756cd817885c371cd0b
+RMD160 (tigervnc-1.5.0.tar.gz) = 57240c4a5db8c0d013dbc12322e48901f5750d90
+Size (tigervnc-1.5.0.tar.gz) = 1268682 bytes
+SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
+RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
+Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
+SHA1 (patch-CMakeLists.txt) = 8528782142ef7bc95151f8a130bc8626ad9ee93c
+SHA1 (patch-common_CMakeLists.txt) = d879e36df9db9978adaa5545758f43097d40f10a
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
 SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4
-SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 440067e4995b7e1a0580bd106eb63740f400cb2c
-SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 7644bbf5a111ec765d45d057a430ce07ece9e90b
-SHA1 (patch-unix_xserver_hw_vnc_vncHooks.cc) = aa247443fe39279e3f6c75067dd644546d01420a
-SHA1 (patch-unix_xserver_hw_vnc_xorg-version.h) = 77dadfc369dc07dc7a2eb115be9e3ab5234f0270
+SHA1 (patch-unix_xserver117.patch) = 5e5d2a98f0b765ae0d6bb5f200808126b03dcc51
+SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574
diff --git a/net/tigervnc/patches/patch-CMakeLists.txt b/net/tigervnc/patches/patch-CMakeLists.txt
index 8f1aabe30e5..6444dd74428 100644
--- a/net/tigervnc/patches/patch-CMakeLists.txt
+++ b/net/tigervnc/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/02/08 19:42:09 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2015/07/21 21:51:39 markd Exp $
 
---- CMakeLists.txt.orig	2014-08-14 09:25:26.000000000 +0000
+--- CMakeLists.txt.orig	2015-07-11 13:00:36.000000000 +0000
 +++ CMakeLists.txt
-@@ -26,7 +26,7 @@ set(RCVERSION 1,3,1,0)
+@@ -26,7 +26,7 @@ set(RCVERSION 1,5,0,0)
  # Installation paths
  set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
  set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
@@ -11,11 +11,11 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2015/02/08 19:42:09 wiz Exp $
  set(LOCALE_DIR "${DATA_DIR}/locale")
  set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
  
-@@ -269,6 +269,7 @@ if(UNIX AND NOT APPLE)
-   if(X11_Xcursor_FOUND)
-     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
+@@ -268,6 +268,7 @@ else()
+   if(NOT APPLE)
+     add_subdirectory(unix)
    endif()
 +  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg)
  endif()
  
- if(FLTK_FOUND)
+ if(ENABLE_NLS)
diff --git a/net/tigervnc/patches/patch-common_CMakeLists.txt b/net/tigervnc/patches/patch-common_CMakeLists.txt
index 563068c8a02..5dd697c5041 100644
--- a/net/tigervnc/patches/patch-common_CMakeLists.txt
+++ b/net/tigervnc/patches/patch-common_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_CMakeLists.txt,v 1.1 2015/03/22 20:07:46 joerg Exp $
+$NetBSD: patch-common_CMakeLists.txt,v 1.2 2015/07/21 21:51:39 markd Exp $
 
---- common/CMakeLists.txt.orig	2015-03-22 17:29:15.000000000 +0000
+--- common/CMakeLists.txt.orig	2015-07-11 13:00:36.000000000 +0000
 +++ common/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_subdirectory(rfb)
+@@ -9,7 +9,7 @@ add_subdirectory(rfb)
  # because PIC code does not exist on that platform and MinGW complains if -fPIC
  # is passed (additionally, libvnc is not used on Windows.)
  
@@ -10,4 +10,4 @@ $NetBSD: patch-common_CMakeLists.txt,v 1.1 2015/03/22 20:07:46 joerg Exp $
 +if(NOT WIN32)
    set_target_properties(os rdr network Xregion rfb
      PROPERTIES COMPILE_FLAGS -fPIC)
-   if(USE_INCLUDED_ZLIB)
+ endif()
diff --git a/net/tigervnc/patches/patch-unix_xserver117.patch b/net/tigervnc/patches/patch-unix_xserver117.patch
new file mode 100644
index 00000000000..eb09e9f8018
--- /dev/null
+++ b/net/tigervnc/patches/patch-unix_xserver117.patch
@@ -0,0 +1,72 @@
+$NetBSD: patch-unix_xserver117.patch,v 1.1 2015/07/21 21:51:39 markd Exp $
+
+--- unix/xserver117.patch.orig	2015-07-11 13:00:36.000000000 +0000
++++ unix/xserver117.patch
+@@ -85,7 +85,24 @@ diff -up xorg-server-1.17.1/mi/miinitext
+ diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c
+ --- xorg-server-1.17.1/os/WaitFor.c.vnc	2015-01-26 18:40:30.000000000 +0000
+ +++ xorg-server-1.17.1/os/WaitFor.c	2015-02-13 16:14:05.132516837 +0000
+-@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA
++@@ -52,6 +52,8 @@
++  *
++  *****************************************************************/
++ 
+++#include <X11/Xpoll.h>
+++
++ #ifdef HAVE_DIX_CONFIG_H
++ #include <dix-config.h>
++ #endif
++@@ -66,7 +68,6 @@
++ #include "misc.h"
++ 
++ #include "osdep.h"
++-#include <X11/Xpoll.h>
++ #include "dixstruct.h"
++ #include "opaque.h"
++ #ifdef DPMSExtension
++@@ -125,6 +126,9 @@
+  static void CheckAllTimers(void);
+  static volatile OsTimerPtr timers = NULL;
+  
+@@ -135,3 +152,41 @@ diff -up xorg-server-1.17.1/os/WaitFor.c
+          if (i <= 0) {           /* An error or timeout occurred */
+              if (dispatchException)
+                  return 0;
++--- xorg-server-1.17.1/os/connection.c.orig	2015-07-22 08:50:52.000000000 +1200
+++++ xorg-server-1.17.1/os/connection.c	2015-07-22 08:54:35.000000000 +1200
++@@ -60,6 +60,8 @@
++  *
++  *****************************************************************/
++ 
+++#include <X11/Xpoll.h>
+++
++ #ifdef HAVE_DIX_CONFIG_H
++ #include <dix-config.h>
++ #endif
++@@ -103,7 +105,6 @@
++ #endif                          /* WIN32 */
++ #include "misc.h"               /* for typedef of pointer */
++ #include "osdep.h"
++-#include <X11/Xpoll.h>
++ #include "opaque.h"
++ #include "dixstruct.h"
++ #include "xace.h"
++--- xorg-server-1.17.1/os/io.c.orig	2015-07-22 08:50:52.000000000 +1200
+++++ xorg-server-1.17.1/os/io.c	2015-07-22 08:55:03.000000000 +1200
++@@ -51,6 +51,8 @@
++  *
++  *****************************************************************/
++ 
+++#include <X11/Xpoll.h>
+++
++ #ifdef HAVE_DIX_CONFIG_H
++ #include <dix-config.h>
++ #endif
++@@ -74,7 +76,6 @@
++ #include <X11/Xproto.h>
++ #include "os.h"
++ #include "osdep.h"
++-#include <X11/Xpoll.h>
++ #include "opaque.h"
++ #include "dixstruct.h"
++ #include "misc.h"
diff --git a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc
index e8c6ed252a2..8ea063590ba 100644
--- a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc
+++ b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc
@@ -1,97 +1,94 @@
-$NetBSD: patch-unix_xserver_hw_vnc_InputXKB.cc,v 1.1 2015/02/08 19:42:09 wiz Exp $
+$NetBSD: patch-unix_xserver_hw_vnc_InputXKB.cc,v 1.2 2015/07/21 21:51:39 markd Exp $
 
---- unix/xserver/hw/vnc/InputXKB.cc.orig	2013-05-30 14:53:40.000000000 +0000
-+++ unix/xserver/hw/vnc/InputXKB.cc
-@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
- 
- unsigned InputDevice::getKeyboardState(void)
+--- unix/xserver/hw/vnc/InputXKB.c.orig	2015-07-11 13:00:36.000000000 +0000
++++ unix/xserver/hw/vnc/InputXKB.c
+@@ -212,7 +212,7 @@ unsigned vncGetKeyboardState(void)
  {
--	DeviceIntPtr master;
--
--	master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
--	return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+	return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
+ 	DeviceIntPtr master;
+ 
+-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++	master = vncKeyboardDev->master;
+ 	return XkbStateFieldFromRec(&master->key->xkbInfo->state);
  }
  
- unsigned InputDevice::getLevelThreeMask(void)
-@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
+@@ -234,7 +234,7 @@ unsigned vncGetLevelThreeMask(void)
  			return 0;
  	}
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  
  	act = XkbKeyActionPtr(xkb, keycode, state);
  	if (act == NULL)
-@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
+@@ -259,7 +259,7 @@ KeyCode vncPressShift(void)
  	if (state & ShiftMask)
  		return 0;
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  		XkbAction *act;
  		unsigned char mask;
-@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
- 	if (!(state & ShiftMask))
- 		return keys;
+@@ -299,7 +299,7 @@ size_t vncReleaseShift(KeyCode *keys, si
+ 
+ 	count = 0;
  
--	master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+	master = keyboardDev->master;
+-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++	master = vncKeyboardDev->master;
  	xkb = master->key->xkbInfo->desc;
  	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  		XkbAction *act;
-@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
+@@ -355,7 +355,7 @@ KeyCode vncPressLevelThree(void)
  			return 0;
  	}
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  
  	act = XkbKeyActionPtr(xkb, keycode, state);
  	if (act == NULL)
-@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
- 	if (!(state & mask))
- 		return keys;
+@@ -386,7 +386,7 @@ size_t vncReleaseLevelThree(KeyCode *key
  
--	master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+	master = keyboardDev->master;
+ 	count = 0;
+ 
+-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++	master = vncKeyboardDev->master;
  	xkb = master->key->xkbInfo->desc;
  	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  		XkbAction *act;
-@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
+@@ -429,7 +429,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym
  	if (new_state != NULL)
  		*new_state = state;
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
  		unsigned int state_out;
  		KeySym dummy;
-@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
+@@ -486,7 +486,7 @@ int vncIsLockModifier(KeyCode keycode, u
  	XkbDescPtr xkb;
  	XkbAction *act;
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  
  	act = XkbKeyActionPtr(xkb, keycode, state);
  	if (act == NULL)
-@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
+@@ -524,7 +524,7 @@ int vncIsAffectedByNumLock(KeyCode keyco
  	if (numlock_keycode == 0)
- 		return false;
+ 		return 0;
  
--	xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+	xkb = keyboardDev->master->key->xkbInfo->desc;
+-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
  
  	act = XkbKeyActionPtr(xkb, numlock_keycode, state);
  	if (act == NULL)
-@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
+@@ -558,7 +558,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsi
  	KeySym *syms;
  	KeySym upper, lower;
  
--	master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+	master = keyboardDev->master;
+-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++	master = vncKeyboardDev->master;
  	xkb = master->key->xkbInfo->desc;
  	for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
  		if (XkbKeyNumGroups(xkb, key) == 0)
diff --git a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
index 8b217f421c0..356fe4aefaf 100644
--- a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
+++ b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
@@ -1,21 +1,25 @@
-$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.1 2015/02/08 19:42:09 wiz Exp $
+$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.2 2015/07/21 21:51:39 markd Exp $
 
---- unix/xserver/hw/vnc/Makefile.am.orig	2013-04-09 15:50:50.000000000 +0000
+--- unix/xserver/hw/vnc/Makefile.am.orig	2015-07-11 13:00:36.000000000 +0000
 +++ unix/xserver/hw/vnc/Makefile.am
-@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
+@@ -5,8 +5,12 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
  RDR_LIB=$(LIB_DIR)/rdr/librdr.la
  NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
  XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
 +OS_LIB=$(LIB_DIR)/os/libos.la
  COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
++# Hack to get the C headers to work when included from C++ code
++AM_CXXFLAGS = -fpermissive
++
  noinst_LTLIBRARIES = libvnccommon.la
-@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
- libvnc_la_LDFLAGS = -module -avoid-version
+ HDRS = vncExtInit.h vncHooks.h \
+@@ -64,6 +68,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+ 
+ libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
  
 -libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
 +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
  
  EXTRA_DIST = Xvnc.man
- 
diff --git a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncHooks.cc b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncHooks.cc
deleted file mode 100644
index 150775b21d6..00000000000
--- a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncHooks.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-unix_xserver_hw_vnc_vncHooks.cc,v 1.1 2015/02/08 19:42:09 wiz Exp $
-
---- unix/xserver/hw/vnc/vncHooks.cc.orig	2013-05-22 12:57:16.000000000 +0000
-+++ unix/xserver/hw/vnc/vncHooks.cc
-@@ -119,7 +119,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec
- 
- // screen functions
- 
--#if XORG < 112
-+#if XORG <= 112
- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
- #else
- static Bool vncHooksCloseScreen(ScreenPtr pScreen);
-@@ -140,7 +140,7 @@ static Bool vncHooksDisplayCursor(
- 				  DeviceIntPtr pDev,
- #endif
- 				  ScreenPtr pScreen, CursorPtr cursor);
--#if XORG < 112
-+#if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask);
- #else
-@@ -367,7 +367,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
- // CloseScreen - unwrap the screen functions and call the original CloseScreen
- // function
- 
--#if XORG < 112
-+#if XORG <= 112
- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
- #else
- static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
-@@ -405,7 +405,7 @@ static Bool vncHooksCloseScreen(ScreenPt
- 
-   DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
- 
--#if XORG < 112
-+#if XORG <= 112
-   return (*pScreen->CloseScreen)(i, pScreen);
- #else
-   return (*pScreen->CloseScreen)(pScreen);
-@@ -574,7 +574,7 @@ static Bool vncHooksDisplayCursor(
- // BlockHandler - ignore any changes during the block handler - it's likely
- // these are just drawing the cursor.
- 
--#if XORG < 112
-+#if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask)
- #else
-@@ -582,7 +582,7 @@ static void vncHooksBlockHandler(ScreenP
-                                  pointer pReadmask)
- #endif
- {
--#if XORG < 112
-+#if XORG <= 112
-   SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
- #else
-   SCREEN_UNWRAP(pScreen_, BlockHandler);
-@@ -590,7 +590,7 @@ static void vncHooksBlockHandler(ScreenP
- 
-   vncHooksScreen->desktop->ignoreHooks(true);
- 
--#if XORG < 112
-+#if XORG <= 112
-   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
- #else
-   (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
diff --git a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_xorg-version.h b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_xorg-version.h
deleted file mode 100644
index 3587814ba24..00000000000
--- a/net/tigervnc/patches/patch-unix_xserver_hw_vnc_xorg-version.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-unix_xserver_hw_vnc_xorg-version.h,v 1.1 2015/02/08 19:42:09 wiz Exp $
-
---- unix/xserver/hw/vnc/xorg-version.h.orig	2013-02-19 13:51:29.000000000 +0000
-+++ unix/xserver/hw/vnc/xorg-version.h
-@@ -44,8 +44,10 @@
- #define XORG 113
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
- #define XORG 114
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
-+#define XORG 115
- #else
--#error "X.Org newer than 1.14 is not supported"
-+#error "X.Org newer than 1.15 is not supported"
- #endif
- 
- #endif