From owner-svn-src-all@FreeBSD.ORG Wed Jan 27 02:38:11 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FCB7106566C; Wed, 27 Jan 2010 02:38:11 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E95568FC16; Wed, 27 Jan 2010 02:38:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0R2cApd077485; Wed, 27 Jan 2010 02:38:10 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0R2cAEg077483; Wed, 27 Jan 2010 02:38:10 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201001270238.o0R2cAEg077483@svn.freebsd.org> From: Craig Rodrigues Date: Wed, 27 Jan 2010 02:38:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203055 - head/usr.bin/make X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2010 02:38:11 -0000 Author: rodrigc Date: Wed Jan 27 02:38:10 2010 New Revision: 203055 URL: http://svn.freebsd.org/changeset/base/203055 Log: Partial merge of man page cleanups from NetBSD: revision 1.91 Fri Nov 7 01:01:46 2003 UTC by lukem Add some subsections in the VARIABLE ASSIGNMENTS section. In the "modifier description" list, show each modifier with the leading `:'. Rationale: it's hard to search for modifiers without it, and we already do the same thing in the -options and .makecommands lists. I now find it much easier to find the description for a modifier in the man page. Obtained from: NetBSD Modified: head/usr.bin/make/make.1 Modified: head/usr.bin/make/make.1 ============================================================================== --- head/usr.bin/make/make.1 Wed Jan 27 02:32:07 2010 (r203054) +++ head/usr.bin/make/make.1 Wed Jan 27 02:38:10 2010 (r203055) @@ -852,7 +852,7 @@ These directories will be searched for s .Nm after it has finished parsing all input makefiles. .El -.Pp +.Ss Variable modifiers Variable expansion may be modified to select or modify each word of the variable (where a .Dq word @@ -867,7 +867,7 @@ The colon may be escaped with a backslas .Pq Ql \e . .Bl -tag -width Cm .Sm off -.It Cm C No / Ar pattern Xo +.It Cm \&:C No / Ar pattern Xo .No / Ar replacement .No / Op Cm 1g .Xc @@ -896,13 +896,13 @@ and are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. -.It Cm E +.It Cm \&:E Replaces each word in the variable with its suffix. -.It Cm H +.It Cm \&:H Replaces each word in the variable with everything but the last component. -.It Cm L +.It Cm \&:L Converts variable to lower-case letters. -.It Cm M Ns Ar pattern +.It Cm \&:M Ns Ar pattern Select only those words that match the rest of the modifier. The standard shell wildcard characters .Pf ( Ql * , @@ -913,21 +913,21 @@ may be used. The wildcard characters may be escaped with a backslash .Pq Ql \e . -.It Cm N Ns Ar pattern +.It Cm \&:N Ns Ar pattern This is identical to -.Cm M , +.Cm \&:M , but selects all words which do not match the rest of the modifier. -.It Cm O +.It Cm \&:O Order every word in the variable alphabetically. -.It Cm Q +.It Cm \&:Q Quotes every shell meta-character in the variable, so that it can be passed safely through recursive invocations of .Nm . -.It Cm R +.It Cm \&:R Replaces each word in the variable with everything but its suffix. .Sm off -.It Cm S No / Ar old_string Xo +.It Cm \&:S No / Ar old_string Xo .No / Ar new_string .No / Op Cm g .Xc @@ -971,7 +971,7 @@ with the single exception that a backsla of a dollar sign .Pq Ql $ , not a preceding dollar sign as is usual. -.It Ar old_string=new_string +.It Ar :old_string=new_string This is the .At V style variable substitution. @@ -991,11 +991,11 @@ is the substring of .Ar old_string to be replaced in .Ar new_string -.It Cm T +.It Cm \&:T Replaces each word in the variable with its last component. -.It Cm U +.It Cm \&:U Converts variable to upper-case letters. -.It Cm u +.It Cm \&:u Remove adjacent duplicate words (like .Xr uniq 1 ) . .El