Index: head/sysutils/screen/Makefile =================================================================== --- head/sysutils/screen/Makefile (revision 432409) +++ head/sysutils/screen/Makefile (revision 432410) @@ -1,102 +1,103 @@ # Created by: Andrey Chernov # $FreeBSD$ PORTNAME= screen PORTVERSION= 4.5.0 +PORTREVISION= 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 .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/files/patch-screen.c =================================================================== --- head/sysutils/screen/files/patch-screen.c (revision 432409) +++ head/sysutils/screen/files/patch-screen.c (revision 432410) @@ -1,11 +1,26 @@ --- 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 @@ ++++ 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 @@ 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; }