aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorehaupt <ehaupt@FreeBSD.org>2015-03-27 23:07:26 +0800
committerehaupt <ehaupt@FreeBSD.org>2015-03-27 23:07:26 +0800
commit5f51673aa2f9900bcc54f4c7c9f8cf05287039cf (patch)
tree82f340ce71b184528f273c8863e7d477a564fa9d
parentaf5915fb2776d42ebf83bae63ffe34f75683d5c4 (diff)
downloadfreebsd-ports-gnome-5f51673aa2f9900bcc54f4c7c9f8cf05287039cf.tar.gz
freebsd-ports-gnome-5f51673aa2f9900bcc54f4c7c9f8cf05287039cf.tar.zst
freebsd-ports-gnome-5f51673aa2f9900bcc54f4c7c9f8cf05287039cf.zip
Update to 317
-rw-r--r--x11/xterm/Makefile3
-rw-r--r--x11/xterm/distinfo4
-rw-r--r--x11/xterm/files/patch-screen.c42
3 files changed, 3 insertions, 46 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 20e19422b41b..eb79abb0a7fd 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -2,8 +2,7 @@
# $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
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index fb80d741243f..b2f80652be22 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -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
diff --git a/x11/xterm/files/patch-screen.c b/x11/xterm/files/patch-screen.c
deleted file mode 100644
index c05a6e14e6db..000000000000
--- a/x11/xterm/files/patch-screen.c
+++ /dev/null
@@ -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);
- }