From owner-svn-src-all@freebsd.org Sat Jul 28 20:31:04 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15E0F105D8E6; Sat, 28 Jul 2018 20:31:04 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BDF3D7FD4C; Sat, 28 Jul 2018 20:31:03 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0A603E9B; Sat, 28 Jul 2018 20:31:03 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SKV3MX032778; Sat, 28 Jul 2018 20:31:03 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SKV3tS032777; Sat, 28 Jul 2018 20:31:03 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201807282031.w6SKV3tS032777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 28 Jul 2018 20:31:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336843 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 336843 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 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: Sat, 28 Jul 2018 20:31:04 -0000 Author: brd Date: Sat Jul 28 20:31:03 2018 New Revision: 336843 URL: https://svnweb.freebsd.org/changeset/base/336843 Log: Whitespace only change, no functional change intended. The padding makes it much easier to read, but occasionally means that commits like this one have to be done to follow up. I intentionally kept this separate from r336841 to try and make things easier to follow later on. Approved by: bapt (mentor) Modified: head/share/mk/bsd.confs.mk Modified: head/share/mk/bsd.confs.mk ============================================================================== --- head/share/mk/bsd.confs.mk Sat Jul 28 20:29:05 2018 (r336842) +++ head/share/mk/bsd.confs.mk Sat Jul 28 20:31:03 2018 (r336843) @@ -23,12 +23,12 @@ buildconfig: ${${group}} all: buildconfig . endif -. for group in ${CONFGROUPS} -. if defined(${group}) && !empty(${group}) +. for group in ${CONFGROUPS} +. if defined(${group}) && !empty(${group}) -. if !target(afterinstallconfig) +. if !target(afterinstallconfig) afterinstallconfig: -. endif +. endif installconfig: realinstallconfig afterinstallconfig .ORDER: realinstallconfig afterinstallconfig @@ -39,79 +39,79 @@ ${group}DIR?= ${CONFDIR} STAGE_SETS+= ${group:C,[/*],_,g} STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR} -. if defined(NO_ROOT) -. if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} -. if defined(${${group}PACKAGE}) +. if defined(NO_ROOT) +. if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} +. if defined(${${group}PACKAGE}) ${group}TAGS+= package=${${group}PACKAGE:Uruntime} -. else +. else ${group}TAGS+= package=${PACKAGE:Uruntime} -. endif . endif +. endif ${group}TAGS+= config ${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} -. endif +. endif -. if ${${group}DIR:S/^\///} == ${${group}DIR} +. if ${${group}DIR:S/^\///} == ${${group}DIR} # ${group}DIR specifies a variable that specifies a path DIRS+= ${${group}DIR} _${group}DIR= ${${group}DIR} -. else +. else # ${group}DIR specifies a path DIRS+= ${group}DIR _${group}DIR= ${group}DIR -. endif +. endif -. for cnf in ${${group}} +. for cnf in ${${group}} ${group}OWN_${cnf}?= ${${group}OWN} ${group}GRP_${cnf}?= ${${group}GRP} ${group}MODE_${cnf}?= ${${group}MODE} ${group}DIR_${cnf}?= ${${group}DIR} -. if defined(${group}NAME) +. if defined(${group}NAME) ${group}NAME_${cnf}?= ${${group}NAME} -. else +. else ${group}NAME_${cnf}?= ${cnf:T} -. endif +. endif # Determine the directory for the current file. Default to the parent group # DIR, then check to see how to pass that variable on below. ${group}DIR_${cnf}?= ${${group}DIR} -. if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}} +. if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}} # DIR specifies a variable that specifies a path _${group}DIR_${cnf}= ${${group}DIR_${cnf}} -. else +. else # DIR directly specifies a path _${group}DIR_${cnf}= ${group}DIR_${cnf} -. endif +. endif ${group}PREFIX_${cnf}= ${DESTDIR}${${_${group}DIR_${cnf}}} # Append DIR to DIRS if not already in place -- DIRS is already filtered, so # this is primarily to ease inspection. -. for d in ${DIRS} +. for d in ${DIRS} _DIRS+= ${${d}} -. endfor -. if ${DIRS:M${_${group}DIR_${cnf}}} == "" -. if ${_DIRS:M${${_${group}DIR_${cnf}}}} == "" +. endfor +. if ${DIRS:M${_${group}DIR_${cnf}}} == "" +. if ${_DIRS:M${${_${group}DIR_${cnf}}}} == "" DIRS+= ${_${group}DIR_${cnf}} -. else +. else _${group}DIR_${cnf}= ${group}DIR -. endif . endif +. endif -. if defined(${group}NAME) +. if defined(${group}NAME) ${group}NAME_${cnf}?= ${${group}NAME} -. else +. else ${group}NAME_${cnf}?= ${cnf:T} -. endif # defined(${group}NAME) +. endif # defined(${group}NAME) # Work around a bug with install(1) -C and /dev/null -. if ${cnf} == "/dev/null" +. if ${cnf} == "/dev/null" INSTALL_COPY= -. else +. else INSTALL_COPY= -C -. endif +. endif STAGE_AS_SETS+= ${cnf:T} STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}} @@ -124,8 +124,7 @@ _${group}INS_${cnf:T}: ${cnf} ${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}} \ -g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \ ${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}} -. endfor # for cnf in ${${group}} - +. endfor # for cnf in ${${group}} . endif # defined(${group}) && !empty(${group}) . endfor