From owner-svn-src-all@freebsd.org Sun Oct 11 20:41:48 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F305CA1190F for ; Sun, 11 Oct 2015 20:41:47 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: from vfemail.net (ninezero.vfemail.net [96.30.253.190]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2A99A66 for ; Sun, 11 Oct 2015 20:41:47 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: (qmail 11405 invoked by uid 89); 11 Oct 2015 20:41:45 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 11 Oct 2015 20:41:45 -0000 Received: (qmail 11353 invoked by uid 89); 11 Oct 2015 20:41:28 -0000 Received: by simscan 1.3.1 ppid: 11345, pid: 11349, t: 0.0046s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 11 Oct 2015 20:41:28 -0000 Received: (qmail 16801 invoked by uid 89); 11 Oct 2015 20:41:28 -0000 Received: by simscan 1.4.0 ppid: 16773, pid: 16797, t: 1.0702s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 11 Oct 2015 20:41:27 -0000 From: Jan Beich To: Baptiste Daroussin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r289085 - head/share/mk References: <201510092157.t99Lvgfu022041@repo.freebsd.org> Date: Sun, 11 Oct 2015 22:41:09 +0200 In-Reply-To: <201510092157.t99Lvgfu022041@repo.freebsd.org> (Baptiste Daroussin's message of "Fri, 9 Oct 2015 21:57:42 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 11 Oct 2015 20:41:48 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Baptiste Daroussin writes: > +++ head/share/mk/bsd.confs.mk Fri Oct 9 21:57:42 2015 (r289085) [...] > +CONFGROUPS?=3D CONFS [...] > +.error bsd.conf.mk cannot be included directly. > +.for group in ${CONFSGROUPS} Typo: plural vs. singular [...] > +${group}OWN?=3D ${SHAREOWN} > +${group}GRP?=3D ${SHAREGRP} > +${group}MODE?=3D ${SHAREMODE} > +${group}DIR?=3D ${ETCDIR}/ Have you considered patching bsd.files.mk instead of copying it just to modify a few defaults? For one, bsd.confs.mk lacks r257095, r267276, r284345, r287185 - anything from a few years ago. Here's a quick attempt to merge changes back. Due to .mk files being out of sync I may have missed some. $ svn patch /path/to/below.diff $ rm -f /usr/share/mk/bsd.files.mk $ make -s install -C share/mk $ make -sj2 all -C libexec/dma/dmagent $ make -j2 install -C libexec/dma/dmagent =2D-- _proginstall --- =2D-- _FILESINS --- =2D-- _proginstall --- install -s -o root -g mail -m 2555 dma /usr/libexec/dma =2D-- _FILESINS --- install -o root -g wheel -m 444 mailer.conf /usr/share/examples/dma =2D-- _CONFSINS --- install -o root -g wheel -m 644 dma.conf /etc/dma =2D-- _maninstall --- install -o root -g wheel -m 444 dma.8.gz /usr/share/man/man8 Index: share/mk/bsd.prog.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- share/mk/bsd.prog.mk (revision 289150) +++ share/mk/bsd.prog.mk (working copy) @@ -249,7 +249,6 @@ _SCRIPTSINS_${script:T}: ${script} NLSNAME?=3D ${PROG} .include =20 =2D.include .include .include .include Index: share/mk/bsd.files.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- share/mk/bsd.files.mk (revision 289150) +++ share/mk/bsd.files.mk (working copy) @@ -7,7 +7,8 @@ .if !target(____) ____: =20 =2DFILESGROUPS?=3D FILES +FILESGROUPS?=3D FILES CONFS +FILESVARPREFIX?=3DFILES.SHARE CONFS.CONF =20 .for group in ${FILESGROUPS} # Add in foo.yes and remove duplicates from all the groups @@ -22,10 +23,10 @@ all: buildfiles .if defined(${group}) && !empty(${group}) installfiles: installfiles-${group} =20 =2D${group}OWN?=3D ${SHAREOWN} =2D${group}GRP?=3D ${SHAREGRP} =2D${group}MODE?=3D ${SHAREMODE} =2D${group}DIR?=3D ${BINDIR} +${group}OWN?=3D ${${FILESVARPREFIX:M${group}.*:E}OWN} +${group}GRP?=3D ${${FILESVARPREFIX:M${group}.*:E}GRP} +${group}MODE?=3D ${${FILESVARPREFIX:M${group}.*:E}MODE} +${group}DIR?=3D ${${FILESVARPREFIX:M${group}.*:E}DIR} .if !make(buildincludes) STAGE_SETS+=3D ${group} .endif @@ -56,7 +57,7 @@ stage_as.${file:T}: ${file} =20 installfiles-${group}: _${group}INS_${file:T} _${group}INS_${file:T}: ${file} =2D ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ + ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ${.ALLSRC} \ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} @@ -70,11 +71,11 @@ stage_files.${group}: ${_${group}FILES} installfiles-${group}: _${group}INS _${group}INS: ${_${group}FILES} .if defined(${group}NAME) =2D ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} \ ${DESTDIR}${${group}DIR}/${${group}NAME} .else =2D ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif .endif Index: share/mk/bsd.lib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- share/mk/bsd.lib.mk (revision 289150) +++ share/mk/bsd.lib.mk (working copy) @@ -390,7 +390,6 @@ _libinstall: .include .include .include =2D.include .endif =20 .include --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJWGsllXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3by8QIAKAFCbGff/58uAEi6PEVHOHq /IhHycYn8v1k/DEaIidxRzOYIHrscKXpjqJGnck3h+c8R6t648XxXBwE4jjJkq1C 2sVZtpW6Nu4Zed6V703SWx51YOIr64MdqzB/DPpeta0kUCVLWQM0rdyoOVOpPgPP uai4HQ43oCebHkAF7kvykucG4RSVsrjX5LDDoEsRjTjL3AMMZsxxVaHjUKDm8hja pe1d2xYi+ZtismCXICR9mI/J5Yel+1zlnd176EWEuY0pLZTgujHBll4n07NoIGHY tAIcW1+BIKiWO3nYR+GszG0BPlTqRvOOdKsfFCMAFb/t/TrMsgL01NKPqv3woVQ= =Qv1I -----END PGP SIGNATURE----- --=-=-=--