Index: head/sysutils/screen/Makefile =================================================================== --- head/sysutils/screen/Makefile (revision 448748) +++ head/sysutils/screen/Makefile (revision 448749) @@ -1,106 +1,105 @@ # Created by: Andrey Chernov # $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/ \ ftp://gnu.mirror.iweb.com/screen/ \ http://gnu.mirror.iweb.com/screen/ \ http://mirror.sdunix.com/gnu/ \ ftp://mirrors.kernel.org/gnu/screen/ \ http://komquats.com/distfiles/ \ http://people.freebsd.org/~cy/distfiles/ \ GNU MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager LICENSE= GPLv3 OPTIONS_DEFINE= INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC OPTIONS_SINGLE= IPC OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES INFO_DESC= Build and install info documentation MAN_DESC= Build and install man pages NETHACK_DESC= Enable nethack-style messages XTERM_256_DESC= Enable support for 256 colour xterm SHOWENC_DESC= Show encoding on the status line SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line OPTIONS_SUB= USES= gmake cpe ncurses CPE_VENDOR= gnu .include GNU_CONFIGURE= yes CFLAGS+= -I${NCURSESINC} LDFLAGS+= -L${NCURSESLIB} .if ${PORT_OPTIONS:MMAN} MAKE_ARGS+= WITH_MAN=1 PLIST_SUB+= MAN="" .else PLIST_SUB+= MAN="@comment" .endif .if ${PORT_OPTIONS:MINFO} INFO= screen MAKE_ARGS+= WITH_INFO=1 .endif # Enables support for 256 colour xterm. Note that you may need to # set up a custom termcap entry or .screenrc which modifies termcap # to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm # .if ${PORT_OPTIONS:MXTERM_256} CFLAGS+= -DCOLORS256 .endif .if ! ${PORT_OPTIONS:MNETHACK} CFLAGS+= -DNONETHACK .endif # show encoding on the status line via option "showenc" .if ${PORT_OPTIONS:MSHOWENC} EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding .endif post-patch: @${RM} ${WRKSRC}/doc/screen.info* @${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure # Bug 191029: Users can choose whether to use sockets or named pipes. # Choose sockets if you don't know what the difference is. # Choose named pipes if your environment is heterogeneous, # using both screen 4.0.3 and 4.2.1. # Bug 191017 post-configure-NAMED_PIPES-on: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. ETCDIR?= ${PREFIX}/etc post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1 ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2 @${MKDIR} ${STAGEDIR}${ETCDIR} .if ${PORT_OPTIONS:MSYSTEM_SCREENRC} ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ ${STAGEDIR}${ETCDIR}/screenrc.sample .else ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${STAGEDIR}${ETCDIR}/screenrc.sample .endif .include Index: head/sysutils/screen/distinfo =================================================================== --- head/sysutils/screen/distinfo (revision 448748) +++ head/sysutils/screen/distinfo (revision 448749) @@ -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 Index: head/sysutils/screen/files/patch-Makefile.in =================================================================== --- head/sysutils/screen/files/patch-Makefile.in (revision 448748) +++ head/sysutils/screen/files/patch-Makefile.in (revision 448749) @@ -1,48 +1,48 @@ ---- 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) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -# This doesn't work if $(bindir)/screen is a symlink - -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 - cd doc ; $(MAKE) install + cd doc ; $(MAKE) $(MAKE_ARGS) install -if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ 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) - cd doc ; $(MAKE) installdirs + cd doc ; $(MAKE) $(MAKE_ARGS) installdirs uninstall: .version rm -f $(DESTDIR)$(bindir)/$(SCREEN) @@ -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 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 \ + comm.h layer.h term.h image.h display.h window.h +list_window.o: list_generic.h list_window.c window.h layer.h screen.h os.h osdef.h ansi.h acls.h \ + comm.h layer.h term.h image.h display.h window.h Index: head/sysutils/screen/files/patch-screen.c =================================================================== --- head/sysutils/screen/files/patch-screen.c (revision 448748) +++ head/sysutils/screen/files/patch-screen.c (revision 448749) @@ -1,26 +1,11 @@ ---- 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) { - if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1]) { + if (r && p - buf == winmsg_rendpos[r - 1]) { winmsg_rendpos[--r] = pn - buf; continue; }