Index: head/sysutils/screen/Makefile =================================================================== --- head/sysutils/screen/Makefile (revision 391022) +++ head/sysutils/screen/Makefile (revision 391023) @@ -1,108 +1,107 @@ # Created by: Andrey Chernov # $FreeBSD$ PORTNAME= screen -PORTVERSION= 4.2.1 -PORTREVISION= 5 +PORTVERSION= 4.3.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 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} .if !exists(/usr/bin/install-info) RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo .endif 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. .if ${PORT_OPTIONS:MNAMED_PIPES} # Bug 191017 post-configure: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. .endif 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 391022) +++ head/sysutils/screen/distinfo (revision 391023) @@ -1,2 +1,2 @@ -SHA256 (screen-4.2.1.tar.gz) = 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 -SIZE (screen-4.2.1.tar.gz) = 1062485 +SHA256 (screen-4.3.1.tar.gz) = fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 +SIZE (screen-4.3.1.tar.gz) = 845958 Index: head/sysutils/screen/files/patch-ansi.c =================================================================== --- head/sysutils/screen/files/patch-ansi.c (revision 391022) +++ head/sysutils/screen/files/patch-ansi.c (nonexistent) @@ -1,10 +0,0 @@ ---- ansi.c.orig 2014-04-26 04:32:54.000000000 -0700 -+++ ansi.c 2014-04-29 19:08:26.631287189 -0700 -@@ -569,6 +569,7 @@ - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - if (curr->w_NumArgs < MAXARGS) -+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS) - { - if (curr->w_args[curr->w_NumArgs] < 100000000) - curr->w_args[curr->w_NumArgs] = Property changes on: head/sysutils/screen/files/patch-ansi.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-os.h =================================================================== --- head/sysutils/screen/files/patch-os.h (revision 391022) +++ head/sysutils/screen/files/patch-os.h (revision 391023) @@ -1,32 +1,10 @@ --- os.h.orig 2014-04-26 03:58:35.000000000 -0700 +++ os.h 2014-04-29 19:16:31.730773575 -0700 -@@ -252,7 +252,11 @@ - #if defined(UTMPOK) || defined(BUGGYGETLOGIN) - # if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) - # include --# define UTMPFILE UTMPX_FILE -+# ifdef UTMPX_FILE -+# define UTMPFILE UTMPX_FILE -+# else -+# define UTMPFILE "/nonexistent" -+# endif - # define utmp utmpx - # define getutent getutxent - # define getutid getutxid -@@ -260,7 +264,7 @@ - # define pututline pututxline - # define setutent setutxent - # define endutent endutxent --# define ut_time ut_xtime -+# define ut_time ut_tv.tv_sec - # else /* SVR4 */ - # include - # endif /* SVR4 */ @@ -524,6 +528,6 @@ /* Changing those you won't be able to attach to your old sessions * when changing those values in official tree don't forget to bump * MSG_VERSION */ -#define MAXTERMLEN 32 +#define MAXTERMLEN 63 #define MAXLOGINLEN 256 Index: head/sysutils/screen/files/patch-screen.c =================================================================== --- head/sysutils/screen/files/patch-screen.c (revision 391022) +++ head/sysutils/screen/files/patch-screen.c (revision 391023) @@ -1,20 +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 @@ 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; -@@ -2271,8 +2271,6 @@ - while (i-- > 0) - *pn-- = ' '; - numpad--; -- if (r && p - buf == winmsg_rendpos[r - 1]) -- winmsg_rendpos[--r] = pn - buf; - } - } - return pn2;