svn commit: r448749 - in head/sysutils/screen: . files

[Cy Schubert]

Author: cy
Date: Sat Aug 26 03:50:33 2017
New Revision: 448749
URL: https://svnweb.freebsd.org/changeset/ports/448749

Log:
  Update 4.5.0 --> 4.6.1

Modified:
  head/sysutils/screen/Makefile
  head/sysutils/screen/distinfo
  head/sysutils/screen/files/patch-Makefile.in
  head/sysutils/screen/files/patch-screen.c

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Sat Aug 26 01:42:45 2017	(r448748)
+++ head/sysutils/screen/Makefile	Sat Aug 26 03:50:33 2017	(r448749)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	screen
-PORTVERSION=	4.5.0
-PORTREVISION=	3
+PORTVERSION=	4.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
 		ftp://ftp.gnu.org/gnu/screen/ \

Modified: head/sysutils/screen/distinfo
==============================================================================
--- head/sysutils/screen/distinfo	Sat Aug 26 01:42:45 2017	(r448748)
+++ head/sysutils/screen/distinfo	Sat Aug 26 03:50:33 2017	(r448749)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484729092
-SHA256 (screen-4.5.0.tar.gz) = 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0
-SIZE (screen-4.5.0.tar.gz) = 963233
+TIMESTAMP = 1503717242
+SHA256 (screen-4.6.1.tar.gz) = aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64
+SIZE (screen-4.6.1.tar.gz) = 848979

Modified: head/sysutils/screen/files/patch-Makefile.in
==============================================================================
--- head/sysutils/screen/files/patch-Makefile.in	Sat Aug 26 01:42:45 2017	(r448748)
+++ head/sysutils/screen/files/patch-Makefile.in	Sat Aug 26 03:50:33 2017	(r448749)
@@ -1,9 +1,9 @@
---- Makefile.in.orig	2017-01-17 11:28:29.361404481 -0800
-+++ Makefile.in	2017-01-18 04:51:33.277671000 -0800
+--- Makefile.in.orig	2017-07-10 12:26:25.000000000 -0700
++++ Makefile.in	2017-08-25 20:19:07.289437000 -0700
 @@ -83,19 +83,13 @@
  	    $(OPTIONS) $(CFLAGS) $<
  
- install_bin: .version screen
+ install_bin: .version screen installdirs
 -	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
 -		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
 -	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
@@ -12,9 +12,9 @@
 -	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
 -	rm -f $(DESTDIR)$(bindir)/screen
 -	(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
+ 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
 +	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
 +	-chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen
- 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
  
  ###############################################################################
  install: installdirs install_bin

Modified: head/sysutils/screen/files/patch-screen.c
==============================================================================
--- head/sysutils/screen/files/patch-screen.c	Sat Aug 26 01:42:45 2017	(r448748)
+++ head/sysutils/screen/files/patch-screen.c	Sat Aug 26 03:50:33 2017	(r448749)
@@ -1,21 +1,6 @@
---- screen.c.orig	2017-01-17 11:28:29.397404660 -0800
-+++ screen.c	2017-01-24 17:31:24.342944000 -0800
-@@ -674,11 +674,14 @@
-               if (strlen(screenlogfile) > PATH_MAX)
-                 Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX);
- 
-+#if 0
-+/* see https://lists.gnu.org/archive/html/screen-devel/2017-01/msg00025.html */
-               FILE *w_check;
-               if ((w_check = fopen(screenlogfile, "w")) == NULL)
-                 Panic(0, "-L: logfile name access problem");
-               else
-                 fclose(w_check);
-+#endif
-             }
-             nwin_options.Lflag = 1;
-             break;
-@@ -2222,7 +2225,7 @@
+--- screen.c.orig	2017-07-10 12:26:25.000000000 -0700
++++ screen.c	2017-08-25 20:20:20.471073000 -0700
+@@ -2214,7 +2214,7 @@
    pn2 = pn = p + padlen;
    r = winmsg_numrend;
    while (p >= buf) {