Fix ctrl-alt-Fn VT switching. Gleaned from xsrc. Bump rev.

Somebody reported that this was broken but now I can't find the thread ...

3 files changed, 30 insertions, 3 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 84ba2948091..eb97a2826e5 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2015/10/06 11:29:55 tnn Exp $
+# $NetBSD: Makefile,v 1.105 2015/10/11 18:28:53 tnn Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Modular X11 server from modular X.org
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index c6bd20afd41..f2920be23fc 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2015/10/11 17:40:23 tnn Exp $
+$NetBSD: distinfo,v 1.66 2015/10/11 18:28:53 tnn Exp $
 
 SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -8,6 +8,7 @@ SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
 SHA1 (patch-hw_xfree86_common_compiler.h) = c6f2a1ec352e3577dcd46acc8c9c45d81a0c3964
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
+SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__VTsw.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__VTsw.c
new file mode 100644
index 00000000000..b2053bec7e1
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__VTsw.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-hw_xfree86_os-support_bsd_bsd__VTsw.c,v 1.1 2015/10/11 18:28:53 tnn Exp $
+
+VT switching support. From xsrc.
+
+--- hw/xfree86/os-support/bsd/bsd_VTsw.c.orig	2015-05-21 14:21:39.000000000 +0000
++++ hw/xfree86/os-support/bsd/bsd_VTsw.c
+@@ -68,6 +68,9 @@ xf86VTSwitchAway()
+ {
+ #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+     if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
++#ifdef WSCONS_SUPPORT
++	ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
++#endif
+         xf86Info.vtRequestsPending = FALSE;
+         if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
+             return FALSE;
+@@ -83,6 +86,9 @@ xf86VTSwitchTo()
+ {
+ #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+     if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
++#ifdef WSCONS_SUPPORT
++	ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS);
++#endif
+         xf86Info.vtRequestsPending = FALSE;
+         if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
+             return FALSE;