From 5bb29a3fa971cb40d7c6bc8d272044216017e7ca Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert>
Date: Sun, 16 Apr 2017 15:15:00 +0000
Subject: Pullup ticket #5278 - requested by sevan x11/mcookie: build fix

Revisions pulled up:
- x11/mcookie/distinfo                                          1.7
- x11/mcookie/patches/patch-include_ttyutils.h                  1.2

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Apr 13 10:17:25 UTC 2017

   Modified Files:
           pkgsrc/x11/mcookie: distinfo
           pkgsrc/x11/mcookie/patches: patch-include_ttyutils.h

   Log Message:
   Add a bunch more compatibility defines.  Fixes SunOS.
---
 x11/mcookie/distinfo                         |  4 +--
 x11/mcookie/patches/patch-include_ttyutils.h | 39 +++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/x11/mcookie/distinfo b/x11/mcookie/distinfo
index e53be5b09e9..ef78bba395b 100644
--- a/x11/mcookie/distinfo
+++ b/x11/mcookie/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/02/27 10:20:01 wiz Exp $
+$NetBSD: distinfo,v 1.6.2.1 2017/04/16 15:15:00 bsiegert Exp $
 
 SHA1 (util-linux-2.29.2.tar.xz) = b488f185e74187a63b55baef9d3f48d5b1780118
 RMD160 (util-linux-2.29.2.tar.xz) = 70bfcbef7210c3a28b067fc064b5619061339fe0
@@ -6,6 +6,6 @@ SHA512 (util-linux-2.29.2.tar.xz) = 0a87e6758531f74276f3de7607ef545f324b9b36b444
 Size (util-linux-2.29.2.tar.xz) = 4277668 bytes
 SHA1 (patch-configure) = 1e6e797b8a0c19f3a55c65a8a51a9fd08a35fead
 SHA1 (patch-include_setproctitle.h) = deb06015ca459886f82e22eaf6596ff79799b02a
-SHA1 (patch-include_ttyutils.h) = 304b7e09b601685c35c6033a95622e50979586ea
+SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
 SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
 SHA1 (patch-lib_setproctitle.c) = 2b6415d9fa484ba1969aa36610b695ba04d0a603
diff --git a/x11/mcookie/patches/patch-include_ttyutils.h b/x11/mcookie/patches/patch-include_ttyutils.h
index 70c36809748..a52994427d9 100644
--- a/x11/mcookie/patches/patch-include_ttyutils.h
+++ b/x11/mcookie/patches/patch-include_ttyutils.h
@@ -1,10 +1,29 @@
-$NetBSD: patch-include_ttyutils.h,v 1.1 2016/09/20 08:00:51 wiz Exp $
+$NetBSD: patch-include_ttyutils.h,v 1.1.6.1 2017/04/16 15:15:00 bsiegert Exp $
 
 Define values if missing.
 
---- include/ttyutils.h.orig	2016-01-06 10:50:36.000000000 +0000
+--- include/ttyutils.h.orig	2016-11-02 12:57:31.535167960 +0000
 +++ include/ttyutils.h
-@@ -114,6 +114,13 @@ static inline void reset_virtual_console
+@@ -60,6 +60,18 @@ extern int get_terminal_name(const char
+ static inline void reset_virtual_console(struct termios *tp, int flags)
+ {
+ 	/* Use defaults of <sys/ttydefaults.h> for base settings */
++#ifndef TTYDEF_IFLAG
++#define TTYDEF_IFLAG	(BRKINT | ICRNL | IMAXBEL | IXON | IXANY)
++#endif
++#ifndef TTYDEF_OFLAG
++#define TTYDEF_OFLAG	(OPOST | ONLCR /*| OXTABS*/)
++#endif
++#ifndef TTYDEF_LFLAG
++#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
++#endif
++#ifndef TTYDEF_CFLAG
++#define TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
++#endif
+ 	tp->c_iflag |= TTYDEF_IFLAG;
+ 	tp->c_oflag |= TTYDEF_OFLAG;
+ 	tp->c_lflag |= TTYDEF_LFLAG;
+@@ -114,6 +126,13 @@ static inline void reset_virtual_console
  # define FFDLY 0
  #endif
  
@@ -18,3 +37,17 @@ Define values if missing.
  	tp->c_iflag |=  (BRKINT | ICRNL | IMAXBEL);
  	tp->c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP);
  	tp->c_oflag |=  (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
+@@ -158,7 +177,13 @@ static inline void reset_virtual_console
+ 	tp->c_cc[VSTOP]    = CSTOP;
+ 	tp->c_cc[VSUSP]    = CSUSP;
+ 	tp->c_cc[VEOL]     = _POSIX_VDISABLE;
++#ifndef CREPRINT
++#define CREPRINT	('r' & 037)
++#endif
+ 	tp->c_cc[VREPRINT] = CREPRINT;
++#ifndef CDISCARD
++#define CDISCARD	('o' & 037)
++#endif
+ 	tp->c_cc[VDISCARD] = CDISCARD;
+ 	tp->c_cc[VWERASE]  = CWERASE;
+ 	tp->c_cc[VLNEXT]   = CLNEXT;
-- 
cgit v1.2.3