From e24e0d88e509f50732c3cb11add220170272d3bc Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 12 Jun 2016 14:40:27 +0000
Subject: Updated xterm to 325.

Patch #325 - 2016/06/05

    improve manual page discussion of function keys (discussion with Ross Combs).
    further improve fix for Debian #545220 in patch #248, to avoid conflict with combining characters (Debian #738794).
    improve -hold option to avoid 100% CPU usage with NetBSD after closing the shell, which makes subsequent checks for X input events fail (prompted by patch by Pierre Pronchery).
    review #ifdef statements, listed those which do not have a configure option in xtermcfg.hin.
    fixed one case where the menu sensistivity for Print-All Immediately and Print-All on Error was not properly ifdef'd.
    modify terminfo entries for 16-, 88- and 256-color to reset palette with rs1 capability.
    accept legacy value of -kt as synonym for the oldXtermFKeys resource, and extend the full-reset logic to use the keyboard type set via -kt.
    modify ioctl calls for I_PUSH to first check if the module has been added, using I_FIND. This is needed for newer Solaris libraries with c11 support (adapted from patch by Alan Coopersmith).
    add check in getXtermCombining to ensure that combining characters were allocated (report by Tor Andersson).
    add configure option --without-xinerama to allow suppressing the extension (Gentoo #580936).
    update keysym2ucs.c based on Unicode 9.0
    fixed most cppcheck --enable=all warnings, including for style (prompted by report by David Binderman). There was one bug-fix:
        RGB least-squares computation in allocateClosestRGB used only one ordinate
    add cppcheck to lint-like programs in configure script and makefile.
    updates for SIXEL and ReGIS (Ross Combs):
        Fixes some const correctness issues and points out an array lifetime issue
        Sixel drawing should still happen after an error if some commands have been processed
        Tiny steps toward reporting ReGIS input
---
 x11/xterm/Makefile             |  5 ++---
 x11/xterm/distinfo             | 11 +++++------
 x11/xterm/patches/patch-main.c | 16 ----------------
 3 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 x11/xterm/patches/patch-main.c

(limited to 'x11')

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index b7fc648b709..7a69ef908bf 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2016/05/26 14:57:24 khorben Exp $
+# $NetBSD: Makefile,v 1.110 2016/06/12 14:40:27 wiz Exp $
 
-DISTNAME=	xterm-324
-PKGREVISION=	1
+DISTNAME=	xterm-325
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index a3668cd21d7..2d26fa06de3 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.76 2016/05/26 14:57:24 khorben Exp $
+$NetBSD: distinfo,v 1.77 2016/06/12 14:40:27 wiz 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
+SHA1 (xterm-325.tgz) = 1775aec5db7be014d7ed367c8deb34d78376fc0e
+RMD160 (xterm-325.tgz) = 5bf727a0797d44c4732b4ed1779e2392761b81d7
+SHA512 (xterm-325.tgz) = 7049a013967cb90eb196684e7d6d0664cd0d7c86154fba318493d9249e973a4bf591861cbbc051a80184ef427aad75774b15d79cb571d3f82482c1b51e7a99f4
+Size (xterm-325.tgz) = 1237865 bytes
diff --git a/x11/xterm/patches/patch-main.c b/x11/xterm/patches/patch-main.c
deleted file mode 100644
index d7d423edcba..00000000000
--- a/x11/xterm/patches/patch-main.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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