From bddf1289efd81317364118eb60cdc28cc766c3c2 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 18 Jan 2017 13:19:25 +0000
Subject: [PATCH] Update 4.4.0 --> 4.5.0

---
 sysutils/screen/Makefile                |  3 +--
 sysutils/screen/distinfo                |  6 +++---
 sysutils/screen/files/patch-Makefile.in | 16 ++++++++--------
 sysutils/screen/files/patch-screen.c    | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 71d30a2be086..c5aab2594cba 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	screen
-PORTVERSION=	4.4.0
-PORTREVISION=	2
+PORTVERSION=	4.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
 		ftp://ftp.gnu.org/gnu/screen/ \
diff --git a/sysutils/screen/distinfo b/sysutils/screen/distinfo
index 4203f4d8eb75..5016e72edddd 100644
--- a/sysutils/screen/distinfo
+++ b/sysutils/screen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466506261
-SHA256 (screen-4.4.0.tar.gz) = ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b
-SIZE (screen-4.4.0.tar.gz) = 846010
+TIMESTAMP = 1484729092
+SHA256 (screen-4.5.0.tar.gz) = 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0
+SIZE (screen-4.5.0.tar.gz) = 963233
diff --git a/sysutils/screen/files/patch-Makefile.in b/sysutils/screen/files/patch-Makefile.in
index c8e172578696..d4400910fc03 100644
--- a/sysutils/screen/files/patch-Makefile.in
+++ b/sysutils/screen/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-06-28 21:22:55 UTC
-+++ Makefile.in
-@@ -83,19 +83,13 @@ screen: $(OFILES)
+--- Makefile.in.orig	2017-01-17 11:28:29.361404481 -0800
++++ Makefile.in	2017-01-18 04:51:33.277671000 -0800
+@@ -83,19 +83,13 @@
  	    $(OPTIONS) $(CFLAGS) $<
  
  install_bin: .version screen
@@ -20,10 +20,10 @@
  install: installdirs install_bin
 -	cd doc ; $(MAKE) install
 +	cd doc ; $(MAKE) $(MAKE_ARGS) install
- 	-if [ -d /usr/lib/terminfo ]; then \
+ 	-if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
  		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
- 		chmod 644 /usr/lib/terminfo/s/screen*; \
-@@ -108,7 +102,7 @@ install: installdirs install_bin
+ 		chmod 644 $(DESTDIR)/usr/lib/terminfo/s/screen*; \
+@@ -108,7 +102,7 @@
  installdirs:
  # Path leading to ETCSCREENRC and Socketdirectory not checked.
  	$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
@@ -32,13 +32,13 @@
  
  uninstall: .version
  	rm -f $(DESTDIR)$(bindir)/$(SCREEN)
-@@ -350,7 +344,10 @@ layout.o: layout.h viewport.h canvas.h l
+@@ -350,7 +344,10 @@
  viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
   comm.h layer.h term.h image.h display.h window.h extern.h \
   braille.h
 -list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
 -list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
--list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h
+-list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
 +list_generic.o: list_generic.h list_generic.c layer.h screen.h os.h osdef.h ansi.h acls.h \
 + comm.h layer.h term.h image.h display.h window.h
 +list_display.o: list_generic.h list_display.c layer.h screen.h os.h osdef.h ansi.h acls.h \
diff --git a/sysutils/screen/files/patch-screen.c b/sysutils/screen/files/patch-screen.c
index 7ef644f33e55..b374c0985f3d 100644
--- a/sysutils/screen/files/patch-screen.c
+++ b/sysutils/screen/files/patch-screen.c
@@ -1,11 +1,11 @@
---- screen.c.orig	2014-04-26 09:22:09.000000000 -0700
-+++ screen.c	2014-04-30 23:34:47.613803805 -0700
-@@ -2257,7 +2257,7 @@
+--- screen.c.orig	2017-01-17 11:28:29.397404660 -0800
++++ screen.c	2017-01-18 04:54:50.874421000 -0800
+@@ -2222,7 +2222,7 @@
+   pn2 = pn = p + padlen;
    r = winmsg_numrend;
-   while (p >= buf)
-     {
--      if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1])
-+      if (r && p - buf == winmsg_rendpos[r - 1])
- 	{
- 	  winmsg_rendpos[--r] = pn - buf;
- 	  continue;
+   while (p >= buf) {
+-    if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1]) {
++    if (r && p - buf == winmsg_rendpos[r - 1]) {
+       winmsg_rendpos[--r] = pn - buf;
+       continue;
+     }