Update to 2.7.10, provided by Geoff Wing in PR 20899. Also addresses

PR 18638 and PR 18639.
Changes since 2.7.3:
2.7.9 to 2.7.10
Geoff Wing et al.
	removed screen dump feature as it can aid as a security hole
	removed menubar escape sequence access as it can aid a security hole
	removed reporting of title and icon settings as they can aid a security
		hole
Mikko Leppänen
	fixed clearing problem when internalBorder is zero
Steve O
	added Cygwin port
Rob McMullen
	fixed handling of control characters inside escape sequences
	added resource "mouseWheelScrollPage" to allow the mouse wheel
		scroll a page full
	added support for VT52 commands
2.7.8 to 2.7.9
Geoff Wing et al.
	added -sbt/--thickness to allow user-supplied scrollbar width (not
		yet available with NeXT style scrollbars)
Matthew W. Roberts
	fixed rclock -iconic option
	added rclock day of month on clockface (define DATE_ON_CLOCK_FACE
		in feature.h)
	added rclock "-mailspawn cmd" if MAIL_SPAWN is not hard coded in
		feature.h
Kazutoshi Kubota
	added 256 colour mode (instead of the base 16 colour mode) with
		configure --enable-256-color
2.7.7 to 2.7.8
Geoff Wing et al.
	fixed determination of NumLock key, noticed by
		Matthew Gabeler-Lee
	fixed continual and slipwheel scrolling, noticed by
		Joshua Swink
	fixed connecting with IM whenever it is started, partly from
		Tung-Han Hsieh
	fixed Ultrix acquiring useful pty/tty pair, noticed by
		Bert De Knuydt
	fixed CSI sequence parser overriding a 0 parameter with default value
	changed -ip to not clear ancestor windows when using inherit pixmap
		transparency type
	added -ipf/--inheritPixmapforce to clear ancestor windows when -ip
		and inherit pixmap transparency is used
	added "-hc colour" (define OPTION_HC in feature.h) to provide
		background highlighting of selection, partly from
		Christian W. Zuckschwerdt
	added -j/--jumpScroll to provide jump or smooth scrolling, defaults to
		jump scrolling as per previous behaviour
Stephen Isard
	fixed DECSTBM sequence default when only one parameter is given
Rudolf Jaksa
	added basic support for $XAPPLRESDIR/Rxvt resources
T. Alexander Popiel
	added --scrollBar_align (top|bottom|...) for alignment of scrollbar
		thumb with middle button.  Defaults to centre as per prior
		state.  Supercedes FUNKY_SCROLL_BEHAVIOUR
2.7.6 to 2.7.7
Geoff Wing et al.
	fixed check for GLIBC and STREAMS pty/tty types, noticed by
		Venkatesh Krishnamurthi
	fixed check for PTC pty/tty type, noticed by
		Andreas Bierfert
	fixed to not automatically clear selection on screen size change,
		noticed by Dominik Vogt
	fixed a possible buffer overflow problem, noticed by
		Samuel Dralet
	fixed to reallow parallel builds
	fixed builds for some SYSV utmp/utmpx systems
	fixed INCR transfers
	fixed resource "greektoggle_key" as per doc/README.greek, noticed by
		Martin Husemann
	fixed STREAMS again, hopefully the last time
	changed overstrike pixel dropping avoidance to speed/size optimise
	changed define WTMP_ONLY_ON_LOGIN in feature.h to be the default
	added CSI s & CSI u as alternative save & restore cursor sequences
	added pasting-only support for SECONDARY and CLIPBOARD selections,
		automatically tried if internal selection and PRIMARY
		selections are not present.  CUT_BUFFER0 is tried last
Kazutoshi Kubota
	added "-lsp <num>" option ("--lineSpace <num>") to give specified
		spacing between rows with configure --enable-linespace
Tomohiro KUBOTA
	fixed some font default calculations to match previous behaviour
Ali Rahimi
	added slip wheel support providing continual scrolling with the
		control key depressed and using the mouse wheel as an
		accelerator.  Control key release stops scrolling
Mark Schreiber
	added -sw/--scrollWithBuffer to try to make views into the
		scrollback buffer stay unmoving upon new lines (needs -si)
2.7.5 to 2.7.6
Geoff Wing et al.
	fixed build with XTERM_COLOR_CHANGE undefined, noticed by
		John Waggenspack
	fixed build for Solaris/SunOS (maybe others) using STREAMS
	fixed default icon name, noticed by
		Jeremy C. Reed
	fixed setting of icon name with -e argument, noticed by
		John Waggenspack
	fixed problems with selection by changing some types and type casting
	fixed some parallel build problems
	fixed text placement in graphics mode
	fixed some build problems with graphics/qplot
	fixed reverse video mode to act like the invocation option
	fixed query of locale ("Setting locale failed.") when locale is set
	fixed autowrap bug when restoring cursor from last column, noticed by
		witek@mat.uni.torun.pl
	fixed build & run when PREFER_24BIT is undefined
	fixed loading of fonts with noenc multichar encoding, noticed by
		Mark White
	fixed an abort on sending some selections, from
		Xianping Ge
	fixed tty opening for systems with openpty(), e.g. OSF1
	fixed build for utmpx/wtmpx platforms
	fixed a bug in memmove() if --enable-strings is given, noticed by
		Larry W. Virden
	fixed some termcap/terminfo entries
	fixed some division operations to use the same integer type
	changed configure detection method for pty/ttys
	changed handling of ConfigureNotify events for fast event streams
	changed internal handling of window size calculation
	changed internal handling of window size and placement manipulation
	changed define PREFER_24BIT in feature.h to be set via
		configure --enable-24bit (default is now off)
	changed screen refresh to optimise X calls more, noticeable with
		slower machines or over network displays
	changed pty/tty code to be able to be built separately for testing
	changed selection sending to send the original raw form if locale
		conversion fails
	updated libtool for configure
	added DEC private modes 1047 / 1048 (no ti/te handling yet)
	added SCROLL_ON_HOMEEND_KEYS in feature.h a la SCROLL_ON_UPDOWN_KEYS
		from Marius Gedminas
	added "tests" target in main directory to build and run basic tests
	added (frills) -tcw (--tripleclickwords) alternative triple click
		selection which selects words to the end of possibly-wrapped
		lines with trailing blanks and blank lines removed
Chuan-kai Lin and Brian Mays
	added -mcc option (--multibyte_cursor) for multibyte cursor movement
		in legacy programs
Maxime Froment
	fixed placement with OverTheSpot input method
	fixed characters sent through IM being truncated to 4 bytes
	fixed encoding method being overridden by default encoding method
	added loading of locale specific app-defaults from directory
		/usr/X11R6/lib/X11/$LC_CTYPE/app-defaults/Rxvt (see
		XAPPLOADDIRLOCALE is feature.h)
Tomohiro KUBOTA
	added method to provide base font sets based on user's locale
	added more flexible font allocation, specifying a maximum number of
		fonts in feature.h instead of a set number
Marius Gedminas
	added --enable-smart-resize which may reposition the window on
		resizing so that we try to stay within the screen boundaries
2.7.3 to 2.7.5
Geoff Wing et al.
	fixed scrollTtyKeypress not active for all keypresses, noticed by
		Reuben Thomas
	added -xrm option to accept dummy invocation arguments, from
		Christian W. Zuckschwerdt
		& Chris Green
	fixed documentation for options: -tr, -ic, -pt, -im, -mod, -xrm;
                and resources: scrollBar_right, scrollBar_floating,
		scrollTtyOutput, scrollTtyKeypress, preeditType, inputMethod,
		modifier.
	fixed OSC sequences to accept 7 and 8 bit ST as well as BEL
	added MAX_COLS & MAX_ROWS in feature.h to limit columns/rows on resize
	added copy root pixmap variant of transparency - make this the default
		with previous method as fallback
	fixed allocation of new lines to not set base attributes, including
		underline or reverse video information, noticed by
		Brian Mays
	added ability for different scrollbars to be compiled in, determined
		by --scrollstyle
	fixed Meta key detection - has priority over Alt, noticed by
		Paul D. Smith
	fixed configure check for mawk/gawk/nawk/awk
	added use of libtool in build procedure
	added SCROLL_ON_NO_SECONDARY to feature.h to scroll the screen when no
		swap is compiled in and a change screen request is made
	removed slightly buggy ConfigureNotify queue/ignore from our resizes
	fixed use of extended character classes, from
		Samoylov Olleg
	fixed timeout in select() call when unmapped, noticed by
		Tore Bjorkeli
	changed feature.h NO_BOLDUNDERLINE to NO_BOLD_UNDERLINE_REVERSE
	added support for XCopyArea() on screen display - good for slower links
	fixed CSI parameter parsing, including omitted parameters
	fixed allocation of new lines when in reverse video mode
	added answerbackString resource which sets the reply to ENQ (CTRL-E)
	fixed InheritPixmap interaction with fvwm2 by delaying a bit to allow
		the WM to do its stuff before we meddle with its windows
Thomas Woerner
	added colorRV resource for reverse video colour (dependent on
		NO_BOLD_UNDERLINE_REVERSE in feature.h)
Jun Morimoto
	fixed argument checking in rclock - ignore bad arguments
Matthew W. Roberts
	added -mailfile option to rclock
Christian W. Zuckschwerdt
	added OSC sequences to change base colours; also cursor, highlight,
		bold, pointer and underline colours.  See rxvtRef
Paul Sheer
	added initial INCR (incremental pasting) support

11 files changed, 41 insertions, 168 deletions

diff --git a/x11/rxvt/DESCR b/x11/rxvt/DESCR
index ebf227ea910..cba042f5508 100644
--- a/x11/rxvt/DESCR
+++ b/x11/rxvt/DESCR
@@ -1,6 +1,6 @@
-Rxvt is an xterm replacement which uses a little less memory, and is 
-suitable for use on machines with small memories. Tek4010 support
-is removed.
+Rxvt is an xterm replacement which uses a little less memory, and is
+suitable for use on machines with small memories. Tek4010 support is
+not provided.
 
-Modifications were made by Rob Nation (nation@rocket.sanders.lockheed.com) 
-to make it a little more compact, and to add and remove certain features.
+Modifications were made by Rob Nation and several others to make it
+a little more compact, and to add and remove certain features.
diff --git a/x11/rxvt/MESSAGE b/x11/rxvt/MESSAGE
index c835dd2417f..f4ff70ecc41 100644
--- a/x11/rxvt/MESSAGE
+++ b/x11/rxvt/MESSAGE
@@ -1,11 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:54 wiz Exp $
-
-The rxvt binary is able to use greek keyboard extensions and
-multibyte character encodings. Due to errors in the current
-version, the greek keyboard support is not compiled into the
-binary (it can not be disabled at runtime and causes problems
-for users in other locales).
+$NetBSD: MESSAGE,v 1.4 2003/03/27 07:14:25 wiz Exp $
 
 The multibyte character encoding support is compiled in, but
 by default disabled. To enable it, please edit the file 
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 8d15179a2b8..28fec725e08 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2003/01/14 09:08:02 grant Exp $
+# $NetBSD: Makefile,v 1.35 2003/03/27 07:14:25 wiz Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
-DISTNAME=		rxvt-2.7.3
+DISTNAME=		rxvt-2.7.10
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.rxvt.org/pub/rxvt/ \
-			ftp://ftp.rxvt.org/pub/rxvt/devel/ \
-			ftp://ftp.rxvt.org/pub/rxvt/old/ \
 			ftp://mason.primenet.com.au/pub/rxvt/
 EXTRACT_SUFX=		.tar.bz2
 
@@ -19,23 +17,26 @@ USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-utmp \
+			--enable-wtmp \
+			--enable-lastlog \
 			--enable-xpm-background \
 			--enable-transparency \
 			--enable-menubar \
+			--enable-rxvt-scroll \
+			--enable-next-scroll \
 			--enable-xterm-scroll \
 			--enable-xim \
+			--enable-greek \
 			--enable-ttygid \
 			--enable-xgetdefault \
 			--enable-frills \
+			--enable-linespace \
+			--enable-24bit \
 			--enable-keepscrolling \
 			--enable-mousewheel \
-			--enable-languages
-
-# Note: greek support could not be enabled, as the resource file handling
-# to disable it at runtime is documented but not implemented in the current
-# version. See files/Rxvt and check if it works for newer versions. When
-# enabling it, please fix MESSAGE as well.
-#			--enable-greek
+			--enable-slipwheeling \
+			--enable-languages \
+			--with-encoding=noenc
 
 CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11
 CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
@@ -52,12 +53,17 @@ pre-install:
 
 .include "../../mk/bsd.prefs.mk"
 
+post-install:
+.if ${OPSYS} == "NetBSD"
+	# Make rxvt setuid root so that utmp logging functions correctly.
+	#
+	${CHOWN} 0 ${PREFIX}/bin/rxvt
+	${CHMOD} 4711 ${PREFIX}/bin/rxvt
+.endif
+
 .if ${OPSYS} == "SunOS"
 CFLAGS+= -DSunOS
 .else
-CONFIGURE_ARGS+=	--enable-wtmp \
-			--enable-lastlog \
-			--with-encoding=noenc
 .endif
 
 .include "../../graphics/xpm/buildlink2.mk"
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index 383380c55e7..a57f15c26dc 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/01/10 16:16:08 wiz Exp $
+$NetBSD: distinfo,v 1.11 2003/03/27 07:14:25 wiz Exp $
 
-SHA1 (rxvt-2.7.3.tar.bz2) = 1f5380ba70d1b795e6532a79b1e2d7371505b504
-Size (rxvt-2.7.3.tar.bz2) = 266784 bytes
-SHA1 (patch-aa) = 64b7a9793af452fc330715e1f06cc6507f1eda61
-SHA1 (patch-ac) = fda884add4b43b606cb348e47b48eb6ffeafffec
+SHA1 (rxvt-2.7.10.tar.bz2) = 16eae23c3227e28e5e7a53a58eaa3226affe65f9
+Size (rxvt-2.7.10.tar.bz2) = 493199 bytes
+SHA1 (patch-aa) = 7569bd4c4136d19ee4d8a6f1baa02b2b214ea4ad
+SHA1 (patch-ab) = 62ef5b28f8842b769829fed0d217a9c54f48c832
 SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f
-SHA1 (patch-ae) = ce0bd392cde7c436834f68391e0d38b53f1755cc
-SHA1 (patch-af) = 4974d45d51e1d8a5b5ee86e690c8dd0ca1c8ed35
-SHA1 (patch-ag) = 132922885b899dff22a964b1bb491ac25b6e17b8
-SHA1 (patch-ah) = 909dbe0b6dcc0a2fde44f1b174f9af07e78d480e
diff --git a/x11/rxvt/files/Rxvt b/x11/rxvt/files/Rxvt
index f80acd9f213..b7c52297f6b 100644
--- a/x11/rxvt/files/Rxvt
+++ b/x11/rxvt/files/Rxvt
@@ -1,25 +1,10 @@
-! $NetBSD: Rxvt,v 1.1 2001/08/06 06:09:56 martin Exp $
+! $NetBSD: Rxvt,v 1.2 2003/03/27 07:14:26 wiz Exp $
 !
-! This is a default Rxvt app defaults file that just disables greek keyboard
-! support and multibyte character encodings. We build rxvt with support
-! for these, but since the current rxvt version does not properly switch
-! these features on or off at runtime, we controll them via resources.
+! This is a default Rxvt app defaults file that just disables
+! default multibyte character encodings.
 !
-! To enable one of these features, just comment the current active one
-! and uncomment the one you prefere.
-
-! ---- NOTE -------------------
-! Greek keyboard support is not compiled into rxvt, as the following
-! resource is documented but not implemented in the current version.
-! ---- NOTE -------------------
-! greek keyboard support:
-! default:
-! Rxvt.greek_keyboard:	iso
-! Disable greek keyboard support (by disabling the toggle key):
-! Rxvt.greektoggle_key:	VoidSymbol
-! Enable default greek keyboard support: use ModeSwitch to switch
-! into greek input mode:
-! Rxvt.greektoggle_key:	ModeSwitch
+! To enable this feature, just comment the current active one
+! and uncomment the one you prefer.
 
 ! Select multibyte character sheme
 Rxvt.multichar_encoding:	noenc
diff --git a/x11/rxvt/patches/patch-aa b/x11/rxvt/patches/patch-aa
index 5eeaf03851a..6b9b22d667c 100644
--- a/x11/rxvt/patches/patch-aa
+++ b/x11/rxvt/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2003/01/10 16:16:09 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2003/03/27 07:14:26 wiz Exp $
 
---- Makefile.in.orig	Tue Dec 21 21:07:54 1999
-+++ Makefile.in
-@@ -9,7 +9,7 @@ VPATH =		@srcdir@
+--- Makefile.in.org	2003-03-27 11:56:57.000000000 +1100
++++ Makefile.in	2003-03-27 11:57:38.000000000 +1100
+@@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
 -subdirs = src doc rclock src/graphics src/test
 +subdirs = src doc
+ allsubdirs = W11 $(subdirs)
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 
diff --git a/x11/rxvt/patches/patch-ac b/x11/rxvt/patches/patch-ac
deleted file mode 100644
index fe897069ec1..00000000000
--- a/x11/rxvt/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/09/30 21:20:06 martin Exp $
-
---- configure.orig	Sun Mar 26 09:47:39 2000
-+++ configure	Mon Sep 30 22:27:36 2002
-@@ -4163,6 +4163,7 @@
-   cat > conftest.$ac_ext <<EOF
- #line 4165 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <stdio.h>
- #include <utmp.h>
- #include <errno.h>
-@@ -4337,7 +4338,7 @@
- #ifdef UTMPX_FILE
- 	UTMPX_FILE,
- #endif
--    "/var/adm/utmpx", "/etc/utmpx", NULL };
-+    "/var/run/utmpx", "/var/adm/utmpx", "/etc/utmpx", NULL };
-     FILE *a, *f=fopen("conftestval", "w");
-     struct stat statu, statux;
-     if (!f) exit(1);
-@@ -5047,7 +5048,7 @@
- EOF
- 
- fi
--if test x$support_mousewheel = xyes; then
-+if test x$support_mousewheel = xno; then
-   cat >> confdefs.h <<\EOF
- #define NO_MOUSE_WHEEL 1
- EOF
diff --git a/x11/rxvt/patches/patch-ae b/x11/rxvt/patches/patch-ae
deleted file mode 100644
index 916ed68ba17..00000000000
--- a/x11/rxvt/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/09/20 02:12:12 hubertf Exp $
-
---- src/command.c.orig	Wed Sep 20 03:59:35 2000
-+++ src/command.c
-@@ -1395,6 +1395,8 @@
- 	am_transparent = 0;
-     /* XXX: also turn off Opt_transparent? */
-     } else {
-+	if (i > 1)
-+	    sleep(1);
- 	D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
- 	for (n = 0; n < i; n++)
- 	    XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n],
diff --git a/x11/rxvt/patches/patch-af b/x11/rxvt/patches/patch-af
deleted file mode 100644
index ebb874125ac..00000000000
--- a/x11/rxvt/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/10/26 18:02:17 bouyer Exp $
-
---- src/logging.c.orig	Mon Sep 30 22:44:27 2002
-+++ src/logging.c	Mon Sep 30 23:00:46 2002
-@@ -130,6 +130,17 @@
- void
- rxvt_update_lastlog(const char *fname, const char *pty, const char *host)
- {
-+# if defined(RXVT_UTMP_AS_UTMPX) && !defined(SunOS)
-+    struct lastlogx ll;
-+    char filename[FILENAME_MAX];
-+
-+    MEMSET(&ll, 0, sizeof(ll));
-+    gettimeofday(&ll.ll_tv, NULL);
-+    STRNCPY(ll.ll_line, pty, sizeof(ll.ll_line));
-+    STRNCPY(ll.ll_host, host, sizeof(ll.ll_host));
-+
-+    updlastlogx(RXVT_UTMPX_FILE, geteuid(), &ll);
-+# else
- # ifdef HAVE_STRUCT_LASTLOG
-     int             fd;
-     struct passwd  *pwent;
-@@ -165,6 +176,7 @@
-     }
- #  endif			/* LASTLOG_IS_DIR */
- # endif				/* HAVE_STRUCT_LASTLOG */
-+# endif				/* RXVT_UTMP_AS_UTMPX */
- }
- #endif				/* LASTLOG_SUPPORT */
- /* ------------------------------------------------------------------------- */
-
diff --git a/x11/rxvt/patches/patch-ag b/x11/rxvt/patches/patch-ag
deleted file mode 100644
index 035bd2e2db1..00000000000
--- a/x11/rxvt/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/10/26 18:02:17 bouyer Exp $
-
---- src/main.c.orig	Sun Oct 20 23:05:32 2002
-+++ src/main.c	Sun Oct 20 23:06:07 2002
-@@ -39,6 +39,10 @@
- # include <grp.h>
- #endif
- 
-+#ifdef SunOS
-+# include <termios.h>
-+#endif
-+
- /*----------------------------------------------------------------------*/
- /* main() */
- /* INTPROTO */
diff --git a/x11/rxvt/patches/patch-ah b/x11/rxvt/patches/patch-ah
deleted file mode 100644
index da7d2119f41..00000000000
--- a/x11/rxvt/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2002/12/18 15:31:22 christos Exp $
-
---- src/init.c.orig	Sun Mar 26 02:47:01 2000
-+++ src/init.c	Wed Dec 18 10:29:05 2002
-@@ -895,9 +895,13 @@
- /*
-  * Close all unused file descriptors.
-  * We don't want them, we don't need them.
-+ * We keep stdout/stderr, and we will re-open stdin, because
-+ * we want 0,1,2 open so that when pututxline() calls utmp_update
-+ * which is set{u,g}id() the kernel does not complain.
-  */
-     for (i = 0; i < num_fds; i++) {
--	if (i == STDERR_FILENO || i == cfd || i == tty_fd || i == Xfd)
-+	if (i == STDOUT_FILENO || i == STDERR_FILENO
-+	    || i == cfd || i == tty_fd || i == Xfd)
- 	    continue;
- 	close(i);
-     }