kpty: copy patches from kdelibs4

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Tue May 3 22:04:31 2016 +1200
Changeset:	cb29f69fd72e6df178a5b812bc7bf8171c073615

Modified Files:
	kpty/distinfo
Added Files:
	kpty/patches/patch-src_ConfigureCheck.cmake
	kpty/patches/patch-src_kpty.cpp
	kpty/patches/patch-src_kptydevice.cpp

Log Message:
kpty: copy patches from kdelibs4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb29f69fd72e6df178a5b812bc7bf8171c073615

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kpty/distinfo                               |  3 +++
 kpty/patches/patch-src_ConfigureCheck.cmake | 14 ++++++++++++++
 kpty/patches/patch-src_kpty.cpp             | 26 ++++++++++++++++++++++++++
 kpty/patches/patch-src_kptydevice.cpp       | 15 +++++++++++++++
 4 files changed, 58 insertions(+)

diffs:
diff --git a/kpty/distinfo b/kpty/distinfo
index defdbfb..df27b2c 100644
--- a/kpty/distinfo
+++ b/kpty/distinfo
@@ -4,3 +4,6 @@ SHA1 (kpty-5.21.0.tar.xz) = 48ee95eecb20d4e124f5d6b2466f6b479f50c699
 RMD160 (kpty-5.21.0.tar.xz) = 4622a8f914912908d7be6ecd90f7a7cdc64a91ae
 SHA512 (kpty-5.21.0.tar.xz) = 52fe6ce2f31040ed1976643ef1b1636b789a82e5a2621db0d6e7e7fcb1f4684fe27390c485d2d8624242d0b6b7bf239a92fa5abb3f9473183d5b21c20697f010
 Size (kpty-5.21.0.tar.xz) = 57176 bytes
+SHA1 (patch-src_ConfigureCheck.cmake) = aa44e7b76545c450bc41265a8077877e9f69506b
+SHA1 (patch-src_kpty.cpp) = 2a5db5ad0f936766750b269f193de9e81ebde9a3
+SHA1 (patch-src_kptydevice.cpp) = 1c28c0dd04a87aba8e676685262ef8421ccdbb85
diff --git a/kpty/patches/patch-src_ConfigureCheck.cmake b/kpty/patches/patch-src_ConfigureCheck.cmake
new file mode 100644
index 0000000..2a5c7a4
--- /dev/null
+++ b/kpty/patches/patch-src_ConfigureCheck.cmake
@@ -0,0 +1,14 @@
+$NetBSD$
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- src/ConfigureChecks.cmake.orig	2016-04-03 21:01:19.000000000 +0000
++++ src/ConfigureChecks.cmake
+@@ -42,6 +42,7 @@ if (UNIX)
+     endif (HAVE_UTMPX)
+     if (login_in_libc OR login_in_libutil)
+       set(HAVE_LOGIN 1)
++      check_struct_has_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
+     else (login_in_libc OR login_in_libutil)
+       set(HAVE_LOGIN)
+       check_struct_has_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
diff --git a/kpty/patches/patch-src_kpty.cpp b/kpty/patches/patch-src_kpty.cpp
new file mode 100644
index 0000000..eeb5e1c
--- /dev/null
+++ b/kpty/patches/patch-src_kpty.cpp
@@ -0,0 +1,26 @@
+$NetBSD$
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- src/kpty.cpp.orig	2016-04-03 21:01:19.000000000 +0000
++++ src/kpty.cpp
+@@ -538,6 +538,9 @@ void KPty::login(const char *user, const
+     l_struct.ut_time = time(0);
+ # endif
+ 
++# if HAVE_STRUCT_UTMP_UT_TYPE
++    l_struct.ut_type = USER_PROCESS;
++# endif
+ # if HAVE_LOGIN
+ #  if HAVE_LOGINX
+     ::loginx(&l_struct);
+@@ -545,9 +548,6 @@ void KPty::login(const char *user, const
+     ::login(&l_struct);
+ #  endif
+ # else
+-#  if HAVE_STRUCT_UTMP_UT_TYPE
+-    l_struct.ut_type = USER_PROCESS;
+-#  endif
+ #  if HAVE_STRUCT_UTMP_UT_PID
+     l_struct.ut_pid = getpid();
+ #   if HAVE_STRUCT_UTMP_UT_SESSION
diff --git a/kpty/patches/patch-src_kptydevice.cpp b/kpty/patches/patch-src_kptydevice.cpp
new file mode 100644
index 0000000..86389e3
--- /dev/null
+++ b/kpty/patches/patch-src_kptydevice.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.2 2012/03/19 11:28:49 markd Exp $
+
+NetBSD like FreeBSD
+
+--- src/kptydevice.cpp.orig	2016-04-03 21:01:19.000000000 +0000
++++ src/kptydevice.cpp
+@@ -43,7 +43,7 @@
+ # include <sys/time.h>
+ #endif
+ 
+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD)
+ // "the other end's output queue size" - kinda braindead, huh?
+ # define PTY_BYTES_AVAILABLE TIOCOUTQ
+ #elif defined(TIOCINQ)