Switch to xorg-server-1.18.4.

Bump PKGREVISION.

3 files changed, 24 insertions, 23 deletions

diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 7b38b5dfbb2..c0171c2cae0 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2016/09/19 09:19:28 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/19 09:37:06 wiz Exp $
 
 DISTNAME=	tigervnc-1.7.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-XORG_SERVER_FILE=	xorg-server-1.17.2
+XORG_SERVER_FILE=	xorg-server-1.18.4
 SITES.${XORG_SERVER_FILE}.tar.bz2=	${MASTER_SITE_XORG:=xserver/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
 
@@ -44,7 +45,7 @@ post-extract:
 	cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
 
 post-patch:
-	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver117.patch
+	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver118.patch
 
 XORG_CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 XORG_CONFIGURE_ARGS+=	--disable-xwayland --disable-kdrive --disable-xephyr
diff --git a/net/tigervnc/distinfo b/net/tigervnc/distinfo
index 8c9d105dd8b..b1df733b049 100644
--- a/net/tigervnc/distinfo
+++ b/net/tigervnc/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.8 2016/09/19 09:19:28 wiz Exp $
+$NetBSD: distinfo,v 1.9 2016/09/19 09:37:06 wiz Exp $
 
 SHA1 (tigervnc-1.7.0.tar.gz) = cd152c1b633fcb13e7e6479583195d57462ea227
 RMD160 (tigervnc-1.7.0.tar.gz) = 0f5e8a9caa7d10f4cbe8f736fbb3999c24f3527b
 SHA512 (tigervnc-1.7.0.tar.gz) = 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004
 Size (tigervnc-1.7.0.tar.gz) = 1405952 bytes
-SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
-RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
-SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551
-Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
+SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52
+RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f
+SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
+Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes
 SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
 SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
-SHA1 (patch-unix_xserver117.patch) = 5894ec9008a0ee9cae79b49af69e91f8bbdfb676
+SHA1 (patch-unix_xserver118.patch) = 83eba1c87bf8a9f40708eb1856c8ac3c66d44cc5
 SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df
 SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574
 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 6f6868032bc9d0b45231f73e719464a0de118fb7
diff --git a/net/tigervnc/patches/patch-unix_xserver117.patch b/net/tigervnc/patches/patch-unix_xserver118.patch
index 152bcb44189..033692c467d 100644
--- a/net/tigervnc/patches/patch-unix_xserver117.patch
+++ b/net/tigervnc/patches/patch-unix_xserver118.patch
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_xserver117.patch,v 1.2 2016/01/17 15:18:04 joerg Exp $
+$NetBSD: patch-unix_xserver118.patch,v 1.1 2016/09/19 09:37:06 wiz Exp $
 
---- unix/xserver117.patch.orig	2015-07-11 13:00:36.000000000 +0000
-+++ unix/xserver117.patch
-@@ -66,7 +66,7 @@ diff -up xorg-server-1.17.1/mi/miinitext
+--- unix/xserver118.patch.orig	2016-09-08 10:31:18.000000000 +0000
++++ unix/xserver118.patch
+@@ -65,7 +65,7 @@ diff -ur xorg-server.orig/mi/miinitext.c
   #include "globals.h"
   
  +#ifdef TIGERVNC
@@ -11,11 +11,11 @@ $NetBSD: patch-unix_xserver117.patch,v 1.2 2016/01/17 15:18:04 joerg Exp $
  +#endif
  +
   /* The following is only a small first step towards run-time
-@@ -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
+@@ -84,7 +84,24 @@ diff -ur xorg-server.orig/mi/miinitext.c
+ diff -ur xorg-server.orig/os/WaitFor.c xorg-server/os/WaitFor.c
+ --- xorg-server.orig/os/WaitFor.c	2016-04-09 21:28:27.071999965 +0200
+ +++ xorg-server/os/WaitFor.c	2016-04-09 21:28:57.587999860 +0200
+-@@ -125,6 +125,9 @@
 +@@ -52,6 +52,8 @@
 +  *
 +  *****************************************************************/
@@ -37,12 +37,12 @@ $NetBSD: patch-unix_xserver117.patch,v 1.2 2016/01/17 15:18:04 joerg Exp $
   static void CheckAllTimers(void);
   static volatile OsTimerPtr timers = NULL;
   
-@@ -135,3 +152,41 @@ diff -up xorg-server-1.17.1/os/WaitFor.c
+@@ -134,3 +151,41 @@ diff -ur xorg-server.orig/os/WaitFor.c x
           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
++--- xorg-server.orig/os/connection.c.orig	2015-07-22 08:50:52.000000000 +1200
+++++ xorg-server/os/connection.c	2015-07-22 08:54:35.000000000 +1200
 +@@ -60,6 +60,8 @@
 +  *
 +  *****************************************************************/
@@ -60,8 +60,8 @@ $NetBSD: patch-unix_xserver117.patch,v 1.2 2016/01/17 15:18:04 joerg Exp $
 + #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
++--- xorg-server.orig/os/io.c.orig	2015-07-22 08:50:52.000000000 +1200
+++++ xorg-server/os/io.c	2015-07-22 08:55:03.000000000 +1200
 +@@ -51,6 +51,8 @@
 +  *
 +  *****************************************************************/