Index: branches/2015Q3/sysutils/screen/Makefile
===================================================================
--- branches/2015Q3/sysutils/screen/Makefile	(revision 396409)
+++ branches/2015Q3/sysutils/screen/Makefile	(revision 396410)
@@ -1,107 +1,108 @@
 # Created by: Andrey Chernov <ache@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	screen
 PORTVERSION=	4.3.1
+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
 
 CPE_VENDOR=	gnu
 
 .include <bsd.port.options.mk>
 
 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 <bsd.port.mk>
Index: branches/2015Q3/sysutils/screen/files/screenrc.sample
===================================================================
--- branches/2015Q3/sysutils/screen/files/screenrc.sample	(revision 396409)
+++ branches/2015Q3/sysutils/screen/files/screenrc.sample	(revision 396410)
@@ -1,11 +1,10 @@
 startup_message off
 defscrollback 5000
 termcapinfo xterm ti@:te@
 termcapinfo xterm-color ti@:te@
 hardstatus alwayslastline
 hardstatus string '%{gk}[%{G}%H%{g}][%= %{wk}%?%-Lw%?%{=b kR}(%{W}%n*%f %t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}]%{=b C}[%m/%d/%y %C %A]%{W}'
 vbell off
 shell -$SHELL
 logtstamp on
 logtstamp after 1
-logfile flush
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 396409)
+++ branches/2015Q3	(revision 396410)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r392658