From 0c6c797c5a63da2574ee569a12d61a5e638d53c5 Mon Sep 17 00:00:00 2001
From: khorben <khorben@pkgsrc.org>
Date: Thu, 26 May 2016 14:57:24 +0000
Subject: Add a patch to avoid consuming 100% CPU in hold mode

Without this patch, this happens every time the child exits. To reproduce,
simply run "xterm -hold -e true".

Submitted upstream on March 29th 2016.

Bumps PKGREVISION.
---
 x11/xterm/Makefile             |  3 ++-
 x11/xterm/distinfo             |  3 ++-
 x11/xterm/patches/patch-main.c | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 x11/xterm/patches/patch-main.c

(limited to 'x11')

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 4d138f9d08b..b7fc648b709 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2016/04/24 10:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2016/05/26 14:57:24 khorben Exp $
 
 DISTNAME=	xterm-324
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index 4ccc242e982..a3668cd21d7 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.75 2016/04/08 14:43:25 wiz Exp $
+$NetBSD: distinfo,v 1.76 2016/05/26 14:57:24 khorben Exp $
 
 SHA1 (xterm-324.tgz) = eb12025627f5d9aeedaf252e7fc5dd9c30fee0d6
 RMD160 (xterm-324.tgz) = 4c7c3446830b183327b969dbc982e3ee2e56e160
 SHA512 (xterm-324.tgz) = f6f2518a11eec6e41afb10ca4ec298c566b1fc5c3b3c4c4d533311b3f64ec04c2bc692798e75bbd34382cb64eca9b21ee4b05438c4d18486046d3c710c586626
 Size (xterm-324.tgz) = 1235312 bytes
+SHA1 (patch-main.c) = da2b1560c3d8011f6f06e18c37f496566c827c91
diff --git a/x11/xterm/patches/patch-main.c b/x11/xterm/patches/patch-main.c
new file mode 100644
index 00000000000..d7d423edcba
--- /dev/null
+++ b/x11/xterm/patches/patch-main.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-main.c,v 1.1 2016/05/26 14:57:24 khorben Exp $
+
+Avoid consuming 100% CPU in hold mode when the child exits.
+
+--- main.c.orig	2016-03-11 00:31:37.000000000 +0000
++++ main.c
+@@ -5213,8 +5213,7 @@ reapchild(int n GCC_UNUSED)
+     do {
+ 	if (pid == TScreenOf(term)->pid) {
+ 	    DEBUG_MSG("Exiting\n");
+-	    if (!hold_screen)
+-		need_cleanup = True;
++	    need_cleanup = True;
+ 	}
+     } while ((pid = nonblocking_wait()) > 0);
+ 
-- 
cgit v1.2.3