From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 22:07:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37A0BDA9; Fri, 28 Nov 2014 22:07:18 +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 22BF0A38; Fri, 28 Nov 2014 22:07:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASM7IXM055799; Fri, 28 Nov 2014 22:07:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASM7Gq7055794; Fri, 28 Nov 2014 22:07:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411282207.sASM7Gq7055794@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 28 Nov 2014 22:07:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275219 - projects/building-blocks/share/skel X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2014 22:07:18 -0000 Author: ngie Date: Fri Nov 28 22:07:16 2014 New Revision: 275219 URL: https://svnweb.freebsd.org/changeset/base/275219 Log: Install skeleton files based on the values of MK_MAIL and MK_TCSH Customize according to MK_GAMES and MK_VI, in particular comment out lines that would change behavior Change dot.cshrc and dot.profile to not check for /usr/games/fortune based on the new behavior in customizing the files Added: projects/building-blocks/share/skel/dot.cshrc.in - copied unchanged from r275063, projects/building-blocks/share/skel/dot.cshrc projects/building-blocks/share/skel/dot.login.in - copied, changed from r275063, projects/building-blocks/share/skel/dot.login projects/building-blocks/share/skel/dot.mailrc.in - copied unchanged from r275063, projects/building-blocks/share/skel/dot.mailrc projects/building-blocks/share/skel/dot.profile.in - copied, changed from r275063, projects/building-blocks/share/skel/dot.profile Deleted: projects/building-blocks/share/skel/dot.cshrc projects/building-blocks/share/skel/dot.login projects/building-blocks/share/skel/dot.mailrc projects/building-blocks/share/skel/dot.profile Modified: projects/building-blocks/share/skel/Makefile Modified: projects/building-blocks/share/skel/Makefile ============================================================================== --- projects/building-blocks/share/skel/Makefile Fri Nov 28 22:03:35 2014 (r275218) +++ projects/building-blocks/share/skel/Makefile Fri Nov 28 22:07:16 2014 (r275219) @@ -1,14 +1,52 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ +.include + FILESGROUPS= FILES1 FILES2 -FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ - dot.shrc -FILES2= dot.mail_aliases dot.rhosts +FILES1= dot.login dot.login_conf dot.profile dot.shrc FILES1DIR= /usr/share/skel FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NO_OBJ= + +.PATH: ${.OBJDIR} ${.CURDIR} + +.if ${MK_MAIL} != "no" +FILES1+= dot.mailrc +FILES2+= dot.mail_aliases +.endif + +.if ${MK_RCMDS} != "no" +FILES2+= dot.rhosts +.endif + +.if ${MK_TCSH} != "no" +FILES1+= dot.cshrc +.endif + +.if ${MK_GAMES} == "no" +dot.login_SED+= -e "/\/usr\/games\/fortune /s/^/\#/" +dot.profile_SED+= -e "/\/usr\/games\/fortune /s/^/\#/" +.endif + +.if ${MK_VI} == "no" +dot.cshrc_SED+= -e '/^setenv.*EDITOR.*vi$$/s/^/\#/' +dot.mailrc_SED+= -e '/^set EDITOR=vi$$/s/^/\#/' -e '/^set VISUAL=vi$$/s/^/\#/' +dot.profile_SED+= -e '/^EDITOR=vi; /s/^/\#/' +.endif + +.for f in dot.cshrc dot.login dot.mailrc dot.profile +.if empty(${f}_SED) +$f: $f.in + cp ${.ALLSRC} ${.TARGET} +.else +$f: $f.in + sed ${${f}_SED} < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} +CLEANFILES+= $f.tmp +.endif +CLEANFILES+= $f +.endfor .include Copied: projects/building-blocks/share/skel/dot.cshrc.in (from r275063, projects/building-blocks/share/skel/dot.cshrc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/share/skel/dot.cshrc.in Fri Nov 28 22:07:16 2014 (r275219, copy of r275063, projects/building-blocks/share/skel/dot.cshrc) @@ -0,0 +1,44 @@ +# $FreeBSD$ +# +# .cshrc - csh resource script, read at beginning of execution by each shell +# +# see also csh(1), environ(7). +# more examples available at /usr/share/examples/csh/ +# + +alias h history 25 +alias j jobs -l +alias la ls -aF +alias lf ls -FA +alias ll ls -lAF + +# These are normally set through /etc/login.conf. You may override them here +# if wanted. +# set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) +# setenv BLOCKSIZE K +# A righteous umask +# umask 22 + +setenv EDITOR vi +setenv PAGER more + +if ($?prompt) then + # An interactive shell -- set some stuff up + set prompt = "%N@%m:%~ %# " + set promptchars = "%#" + + set filec + set history = 1000 + set savehist = (1000 merge) + set autolist = ambiguous + # Use history to aid expansion + set autoexpand + set autorehash + set mail = (/var/mail/$USER) + if ( $?tcsh ) then + bindkey "^W" backward-delete-word + bindkey -k up history-search-backward + bindkey -k down history-search-forward + endif + +endif Copied and modified: projects/building-blocks/share/skel/dot.login.in (from r275063, projects/building-blocks/share/skel/dot.login) ============================================================================== --- projects/building-blocks/share/skel/dot.login Tue Nov 25 19:01:49 2014 (r275063, copy source) +++ projects/building-blocks/share/skel/dot.login.in Fri Nov 28 22:07:16 2014 (r275219) @@ -5,4 +5,4 @@ # see also csh(1), environ(7). # -if ( -x /usr/games/fortune ) /usr/games/fortune freebsd-tips +/usr/games/fortune freebsd-tips Copied: projects/building-blocks/share/skel/dot.mailrc.in (from r275063, projects/building-blocks/share/skel/dot.mailrc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/share/skel/dot.mailrc.in Fri Nov 28 22:07:16 2014 (r275219, copy of r275063, projects/building-blocks/share/skel/dot.mailrc) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# +# .mailrc - mail resources +# +# see also mail(1) +# + +set append ask autoprint +set indentprefix="> " +set PAGER=more +set EDITOR=vi +set VISUAL=vi +set folder=Mail +retain bcc cc date from subject to + +# include your private mail aliases +source ~/.mail_aliases Copied and modified: projects/building-blocks/share/skel/dot.profile.in (from r275063, projects/building-blocks/share/skel/dot.profile) ============================================================================== --- projects/building-blocks/share/skel/dot.profile Tue Nov 25 19:01:49 2014 (r275063, copy source) +++ projects/building-blocks/share/skel/dot.profile.in Fri Nov 28 22:07:16 2014 (r275219) @@ -21,4 +21,4 @@ PAGER=more; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV -if [ -x /usr/games/fortune ] ; then /usr/games/fortune freebsd-tips ; fi +/usr/games/fortune freebsd-tips