Date: Thu, 26 Jul 2012 15:01:05 +0400 From: Ruslan Ermilov <ru@FreeBSD.org> To: David O'Brien <obrien@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Sergey Kandaurov <pluknet@FreeBSD.org>, src-committers@FreeBSD.org Subject: Re: svn commit: r236255 - head/contrib/groff/tmac Message-ID: <20120726110105.GB48240@lo0.su> In-Reply-To: <20120531030738.GA77656@dragon.NUXI.org> References: <201205291949.q4TJnqtS099250@svn.freebsd.org> <CAE-mSOJYQZM3xdO=64a4Gz7TzRoY-tLZimxbGPgyeuee_3B_EQ@mail.gmail.com> <20120531030738.GA77656@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, May 30, 2012 at 08:07:38PM -0700, David O'Brien wrote: > On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote: > > On 29 May 2012 23:49, David E. O'Brien <obrien@freebsd.org> wrote: > ... > > > Modified: head/contrib/groff/tmac/doc-common > ... > > > +.ds doc-operating-system-FreeBSD-8.3 8.3 > > > +.ds doc-operating-system-FreeBSD-9.1 9.1 > > > +.ds doc-operating-system-FreeBSD-10.0 10.0 > > This should be imported from savannah.gnu.org repository, > > and not changed directly. > > Unfortunately we cannot do that per r217595: > > This is a direct commit to contrib/ as we will no longer import > any newer groff snapshots, due to licensing issues. > > > For local changes not found in the (latest) contrib doc-common > > you should use gnu/usr.bin/groff/tmac/mdoc.local > > I followed r217595, was that commit the wrong approach? Wrong. mdoc is still distributed under the BSD license, and changes to it should be cherry picked and merged via vendor/groff/dist/. "8.3" and "10.0" that you added were already present in mdoc.local. I've cleaned up this mess now while I was pulling up latest changes to mdoc. And BTW, I still recommend a pre-commit review for groff, as hinted in src/MAINTAINERS.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120726110105.GB48240>