From owner-svn-ports-all@FreeBSD.ORG Wed Nov 26 01:37:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30817F58; Wed, 26 Nov 2014 01:37:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D75F80A; Wed, 26 Nov 2014 01:37:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ1bGEZ013768; Wed, 26 Nov 2014 01:37:16 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ1bG4k013760; Wed, 26 Nov 2014 01:37:16 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201411260137.sAQ1bG4k013760@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 26 Nov 2014 01:37:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373436 - in head/sysutils/screen: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 01:37:17 -0000 Author: cy Date: Wed Nov 26 01:37:15 2014 New Revision: 373436 URL: https://svnweb.freebsd.org/changeset/ports/373436 QAT: https://qat.redports.org/buildarchive/r373436/ Log: nstall optional screenrc with helpful status line instead of the default. Submitted by: alfred, kmoore Reviewed by: rodrigc Added: head/sysutils/screen/files/screenrc.sample (contents, props changed) Modified: head/sysutils/screen/Makefile head/sysutils/screen/pkg-plist Modified: head/sysutils/screen/Makefile ============================================================================== --- head/sysutils/screen/Makefile Wed Nov 26 00:32:10 2014 (r373435) +++ head/sysutils/screen/Makefile Wed Nov 26 01:37:15 2014 (r373436) @@ -20,8 +20,8 @@ COMMENT= Multi-screen window manager LICENSE= GPLv3 -OPTIONS_DEFINE= INFO MAN NETHACK XTERM_256 SHOWENC -OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256 SOCKETS +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 @@ -31,6 +31,7 @@ XTERM_256_DESC= Enable support for 256 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= @@ -85,9 +86,16 @@ post-configure: @${ECHO_CMD} User selected named pipes override set. .endif +ETCDIR?= ${PREFIX}/etc + post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} +.if ${PORT_OPTIONS:MSYSTEM_SCREENRC} + ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ + ${STAGEDIR}${ETCDIR}/screenrc.sample +.else ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ - ${STAGEDIR}${EXAMPLESDIR}/screenrc + ${STAGEDIR}${ETCDIR}/screenrc.sample +.endif .include Added: head/sysutils/screen/files/screenrc.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/screen/files/screenrc.sample Wed Nov 26 01:37:15 2014 (r373436) @@ -0,0 +1,11 @@ +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 Modified: head/sysutils/screen/pkg-plist ============================================================================== --- head/sysutils/screen/pkg-plist Wed Nov 26 00:32:10 2014 (r373435) +++ head/sysutils/screen/pkg-plist Wed Nov 26 01:37:15 2014 (r373436) @@ -1,8 +1,5 @@ bin/screen %%MAN%%man/man1/screen.1.gz -@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi -%%EXAMPLESDIR%%/screenrc -@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02 %%DATADIR%%/utf8encodings/03 @@ -20,3 +17,7 @@ bin/screen %%DATADIR%%/utf8encodings/cc %%DATADIR%%/utf8encodings/cd %%DATADIR%%/utf8encodings/d6 +@comment We always install the same screenrc it just depends on if we +@comment are installing the the one bundled with source, or the one from +@comment FILESDIR/screenrc.sample +@sample %%ETCDIR%%/screenrc.sample