Update to 202, provided by Jeroen Ruigrok van der Werven in private mail.

Add some options to the package.

Changes:

    * add extended shift- and control-modifier cursor keys to "xterm+pcfkeys"
      terminfo entry to correspond to ncurses 20050430 patch.
    * fix a rare case where text would be written with the wrong colors because
      output of scrolled text would reset the colors and the new text would be
      written with the same colors
    * add environment variables $XTERM_SHELL and $XTERM_VERSION
    * corrected workaround for background color of menubar, which gave a
      too-broad expression, coloring the background of the VT100 widget unless
      overridden by another resource setting.
    * correct an error in the logic which decides when sched_yield() is run; it
      would occasionally hang when contending with other pseudo-terminal
      applications such as screen
    * improve resource files to show how the menubar and popup menus can be
      colored
    * modify parsing of OSC (and SOS, etc), strings so their contents are not
      interpreted as UTF-8. This allows non-ASCII title strings to be set,
      provided that the window manager complies (report by Thomas Wolff).
    * improved some of the built-in line-drawing glyphs.
    * correct color of "box" character drawn for line-drawing glyph 1 (report
      by Nicolas George).
    * improve behavior when switching to UTF-8 mode after startup so xterm will
      check if the current fonts are already wide (ISO10646-1). If they are not,
      xterm will use the utf8Fonts subresource to load appropriate fonts
    * modify logic for setting title-string so it applies to the current widget
      rather than the vt100 widget.
    * correct computation of width for wide characters with the invisible
      attribute
    * modify interaction between +u8 and locale resource to allow the
      command-line option to override the resource
    * ignore error in the I/O initialization that tries to set the tty to 7-bit
      input for the case where eightBitInput resource is false
    * modify command-processing to accept an optional parameter that tells
      xterm which shell program to use
    * correct logic of ReallocateBufOffsets() which did not copy the content of
      the old screen buffer to the proper location, making a repaint clear
      after switching to wide-character mode
    * implement the remaining pieces to make xterm allocate cells for
      wide-characters when the "UTF-8" menu entry is selected. Also, load the
      UTF-8 font when that menu entry is selected, or the escape sequence for
      UTF-8 mode is received

3 files changed, 34 insertions, 8 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index d72db05e149..9bbe5bd9ec7 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/04 17:42:31 wiz Exp $
 
-DISTNAME=	xterm-200
-PKGREVISION=	1
+DISTNAME=	xterm-202
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	asmodai@in-nomine.org
 HOMEPAGE=	http://dickey.his.com/xterm/xterm.html
 COMMENT=	Latest terminal emulator for the X Window System
 
@@ -16,6 +15,12 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/x11.buildlink3.mk"
 
+.if exists(/usr/include/wchar.h)
+CONFIGURE_ARGS+= --enable-wide-chars
+.endif
+
+.include "options.mk"
+
 .if ${OPSYS} == "SunOS"
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${INSTALL_FILE}
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index a9580caaeba..d8bc3d17181 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/05/25 02:55:01 reed Exp $
+$NetBSD: distinfo,v 1.15 2005/06/04 17:42:32 wiz Exp $
 
-SHA1 (xterm-200.tgz) = e30103d92a269c3dd25a2ebbbfb2c6d395ab84ce
-RMD160 (xterm-200.tgz) = 1645ed28912f8e9d36b5ca7416ab7d9cb899e6aa
-Size (xterm-200.tgz) = 697480 bytes
+SHA1 (xterm-202.tgz) = 56eb39f01bfb00f09d55ab38882dd8de69e5da8e
+RMD160 (xterm-202.tgz) = 61b46869e5d50799ef6cedadbb6830e0baf2fa8e
+Size (xterm-202.tgz) = 707480 bytes
 SHA1 (patch-aa) = f27bdca6d8635849d8c6ac0f299b6e7e03df5c8a
 SHA1 (patch-ab) = 02b03471debd39fb2671a793af49c5e9fc93ca1e
diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk
new file mode 100644
index 00000000000..97407eab615
--- /dev/null
+++ b/x11/xterm/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2005/06/04 17:42:32 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xterm
+PKG_SUPPORTED_OPTIONS=	xterm-luit
+PKG_OPTIONS_OPTIONAL_GROUPS=	color
+PKG_OPTIONS_GROUP.color=	xterm-88color xterm-256color
+PKG_SUGGESTED_OPTIONS=	xterm-256color xterm-luit
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mxterm-88color)
+CONFIGURE_ARGS+= --enable-88-color
+.endif
+
+.if !empty(PKG_OPTIONS:Mxterm-256color)
+CONFIGURE_ARGS+= --enable-256-color
+.endif
+
+.if !empty(PKG_OPTIONS:Mxterm-luit)
+CONFIGURE_ARGS+= --enable-luit
+.endif