Update to xterm-235.

Changes within pkgsrc:

    - Remove most options, as I see no reason not just to build them in
      by default (they shouldn't be intrusive).  I also enabled a few
      features that weren't there before (mouse support for readline
      applications, support for the mini/built-in luit, paste64, etc.).

    - Build-in the toolbar by default.  I patched xterm to disable the
      toolBar resource by default.

    - Include xaw.buildlink3.mk instead of libXaw/buildlink3.mk and
      add some code to configure xterm properly according to the
      user's preference.

    - Use @unexec ${RMDIR} ... when attempting to remove
      lib/X11/app-defaults.

    - Install xterm.desktop and uxterm.desktop to share/applications
      (I don't think this needs desktopdb.mk).

    - Added a 'debug' option which builds in support for event tracing.
      Also, if PKG_DEVELOPER=yes, tell configure to --enable-warnings.


                            Patch #235 - 2008/04/20

     * add control sequences for some of the recent resource/menu settings:

          * altSendsEscape (private mode 1039)
          * keepSelection (private mode 1040)
          * selectToClipboard (private mode 1041)
          * bellIsUrgent (private mode 1042)
          * popOnBell (private mode 1043)

     * add resource formatOtherKeys to provide an alternate escape sequence
       format for the modifyOtherKeys resource (request by Paul LeoNerd
       Evans).
     * adjust saved-cursor position if the window is resized while
       displaying the alternate screen (Novell #196880, Debian #383384).
     * improve pointer-checks to fix a bug exposed by resizing during
       initialization under StumpWM window manager (Fedora Bugzilla #437928).
     * modify unselectwindow() to ensure that the mouse pointer is not
       hidden after xterm loses focus (report by Jeremy Huddleston).
     * add special check for fd_mask on Mac OS X (report by Jeremy
       Huddleston).
     * add dylib to autoconf's suffix list used for checking the result
       from xmkmf, to work with Mac OS X (report by Jeremy Huddleston).
     * correct initialization of bold- and wide-, wide-bold fonts which may
       be set via the utf8Fonts subresource (Debian #347790).

                            Patch #234 - 2008/03/02

     * modify sinstall.sh to use POSIX locale to bypass GNU ls changes to
       date-format.
     * improved/refined changes for closing bitmap font (patch by Andrea
       Odetti).
     * improve resize computation for situations where the negotiation
       fails, by invoking the xterm widget's core-class resize method
       (Debian #365602, patch by Jim Paris).
     * restore initialization of terminal's VMIN and VTIME settings, from
       patch #232 changes (patch by Matthieu Herrb).

                            Patch #233 - 2008/02/24

     * add configure check for ttydefaults.h, include if needed, e.g., for
       systems where defining _POSIX_C_SOURCE, etc., prevents it from being
       included via termios.h (prompted by comments by Robert Delius Royar
       and Jeremy Huddleston).
     * patches from Alan Coopersmith. These correspond to bug-ids on
       bugs.opensolaris.org

            4029911
                    fix a typo in manpage

            4045962
                    xterm doesn't properly set ut_syslen

            4192572
                    left-left-right misinterpreted as triple click

     * minor optimization to tab-initialization (patch by Nemeth Marton).
     * fix a case where an incorrect font was freed during initialization
       from patch #232 changes (patch by Andrea Odetti).
     * improve comparison used in SameFont function for GC-caching (Julien
       Cristau).
     * correct macro name used for default CKILL definition to work with
       Mac OS X (report by Jeremy Huddleston).

                            Patch #232 - 2008/01/30

     * corrected logic in a font-cache used for reverse-video (Debian
       #404079).
     * add control sequence to alter pointerMode at runtime.
     * add limit-checks for rectangle operation parameters (report by
       Martin Pirker).
     * modify minstall.sh to suppress $MANPAGER and $PAGER environment
       variables, which may interfere with redirecting output of man to a
       shell variable (report/patch by Zdenek Sekera).
     * do not try to hide mouse pointer in the tek4014 window, fixes broken
       "-t" option at startup from patch #230 changes (report by Robert K.
       Nelson).
     * correct datatype used when drawing tek4014 data using xterm compiled
       for wide-characters, on big-endian machines (reports by Jeremy
       Huddleston, Harald Hanche-Olsen, Martin Costabel, Merle Reinhart).
     * modify to cache the font-names along with the bitmap font data, to
       improve comparison of fonts.
     * modify to allow building with configure options --disable-ansi-color
       and --disable-leaks (Debian #459817, report/patch by Nemeth Marton).
     * modify to allow building with configure options --enable-wide-chars
       and --disable-c1-print (Debian #459816, report/patch by Nemeth
       Marton).
     * add pointerMode resource to control whether and when the pointer
       cursor is hidden as the user types.
     * simplify initialization of ttyMode- and related characters using a
       table.
     * modify initialization-logic for stty values that correspond to
       ltchars structure and the BSD TIOCSLTC ioctl (susp, dsusp, rprnt
       flush, werase, lnext). These were reset to constants for both
       termios and legacy interfaces immediately after asking the system
       for the existing values since X11R6.1, rather than using them to
       provide inherited values. While the legacy interface has some
       constraints, e.g., on HPUX, the POSIX or termios interface should
       not. Your shell may reset these anyway (prompted by patch by Ed
       Schouten).
     * improve logic for hiding/displaying pointer-cursor (report by Mark
       Brukhartz).
     * add limit-checks to tabs.c, increase maximum column for setting
       tab-stops from 320 to 1024 (report by Nemeth Marton).
     * correct length, i.e., number of types of selection targets, computed
       by ConvertSelection() when not handling wide characters for the
       XA_TARGETS() case. This leaves an extra Atom on the end of the list
       which is not handled by Java applications. The problem was introduced
       in patch #151 (report by David Wood).

5 files changed, 70 insertions, 45 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 1b2c84ebb12..5161e909fd4 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2008/03/05 20:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/21 17:10:40 bjs Exp $
 
-DISTNAME=	xterm-231
-PKGREVISION=	1
+DISTNAME=	xterm-235
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
@@ -12,28 +11,36 @@ COMMENT=	Latest terminal emulator for the X Window System
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_DIRS+=	xdg-1.4
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.4
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
+CONFIGURE_ARGS+=	--enable-88-color
+CONFIGURE_ARGS+=	--enable-256-color
+CONFIGURE_ARGS+=	--enable-luit
+CONFIGURE_ARGS+=	--enable-paste64
+CONFIGURE_ARGS+=	--enable-mini-luit
+CONFIGURE_ARGS+=	--enable-readline-mouse
+CONFIGURE_ARGS+=	--enable-toolbar	# Resource disabled by default
+
+CONFIGURE_ARGS.standard=# empty
+CONFIGURE_ARGS.3d=	--with-Xaw3d
+CONFIGURE_ARGS.xpm=	--with-Xaw3d
+CONFIGURE_ARGS.neXtaw=	--with-neXtaw
+CONFIGURE_ARGS+=	${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --disable-imake --enable-narrowproto
+CONFIGURE_ARGS+=	--disable-imake
+CONFIGURE_ARGS+=	--enable-narrowproto
 .endif
 
 .if exists(/usr/include/wchar.h)
-CONFIGURE_ARGS+= --enable-wide-chars
-.endif
-
-.include "options.mk"
-
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --with-setuid
+CONFIGURE_ARGS+=	--enable-wide-chars
 .endif
 
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 ###
 ### For detection of XKB bell extension.
@@ -41,5 +48,15 @@ CONFIGURE_ARGS+= --with-setuid
 BUILDLINK_DEPMETHOD.libxkbfile?=	build
 .include "../../x11/libxkbfile/buildlink3.mk"
 
+post-install:
+	 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \
+	 ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
+		${DESTDIR}${PREFIX}/share/applications && \
+	 ${INSTALL_DATA} ${WRKSRC}/uxterm.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+
+.include "options.mk"
+
 .include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xterm/PLIST b/x11/xterm/PLIST
index 0bd21582eb1..f5dbc051707 100644
--- a/x11/xterm/PLIST
+++ b/x11/xterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/01/25 18:21:18 bjs Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/21 17:10:40 bjs Exp $
 bin/koi8rxterm
 bin/resize
 bin/uxterm
@@ -11,10 +11,12 @@ man/man1/koi8rxterm.1
 man/man1/resize.1
 man/man1/uxterm.1
 man/man1/xterm.1
+share/applications/uxterm.desktop
+share/applications/xterm.desktop
 share/pixmaps/xterm-color_32x32.xpm
 share/pixmaps/xterm-color_48x48.xpm
 share/pixmaps/xterm_32x32.xpm
 share/pixmaps/xterm_48x48.xpm
 @comment in xdg-dirs: @dirrm share/pixmaps
-@comment @dirrm lib/X11/app-defaults
-@comment @dirrm lib/X11
+@comment in xdg-dirs: @dirrm share/applications
+@unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE}
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index d0e762a8be5..7a4af7b7698 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.23 2008/01/25 18:21:18 bjs Exp $
+$NetBSD: distinfo,v 1.24 2008/04/21 17:10:40 bjs Exp $
 
-SHA1 (xterm-231.tgz) = ad1e84307e00553cff1821a8d8e57f1fd3f72635
-RMD160 (xterm-231.tgz) = b2c2d232623334e10ea7993c2396ac0c5db113bf
-Size (xterm-231.tgz) = 850863 bytes
+SHA1 (xterm-235.tgz) = 4d449a9e50e342e0b7a6deba9d713e6ba9323d1e
+RMD160 (xterm-235.tgz) = 8a3cb03df08ad9da8d4391de612ec6e8f1573bcb
+Size (xterm-235.tgz) = 857714 bytes
+SHA1 (patch-aa) = cf93a5388106cf08bf7145890a45be7c12d186f6
diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk
index 7ebc3958bda..18f13860371 100644
--- a/x11/xterm/options.mk
+++ b/x11/xterm/options.mk
@@ -1,35 +1,22 @@
-# $NetBSD: options.mk,v 1.8 2008/01/25 18:22:01 bjs Exp $
+# $NetBSD: options.mk,v 1.9 2008/04/21 17:10:40 bjs Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xterm
-PKG_SUPPORTED_OPTIONS=	pcre xterm-luit freetype xterm-toolbar
-PKG_OPTIONS_OPTIONAL_GROUPS=	color
-PKG_OPTIONS_GROUP.color=	xterm-88color xterm-256color
-PKG_SUGGESTED_OPTIONS=	xterm-256color xterm-luit xterm-toolbar
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xterm
+PKG_SUPPORTED_OPTIONS=		debug pcre freetype
+PKG_SUGGESTED_OPTIONS=		freetype
 
 .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
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+= --enable-trace
+CONFIGURE_ARGS+= --enable-warnings
+.elif defined(PKG_DEVELOPER) && !empty(PKG_DEVELOPER:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-warnings
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreetype)
 CONFIGURE_ARGS+= --enable-freetype
-
-.include "../../x11/libXft/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mxterm-toolbar)
-CONFIGURE_ARGS+= --enable-toolbar
+.  include "../../x11/libXft/buildlink3.mk"
 .endif
-
 ###
 ### XXX The configure test checks for pcreposix_regcomp in libpcreposix.
 ###	However, there is no such function [insofar as I can tell].
diff --git a/x11/xterm/patches/patch-aa b/x11/xterm/patches/patch-aa
new file mode 100644
index 00000000000..c08ce073e00
--- /dev/null
+++ b/x11/xterm/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.8 2008/04/21 17:10:40 bjs Exp $
+
+One needs to explicitly enable building in the toolbar code, yet 
+this turns it on by default, which not everyone wants.
+
+Let's attempt to convince xterm of this here.
+
+--- main.c.orig	2008-02-27 19:28:00.000000000 -0500
++++ main.c
+@@ -881,7 +881,7 @@ static XtResource application_resources[
+     Bres("sessionMgt", "SessionMgt", sessionMgt, True),
+ #endif
+ #if OPT_TOOLBAR
+-    Bres(XtNtoolBar, XtCToolBar, toolBar, True),
++    Bres(XtNtoolBar, XtCToolBar, toolBar, False),
+ #endif
+ };
+