Update to #231.

NOTE: I am going to again re-enable the xterm-toolbar option by default,
as there have been some fixes with font handling.  If anyone notices
any problems with this, please file a PR or email the pkgsrc lists.
Thanks.

ChangeLog:


                            Patch #231 - 2008/01/05

     * undo change to getXtermCell() from patch #230 using PACK_PAIR macro
       (Debian #459014, analysis by Caetano Jimenez Carezzato).
     * minor documentation fixes (patch by Slava Semushin)
     * add makefile actions to install KOI8RXTerm app-defaults file
       (patch by Julien Cristau).

                            Patch #230 - 2007/12/31

     * add quietGrab resource, which when true, suppresses cursor
       repainting
       when NotifyGrab and NotifyUngrab event types are received during
       change of focus (request by Nicolas George).
     * do not treat Unicode BIDI control characters as combining characters
       (Debian #457634).
     * add koi8rxterm, from Debian.
     * add manpage for uxterm, from Debian (Ubuntu #128136, Debian #438645)
     * remove ".xpm" suffixes from Icon filenames in desktop files since it
       confuses some lookups following the Icon Theme Specification (report
       by Slava Semushin)
     * correct width-calculation used for adjusting proportional fonts, to
       work with wide-characters (Debian #441354).
     * fixes/improvements for double-size characters:

          * correct old clipping calculation which used total height of
            glyphs where ascent was needed.
          * if bold font is unavailable, fall back to normal font
          * adjust to "work" with Xft (which does not support double-width
            single-height characters).
          * restore reset of doublesize for a line when it is cleared,
	    broken in patch #228.

     * modify logic for forceBoxChars resource when using TrueType fonts
       to be consistent with bitmap fonts
     * modify logic for forceBoxChars resource to make the "Line-Drawing
       Characters" menu entry use xterm's line-drawing characters even
       asked to draw wide line-drawing characters which are available in
       the font.
     * modify rectangle-support functions to preserve colors when
       filling/erasing (request by Enzo Toscano, to match WRQ Reflection
       behavior).
     * add getopt-parsing to tcapquery.pl, including feature to test the
       extended cursor/editing keys.
     * make missing double-width glyphs display as double-width (Debian
       #456236).
     * change tcap-fkeys and rectangles configure options to enable them
       by default.
     * hide the mouse pointer while user is typing (request by Rodolfo
       Borges).
     * extend configure options --enable-tcap-query and
       --enable-tcap-fkeys to send cursor- and editing-keypad keys
       modified according to the keyboard (or termcap) selection for
       shift, alt, control, meta.
     * modify kdch1 in termcap, e.g., xterm-r6 to match the terminfo file.
     * add -hm option to turn highlightColorMode on or off.
     * add highlightColorMode resource to separate the new
       (since patch #225)
       highlighting with both text- and background-colors (prompted by
       report/example by Thomas Wolff).
     * add Keep Selection menu entry to turn the keepSelection resource
       on/off at runtime.
     * add keepSelection resource, which when enabled, tells xterm to
       retain the X selection even after it stops highlighting it
       (patch by Sergey Vlasov).
     * extend the CSI > n sequence to allow disabling all types of
       modified-keys that the CSI > m sequence affects.
     * move include for <xtermcap.h> in resize.c to avoid redefinition of
       termios structure on OpenSolaris (report by Rahul Gopinathan Nair).
     * extend terminfo building blocks for modified editing keys to
       include all six keys.
     * synchronize terminfo with ncurses (report by Stephane Chazelas):

          * equate xterm-xfree86 and xterm-xf86-v44.
          * add ncurses extensions OTbs, AX, for termcap conversions.
          * make old/legacy entries such as xterm-24, xterm-65 and aliases
            xterms, vs100 inherit from xterm-old.
          * make xterm-r5 and xterm-r6 the same, ignoring historical
	    errors in X Consortium's version.

     * fix an ifdef in logic for selecting regular expressions while in a
       narrow-character locale (Debian #449227).

3 files changed, 11 insertions, 7 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 2e6007accd2..7665851d75a 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2008/01/14 06:16:48 tnn Exp $
+# $NetBSD: Makefile,v 1.39 2008/01/25 18:21:18 bjs Exp $
 
-DISTNAME=	xterm-229
+DISTNAME=	xterm-231
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
diff --git a/x11/xterm/PLIST b/x11/xterm/PLIST
index c772ce8cbf5..0bd21582eb1 100644
--- a/x11/xterm/PLIST
+++ b/x11/xterm/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/17 06:36:21 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/25 18:21:18 bjs Exp $
+bin/koi8rxterm
 bin/resize
 bin/uxterm
 bin/xterm
+lib/X11/app-defaults/KOI8RXTerm
 lib/X11/app-defaults/UXTerm
 lib/X11/app-defaults/XTerm
 lib/X11/app-defaults/XTerm-color
+man/man1/koi8rxterm.1
 man/man1/resize.1
+man/man1/uxterm.1
 man/man1/xterm.1
 share/pixmaps/xterm-color_32x32.xpm
 share/pixmaps/xterm-color_48x48.xpm
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index 7b726de6262..d0e762a8be5 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2007/09/17 06:36:21 bjs Exp $
+$NetBSD: distinfo,v 1.23 2008/01/25 18:21:18 bjs Exp $
 
-SHA1 (xterm-229.tgz) = 483fef795ebee83c513f9a72373d9d16366163d0
-RMD160 (xterm-229.tgz) = 9ff9bd32536817cbb2498a172459428d417f1fa3
-Size (xterm-229.tgz) = 841542 bytes
+SHA1 (xterm-231.tgz) = ad1e84307e00553cff1821a8d8e57f1fd3f72635
+RMD160 (xterm-231.tgz) = b2c2d232623334e10ea7993c2396ac0c5db113bf
+Size (xterm-231.tgz) = 850863 bytes