Update to 279.

Patch #279 - 2012/05/10

    fill in missing cases in the save/restore modes feature (report by Thomas Wolff).
    add check to ensure that combining characters are precomposed in the order given (report/analysis by Andries E Brouwer).
    improve workability check for posix_openpt(), to take into account BSD systems which do not complete initialization until both sides of the pseudoterminal are opened (report by Christian Weisgerber).
    amend fix for Debian #650291 in patch #277 changes to account for different data returned by vnc4server (Debian #670638).
    add check in DECCRA operation to make copies of blinking text also blink by updating a line-level flag.
    modify rectangle operations to work with DECOM.
    modify DECSERA to use the current protected state rather than preserving it.
    add precompose resource to allow storing character data in Normalized Form D as described in http://unicode.org/reports/tr15/ (report/discussion with Andries E Brouwer).
    modify CBT, other ISO-6429 controls which are used by VT520 to work with DECOM.
    add HPR and VPR controls, ISO 6429 cursor movement used in VT520.
    remove "linux" restriction for IUTF8 ifdef in main.c (prompted by Matthew Dempsky posting on mailing.openbsd.tech).
    implement the remaining VT420-level device status reports.
    change DECXCPR to return page 1, rather than 0.
    improve VT-level checks on reporting functions, such as DECXCPR.
    change limit on decTerminalID to 525.
    fixes to improve vttest vt52 screen when running as a VT420:
        add checks for some VT2xx and up controls for consistency: DECSCL, S1C8T, S1C7T.
        modify DECRQSS return for DECSCL to only return that when running as VT2xx and up.
        when exiting from VT52-mode, resume in VT100 level rather than the level before starting VT52-mode.
    implement DECLRMM, DECSLRMM and DECNCSM (prompted by discussions with Ailin Nemui and Paul LeoNerd Evans). This modifies several controls to obey top/bottom and left/right margins.
    correct macro definition used for testing modes used in ANSI/DEC request-mode controls introduced in patch #262.
    modify x_getlogin to check $LOGNAME and $USER before fallback to getlogin, so that user's choice for these variables can be carried forward to the xterm process (Debian #611487).
    document DECSCUSR response for DECRQSS in ctlseqs.ms
    add zIconTitleFormat resource to allow customizing the "*** " prefixed to the icon title when the zIconBeep feature is activated (request by Thomas Adam).
    modify DECSCUSR to update the same internal variable as RM/SM 12, and document in manpage the two variables used for controlling blinking cursor (report by Paul LeoNerd Evans).
    correct response data for DECSCUSR in reply for DECRQSS response, which had inverted the blink-value (reports by Ailin Nemui, Paul LeoNerd Evans).
    add a null-pointer check in OkPasswd macro to fix a problem in resize with Fedora 17 and a serial console (report/patch by Daniel Drake).
    add workaround for Mac OS X, which loses the window size of a pseudo-terminal when the tty device is opened (report/analysis by Egmont Koblinger).
    updated configure check for workable posix_openpt versus grantpt, from luit fixes.
    modify DECIC/DECDC/DECBI/DECFI implemented in patch #277 to enable them only in VT4xx mode and up (report by Ailin Nemui).
    update config.guess, config.sub

Patch #278 - 2012/01/18

    correct initialization for eightBitMeta resource (FreeBSD #164101).
    make special check for Darwin 9 (and lower) to not use posix_openpt (report by Christian Ebert).
    minor fixes (adding ".ne" directives) to reduce the cases where groff's utility for generating images for tables dumps core. Most versions of groff (I've found 1.19.2 to be the most stable) dump core when attempting to report that there are too few lines on a page for a table to be shown.
Patch #277 - 2012/01/07

    remove special case for ISC pseudo-terminals which attempts to open the pty in two different ways.
    move call to grantpt before asking utempter to add a record, to work with kFreeBSD which does not update the terminal's ownership until this point (Debian #652907).
    document limitation of XIM interface in manpage (Debian #230787).
    cleanup error reporting with new xtermWarning function.
    add configure option --disable-selection-ops to make the new actions optional.
    add four new actions for making the selection or data directly copied from the screen (prompted by discussion in Debian #637001, as well as report by Arjen van Tol):
        exec-formatted
        exec-selectable
        insert-formatted
        insert-selectable
    add visualBellLine resource to allow visualBell to flash only the current line (prompted by patch by Gertjan Halkes).
    add eightBitMeta resource to control the features which modify or interpret the eighth bit of a key when the meta modifier key is pressed (prompted by Debian #326200).
    improve discussion of eightBitInput in the manpage (prompted by Debian #326200).
    correct logic for alt-sends-escape action, overlooked when implementing altSendsEscape resource, which still used eightBitInput resource value.
    add a workaround for XAllocColor(), which does not actually allocate "a read-only colormap entry corresponding to the closest RGB value supported by the hardware", but rather a rough approximation (Debian #650291).
    undo parameter checks for RequestResize() added in patch #251 and amended in patch #270, because zeros also are special cases (report by John S Urban).
    modify some test-scripts to use /bin/echo rather than the shell's possibly-builtin echo, to work around broken configuration on Mac OS X, i.e., neither honoring the option nor flagging an error.
    add SGR 1006, as a better technical solution than SGR 1015:
        the responses will not be confused with line-deletion and scrolling controls.
        the button encoding is a little simpler, since it does not add an unnecessary 32 because the integer parameter does not have to be represented as a printable character.
        the control responses for pressing and releasing a mouse button differ, allowing an application to tell which button was released.

    Besides these improvements, in discussion, it was noted that urxvt's implementation of 1005 is incorrect, relying upon a locale that provides UTF-8 encoding. In contrast, vttest demonstrates a correct decoding, independent of locale.
    add support for urxvt SGR 1015 to address shortcoming of SGR 1005 with luit (patch by Egmont Koblinger).
    add ISO and DEC controls useful for left/right scrolling.
    add some changes for OpenBSD and MirBSD (adapted from patch by Thorsten Glaser):
        disable search for non-Unix96 ptys.
        fix a gcc warning in timestamp_filename
        modify Imakefile to install xterm setgid to utmp.
    add/use/prefer posix_openpt() for opening pseudo-terminal.
    modify special errno handling case in ptydata.c from patch #158 to allow for the possibility that any platform may have special cases where "/dev/tty" is absent. For example, this can happen in a FreeBSD jail (patch by David Wolfskill).
    add keyboard logic to map shift-tab into XK_ISO_Left_Tab, which is usually, not always, done by the X keyboard configuration.
    portability fixes for some configure macros: CF_XOPEN_SOURCE

Patch #276 - 2011/10/10

    modify clipping limits for TrueType fonts to account for the scaleHeight resource setting, to work around another problem due to recent FreeType changes. In this case, the DejaVu Sans Mono set to pixelsize=13.5 is truncated because the font descent is reduced by FreeType to match an incorrect height metric (report by Adam Lee).
    improve recovery when bitmap fonts are not installed, e.g., so that switching font-sizes works for TrueType fonts.
    modify lookup for XTERM_SHELL feature to allow relative pathnames.
    modify abbreviation disambiguation check for command-line parameters to account for -geometry, whose parameter may begin with "+" or "-" (report by Scott Bertilson).

Patch #275 - 2011/09/11

    add ash, zsh to known shells for resize.
    modify resize to reuse the logic from xterm which determines the actual logon-user's shell if $SHELL is not set.
    revert the unsetenv("SHELL") added in patch #272.
    an unsetenv("SHELL") added in patch #272 to help ensure that luit would get the user's shell consistently did not work as expected for cases where multiple names are in the password-file for a given uid. That was because changes in patch #157 to handle this situation did not take into account that repeated calls to getpwnam and getpwuid return a pointer to the same static buffer. Fixed the older logic to work as intended, by ensuring that the passwd-data from each call is stored separately (report by Paul Keusemann).
    adjust ifdef's for putenv and unsetenv in case only one of those is provided on a given platform.
    correct comparison used in ExposeContains macro from patch #274 changes, to handle window-dragging (patch by Todd Eigenschink).

Patch #274 - 2011/09/05

    portability fixes for cygwin: do not define SVR4, and work around nonstandard header location.
    ifdef'd use of unsetenv from patch #273 changes to work with Solaris 9 (report by Waldemar Rachwal).
    modify logic for XtAppPending to merge adjacent Expose and ConfigureNotify events which are redundant (report by Edward McGuire).
    fix an unneeded warning message when -r option is given.
    remove a few redundant entries from table used for helping abbreviation-checking of command-line options, makes -geom work again after patch #272 changes as an abbreviation of -geometry.
    add scaleHeight resource and command-line option -sh as workaround for some font-configurations broken by changes in FreeType 2.4.6 (report by Miroslav Hodak).
    portability fixes for some configure macros: CF_FUNC_TGETENT, CF_XOPEN_SOURCE, CF_X_ATHENA_LIBS.
    add configure option --with-freetype-config to improve selection over the plethora of configuration options which freetype has so far provided.
    build-fix for configure --enable-load-vt-fonts when --enable-widec is not specified.
    build-fixes for suppressing various features, needed after changes in patches 270, 271 and 272 (report by Brian Lindholm)

Patch #273 - 2011/08/25

    build-fix for out-of-tree "make docs" rule.
    correct a typo in x_strdup, from patch #198 changes.
    correct initialization for -e option, broken in patch #272 changes (report by Gabriele Balducci).
    build-fix for out-of-tree builds to address minstall script changes in patch #272 (patch by Thierry Reding).

Patch #272 - 2011/08/24

    document limitation of Gtk in connection with xterm's -into option, in the manpage (Ubuntu #806969).
    improve -into by checking for and using the size of the window within which xterm is embedded, overriding other clues.
    modify logic for localeFilter resource to allow that to include command-line options of luit.
    improve -into by checking for invalid window-id, and allowing hexadecimal/decimal/octal values.
    improve keepSelection, adding the case where the highlighting is cleared, overlooked in patch #230 (patch by Marco Peereboom).
    improve command-line parsing to make abbreviate options work consistently across xterm-specific versus standard X toolkit options, and report cases where an abbreviated option happens to be ambiguous. In particular, -d now works as an abbreviation for -display.
    fix regression in command-line parsing introduced in patch #271 changes for Debian #629358, (Debian #637910).
    split-out new termcap/terminfo building block xterm+kbs for configurability.
    modify terminfo file to reflect changes in ncurses for xterm-16color and xterm-256color.
    modify minstall.sh, etc., to reflect the default default class, $TERM and decTerminalID values.
    reword resize manpage to reflect the fact that $TERMCAP is not set on all systems (patch by Alan Coopersmith).
    work around combined Xaw6/Xaw7 package in DragonFlyBSD which omits the usual symbolic link to the preferred library name.
    further improve build-fix for termcap systems by checking for some which are only partial implementations, e.g., termcap 2.08 in CentOS 5.2

Patch #271 - 2011/07/14

    omit permissions adjustments to pty on exit except for pre-Unix98 ptys, since modern implementations handle this (report by Sean C Farley).
    modify logic for switching fonts between UTF-8 and non-UTF-8 encoding to not merge the derivable bold-, wide- and widebold values from the VT100 fonts. Also suppress warning when not using UTF-8 fonts if wide- and widebold-fonts cannot be derived or otherwise loaded (report by Werner Scheinast).
    modify menu-creation to suppress entries which will never be used in the current configuration, rather than simply disabling them.
    add resource printModeImmediate and menu item to allow print of screen plus saved lines to a file.
    add menu item to allow runtime enable/disable of the printFileOnXError feature.
    append a timestamp to filename used in printFileOnXError feature, and restrict its permissions (request by Vincent Lefevre).
    add a check when cancelling cursor-blinking, in case the cursor is blinked off. Fix so that the cursor is repainted without waiting for other events, e.g., keypress (report by Ailin Nemui).
    add configure --with-app-class option, to simplify building "xterm-dev" packages with filenames that do not conflict with conventional "xterm" packages.
    corrected logic flow for DECSCL, which prevented the updated operating level from being reported via DECRQSS (report by Ailin Nemui).
    corrected default for brokenStringTerm resource to match manpage.
    add vttests/dynamic.pl
    add runtime check for locale not supported by X libraries, and fallback to XA_STRING in this case (request by Bryan Henderson).
    fix a special case in configure script after no FreeType libraries are found. The script was proceeding to check for a usable configuration.
    add xterm+tmux building block to terminfo (adapted from changes proposed by Ailin Nemui and Nicholas Marriott).
    improve discussion of faceName resource in manpage (adapted from suggestions by Jens Schweikhardt).
    correct mapping of shifted up/down cursor-keys in termcap function-keys mode, i.e., resource tcapFunctionKeys (patch by Gertjan Halkes).
    update AIX case in CF_XOPEN_SOURCE configure macro to add release 7.x.
    modify ifdef's in xterm_io.h for __hpux to force that to use the hacked SYSV support in that file. This fixes a problem with a non-blocking socket call (patch by Paul Lampert).
    improve filtering of desktop category scanning, to exclude XFCE.
    modify configure script to work with systems that have both ncurses (or other terminfo) as well as a real termcap library, e.g., Slackware (report by Andrew Watts).
    modify configure script to work around special case where user's environment adds compiler flags to the CC variable (prompted by report by Paul Lampert).
    amend change for Debian #110226 so that "-h" or "-v" options cause an exit, rather than simply printing to stdout while the window is displayed (Debian #629358).
    add response for DECRQSS which gives the setting for DECSCUSR.
    modify AllocateTermColor() to handle XtDefaultForeground and XtDefaultBackground, which are not recognized by XParseColor. For example, this fixes the use of OSC 112 when no explicit cursor color was set (report by Ailin Nemui).
    handle special-case of KeyPress translated to popup-menu action (Ubuntu #756273).

Patch #270 - 2011/04/26

    build-fix, e.g., for using imake on platforms which use the termcap library.
    modify utf8 resource to accept a name.
    mention default for fontWarnings in manpage (report by Werner Scheinast).
    split "UTF-8" menu entry into "UTF-8 Encoding" and "UTF-8 Fonts" (prompted by discussion with Werner Scheinast).
    gray-out font-menu entries when a font fails to load, e.g., a bitmap font is not installed.
    improve behavior when there is no app-defaults file:
        set the toolBar resource to false
        gray-out the font menu entries where no resource is found.
    add configure option --with-desktop-category to allow customization of the ".desktop" files.
    build-fix for the install-desktop makefile-rule, when the source/build directories differ (patch by Loïc Minier).
    add menu entry and corresponding resource which can be used to suppress all bold-fonts (discussion with Jan Engelhardt).
    make internal line-size value consistent with allocated sizes of character and related arrays to ensure that bulk copying of line data, e.g., in scrolling, accounts for the padding used for pointer alignment (adapted from patch by Rajesh Mandalemula, also reported by Ali Bahar).
    widen ifdef for screen-resizing logic from patch #176 changes to send SIGWINCH to process group to include any system supporting ioctl(*,TIOCGPGRP,*) (prompted by linux-specific patch in OpenSUSE rpm package).
    add printModeOnXError and printFileOnXError resources, which allow the user to specify that xterm will write the contents of its screen to a file if it is exiting due to an X error (Debian #280457).
    restore logic that made reverse-video apply to the scrollbar's foreground/background, broken in patch #158 (report by Bryan Ischo).
    amend some of the window operations parameter-checks added in patch #251 for the push/pop title feature, to allow the parameters used for window resizing to be -1's, which makes the corresponding values ignored rather than using the window's maximum width/height (report by Noah Friedman).
    correct order of initialization for translations vs fullscreen resources to enable a special case which omits the Alt-Enter translation when fullscreen is disabled (Debian #612978).
    update config.guess, config.sub

Patch #269 - 2011/02/19

    build-fixes for imake (report by Heiko Berges).
    modify autoconf macro CF_PKG_CONFIG to work with cross-compile environments (patch by Thierry Reding).
    modify MapToColorMode() to favor bold over underline, matching the precedence used before patch #252 (report/analysis by Nicolas George).
    add omitTranslation resource, which can be used to suppress the default translations for these features:
        fullscreen
        scroll-lock
        shift-fonts
        wheel-mouse
    make the fullscreen feature configurable (Debian #612978)
        add it to the configurable list disallowedWindowOps.
        add command-line option -fullscreen to allow the feature to be enabled at startup.
        add resource fullscreen to control whether the feature is active or may be enabled.
    modify probe_netwm_fullscreen_capability for 64-bit machines. Contrary to XGetWindowProperty manpage, that function returns 32-bit data packed as long's.
    eliminate copy of name resource, which was otherwise used only to give the terminal-description name for the tcap-query feature. Use the actual $TERM value instead, as derived from termName resource, etc.
    eliminate an old inconsistency with error messages, some used the -name option, while others used argv[0]. The latter is now used consistently.
    improve configure check for rpath-hack, to improve builds on systems where gcc will not search /usr/local/lib, etc.
    build-fix for Xaw3d configuration (report by H Merijn Brand).
    update config.guess, config.sub

Patch #268 - 2011/02/10

    fix an inconsistency of the "Enable Reverse Video" checkbox in the VT Options menu. This also removes a special case added in patch #217 which limited the effect of the reverseVideo resource (Debian #603808).
    amend decoding of misformed UTF-8 sequences to avoid absorbing valid characters as documented in Unicode 6.0 section 3.9 (report by Keith Winstein).
    do not set urgency hint when window already has focus (patch by Dimitrios Christidis).
    amend extended mouse-coordinate mode from patch #262 changes to include the Cb button-code, which also may be greater than 127 (report by Ailin Nemui).
    ensure that underline-cursor is visible when an application happens to set the background color (report by Christian Weisgerber).
    add feature for full-screen toggling using either Alt-Enter or a menu selection (integrated patch by Dave Simmons).
    add missing logic to handle reallocation of FIFO index for the "UTF-8" menu entry (report by David Holland, NetBSD #44344).
    add makefile rules docs-ctlseqs, docs-xterm, etc.
    correct typo in description of DECRPM in control sequences document (report by Ailin Nemui).

Patch #267 - 2010/11/20

    minor formatting changes to ctlseqs.ms to simplify a script which extracts the feature information. See the results in Comparing versions, by counting controls in the xterm FAQ.
    add docs-clean makefile rule.
    add copy-selection action (request by Timo Juhani Lindfors, Debian #588785).
    trim leading/trailing blanks from string used for "Selection" font-menu data.
    trim leading/trailing blanks from color resource values.
    configure script improvements:
        add workaround for removal of X11 dependency from Xt's package file (report by Robert Hooker).
        add workaround for removal of fontconfig dependency from Xft's package file (report by Jeremy Huddleston).
        add workaround for removal of Xmu dependency from Xaw's package file (report by Jeremy Huddleston).
        improve workaround in CF_X_TOOLKIT macro, checking for other possible packages where Xt's dependencies may be given.
        prefer ${name:=value} to ${name-value}, since recent bash changes break legacy support for that feature.

Patch #266 - 2010/10/24

    add rpm and dpkg scripts, for testing.
    more fixes for Debian #600707 (report by Cyril Brulebois).

Patch #265 - 2010/10/22

    fix a regression in fontname logic from patch #263 changes (Debian #600707, reported by Vincent Lefevre).
    revert modification of any-event/any-button protocol from patch #263 changes. It interferes with selection using a shifted mouse button (reports by Neil Bird, Bram Moolenaar).

Patch #264 - 2010/10/14

    replace a null-pointer check with check for empty string in xtermOpenFont, to eliminate a warning message from patch #263 changes.
    build-fix for patch #263 when toolbar is not configured (patch by Chris Clayton) (reports by Robby Workman, David Wood).

Patch #263 - 2010/10/13

    corrected initialization of "misc" resource values, to ensure that xterm has allocated a copy of strings which may not have been malloc'd by the X library (Debian #600129).
    modify handling of any-event/any-button mouse protocol; it now is active with any combination of key-modifiers.
    add debugging feature showWrapMarks, which marks lines which xterm knows are wrapped, showing where a double-click will select past the end of a line.
    build-fix to address change in include-guards for Xlib.h in ongoing Xorg edits (patch by Jeremy Huddleston).
    improve pointerMode by continuing to watch for motion events after mouse tracking is disabled if the pointer is hidden (Debian #594856).
    further extend initialization for active-icon font to check if the font was not loaded succesfully, to retry with font1, or as even (if TrueType fonts are used) to use a TrueType font. The retries are to help with cases as in patch #241 where the bitmap fonts are not available.
    fix special case of active-icon used when TrueType font is specified for the xterm window, from patch #261 change. In that case, the default font's size was used for layout of the active icon's window (Debian #591265).

Patch #262 - 2010/8/30

    fix a case where changing the cursor color via escape sequences did not immediately update the screen (report by Andreas Wagner).
    implement ANSI and DEC request-mode control sequences. The latter includes the xterm-specific private modes such as the mouse mode. The feature is ifdef'd with the rectangle operations since its decoding overlaps that feature.
    correct typo in ctlseqs.ms for response of OSC 21 (patch by Kevin Schoedel).
    improve discussion of mouse tracking in ctlseqs.ms
    increase an array limit used in reporting mouse events (report by Ryan Johnson).
    add extended mouse-coordinates mode, allowing up to 2015x2015 windows, using UTF-8 encoding (patch by Ryan Johnson).
    modify manpage hyphens to conform with Debian.

Patch #261 - 2010/6/28


    fix regression in renderFont logic, from patch #260 changes (report by Joseph Quinsey).

Patch #260 - 2010/6/20

    modify plink.sh to work around problem linking to recent PCRE libraries.
    extend renderFont resource to allow deferred switch to TrueType fonts without affecting existing resource settings (Debian #585620).
    modify configure macro CF_X_TOOLKIT to work around omission of ICE library from ".pc" file (report by Miroslav Lichvar).
    change configure script default for --enable-broken-st i.e., the brokenStringTerm feature) to normally enable it. If the corresponding resource is enabled, this feature eliminates an apparent freeze of xterm when sending mis-encoded data to the screen (Debian #584801).
    document in manpage some actions which were overlooked:
        readline-button
        scroll-lock
        set-8-bit-control
    undo a change to limit-check in ScrnRefresh in patch #257, which broke fastScroll feature (Debian #584841).
    modify handling of brokenLinuxOSC and brokenStringTerm to also sound the bell.
    add control/D and control/Q to controls which will cause early exit from control string per brokenStringTerm resource.
    improve documentation of brokenStringTerm resource in manpage.

3 files changed, 7 insertions, 21 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 4ba4dc6b302..aef59028ba2 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2012/03/03 12:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2012/06/03 18:29:26 wiz Exp $
 
-DISTNAME=	xterm-259
-PKGREVISION=	2
+DISTNAME=	xterm-279
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/ \
 		http://www.sfr-fresh.com/unix/misc/
@@ -60,6 +59,7 @@ post-install:
 
 .include "options.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index ad2aa5df644..8dcf589e53e 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.35 2011/09/24 13:03:10 joerg Exp $
+$NetBSD: distinfo,v 1.36 2012/06/03 18:29:26 wiz Exp $
 
-SHA1 (xterm-259.tgz) = b4cf20ad67faa221d308b92c4daf8df4f9f122fb
-RMD160 (xterm-259.tgz) = 6d3e7a608996724d4f1784fce3c9f6c3dffd1ae8
-Size (xterm-259.tgz) = 923729 bytes
+SHA1 (xterm-279.tgz) = 080b88b129685fe5cc0a1638a48daee457f3787c
+RMD160 (xterm-279.tgz) = 0c9e4812e6cedf91adb260825cdfccc30340cfa0
+Size (xterm-279.tgz) = 1009821 bytes
 SHA1 (patch-aa) = 46076243c1b53d481b4cafe3d3f6f1f35291a153
-SHA1 (patch-xutf8.h) = ca6d6e2dccb0f1fda379961dcac9061f3de17837
diff --git a/x11/xterm/patches/patch-xutf8.h b/x11/xterm/patches/patch-xutf8.h
deleted file mode 100644
index 2fc9a8234e1..00000000000
--- a/x11/xterm/patches/patch-xutf8.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xutf8.h,v 1.1 2011/09/24 13:03:10 joerg Exp $
-
---- xutf8.h.orig	2011-09-22 20:02:00.000000000 +0000
-+++ xutf8.h
-@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
- THE SOFTWARE.
- */
- 
--#ifndef _XLIB_H_
-+#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
- #error Please include <X11/Xlib.h> before "xutf8.h"
- #endif
-