Index: head/x11/xterm/files/patch-screen.c =================================================================== --- head/x11/xterm/files/patch-screen.c (revision 382425) +++ head/x11/xterm/files/patch-screen.c (nonexistent) @@ -1,42 +0,0 @@ ---- screen.c.orig 2015-03-07 01:19:23 UTC -+++ screen.c -@@ -1,4 +1,4 @@ --/* $XTermId: screen.c,v 1.510 2015/03/07 01:19:23 tom Exp $ */ -+/* $XTermId: screen.c,v 1.512 2015/03/22 14:47:02 tom Exp $ */ - - /* - * Copyright 1999-2014,2015 by Thomas E. Dickey -@@ -1248,7 +1248,7 @@ ScrnInsertChar(XtermWidget xw, unsigned - - TScreen *screen = TScreenOf(xw); - int first = ScrnLeftMargin(xw); -- int last = ScrnRightMargin(xw) + 1; -+ int last = ScrnRightMargin(xw); - int row = screen->cur_row; - int col = screen->cur_col; - int j; -@@ -1258,13 +1258,13 @@ ScrnInsertChar(XtermWidget xw, unsigned - TRACE(("ScrnInsertChar - col %d outside [%d..%d]\n", col, first, last)); - return; - } else if (last < (col + (int) n)) { -- n = (unsigned) (last - col); -+ n = (unsigned) (last + 1 - col); - } - - assert(screen->cur_col >= 0); - assert(screen->cur_row >= 0); - assert((int) n >= 0); -- assert(last >= (int) n); -+ assert((last + 1) >= (int) n); - - if_OPT_WIDE_CHARS(screen, { - int xx = screen->cur_row; -@@ -1273,7 +1273,7 @@ ScrnInsertChar(XtermWidget xw, unsigned - if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { - ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); - } -- kr = last - (int) n; -+ kr = last - (int) n + 1; - if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { - ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); - } Property changes on: head/x11/xterm/files/patch-screen.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/xterm/Makefile =================================================================== --- head/x11/xterm/Makefile (revision 382425) +++ head/x11/xterm/Makefile (revision 382426) @@ -1,90 +1,89 @@ # Created by: krion # $FreeBSD$ PORTNAME= xterm -PORTVERSION= 316 -PORTREVISION= 1 +PORTVERSION= 317 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/:src1 \ LOCAL/ehaupt:src1 LOCAL/ehaupt:src2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src1 \ bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2 MAINTAINER= ehaupt@FreeBSD.org COMMENT= Terminal emulator for the X Window System CONFLICTS= x11iraf-[0-9]* USES= tar:tgz USE_XORG= xft GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-utempter --enable-narrowproto CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ICONVERSION= 1 OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME LOGGING OPTIONS_RADIO= 3D OPTIONS_RADIO_3D= XAW3D XAW3DXFT NEXTAW DABBREV_DESC= Enable support for dabbrev-expand DECTERM_DESC= Enable DECterm Locator support LUIT_DESC= Use LUIT for locale convertion from/to UTF-8 SIXEL_DESC= Enable Sixel graphics support WCHAR_DESC= Enable wide-character support 256COLOR_DESC= Enable 256-color support LOGGING_DESC= Enable logging terminal I/O to a file XAW3D_DESC= Link with Xaw 3d library XAW3DXFT_DESC= Link with Xaw 3d xft (extended fonts) library NEXTAW_DESC= Link with neXT Athena library OPTIONS_DEFAULT=WCHAR LUIT 256COLOR 256COLOR_CONFIGURE_ENABLE= 256-color LUIT_BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit LUIT_CONFIGURE_ENABLE= luit WCHAR_CONFIGURE_ENABLE= wide-chars DECTERM_CONFIGURE_ENABLE= dec-locator PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre DABBREV_CONFIGURE_ENABLE= dabbrev SIXEL_CONFIGURE_ENABLE= sixel-graphics GNOME_USES= desktop-file-utils LOGGING_CONFIGURE_ENABLE= logging XAW3D_CONFIGURE_WITH= Xaw3d XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d XAW3DXFT_CONFIGURE_WITH= Xaw3dxft XAW3DXFT_LIB_DEPENDS= libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft NEXTAW_CONFIGURE_WITH= neXtaw NEXTAW_LIB_DEPENDS= libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw .include .if ! ${PORT_OPTIONS:MXAW3D} && ! ${PORT_OPTIONS:MXAW3DXFT} && ! ${PORT_OPTIONS:MNEXTAW} USE_XORG+= xaw .endif .if ${OSVERSION} < 900004 LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter .endif post-extract: @${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \ ${WRKDIR}/bsd-xterm-icons-1/*.xpm \ ${WRKSRC}/icons/ post-install: .for f in koi8rxterm resize uxterm xterm @${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f} .endfor @${INSTALL_DATA} ${WRKSRC}/xterm.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ .if ${PORT_OPTIONS:MWCHAR} @${CAT} ${PKGMESSAGE} .endif .include Index: head/x11/xterm/distinfo =================================================================== --- head/x11/xterm/distinfo (revision 382425) +++ head/x11/xterm/distinfo (revision 382426) @@ -1,4 +1,4 @@ -SHA256 (xterm-316.tgz) = 94d3529ab770269bdf751621e18a8e2cc576b4fd030292462592ec1a49090c06 -SIZE (xterm-316.tgz) = 1206992 +SHA256 (xterm-317.tgz) = d2e5b0dbe47568f9e76123a4f0aeaafd586a4ce0c1beb63a476b07cd718e356d +SIZE (xterm-317.tgz) = 1208960 SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c SIZE (bsd-xterm-icons-1.tgz) = 22718