From owner-svn-src-head@freebsd.org Mon Apr 10 21:14:01 2017 Return-Path: Delivered-To: svn-src-head@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 39B4FD37E05; Mon, 10 Apr 2017 21:14:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x233.google.com (mail-io0-x233.google.com [IPv6:2607:f8b0:4001:c06::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 038447C5; Mon, 10 Apr 2017 21:14:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x233.google.com with SMTP id a103so48218164ioj.1; Mon, 10 Apr 2017 14:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=D8BUkBmag+ffBLSojvAknC0bMQaV2vZf1Lec12rJ0ws=; b=A5XsEziN4/KdW0FxHLRvoy6PrJkihXhAHtPXr6j5S0eysGEEmYvJsiDL46JafXxh6H kpkV93AQtvVxQe5OCBApL6+X17yGtoVN7FhlnGl9aZFUGS4nc/sJ008WJi3H74af0Fdv nZtp2JSblSVp4Onxy8oV/vzLhhOhoaa7eX2oUFsub4Gs1uDWuw8uIOgm/JL0mx9ak8Ws b38MdHHWHSQNpYS5FMyGcnxfEmmun0GkCml70QqroPnee+TxSP4TJ/1YawxY2zt9a3+Q 3mqoQUwzN13GrIaMHH/wkuq0cxzimHJXuSJeXwRM7iOeDx0hfGVVbTIBPo6J6dMEw3la MYNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=D8BUkBmag+ffBLSojvAknC0bMQaV2vZf1Lec12rJ0ws=; b=k8HcyL8pkSzL/aIZA0zmaclcInnOfXnmkag8UoPXz47I9dR4Lo/NDscZ5cGS5hij00 DHC8bQ6l1zhNB5P9Zi6ZBcK1tBFeNfkEGNbPlFlkwWdfE93LJF4N9fTyLQkiqnu3+iAW E9KBCfYDAOjOm8fKBnw6atYx3cbfQ0lG1Sj0fkm2m4H4J1flzE17XHdAHMLd4VbV57Dn xL/it6JYw+M6Hk6HHEu2QPm13YYZSQDrFdDcnQz/zTSCKv1yNF57IEhcZx5ZoOihrfMk KoOYiRKUoVoNy/OE7+XYugDuF+FrYCzG0dUg5ISocvQZMIab6ipgmb7lfBreL6CvG7mq rCow== X-Gm-Message-State: AFeK/H2dpwUZWjZP0IEgwyd/m9OB/W2+RMeYZINsmVRUDRuo6E/nNKL1G4j3OvZfGLj99SJ4h3zwWfWAm28jLQ== X-Received: by 10.107.47.102 with SMTP id j99mr54159180ioo.52.1491858840156; Mon, 10 Apr 2017 14:14:00 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.30.209 with HTTP; Mon, 10 Apr 2017 14:13:39 -0700 (PDT) In-Reply-To: <201704102100.v3AL0lJX041545@repo.freebsd.org> References: <201704102100.v3AL0lJX041545@repo.freebsd.org> From: Ed Maste Date: Mon, 10 Apr 2017 17:13:39 -0400 X-Google-Sender-Auth: 8fEM9CxYwLhiponX4x2nS9jkiIw Message-ID: Subject: Re: svn commit: r316688 - head/share/man/man5 To: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2017 21:14:01 -0000 On 10 April 2017 at 17:00, Ed Maste wrote: > Author: emaste > Date: Mon Apr 10 21:00:47 2017 > New Revision: 316688 > URL: https://svnweb.freebsd.org/changeset/base/316688 > ... > -.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 313788 2017-02-16 04:21:24Z ngie > +.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 313169 2017-02-03 19:09:46Z wblock It looks like several of these $FreeBSD$ entries on the individual WITH_/WITHOUT_ entries ended up with bogus rev numbers on the previous src.conf.5 regen so there are a number of spurious entries in this diff, but I confirmed that the content changes are as desired. I'd like to change makeman to eliminate the copied $FreeBSD$ content from each WITH_/WITHOUT_ block, leaving one $FreeBSD$ for the generated file as a whole. My initial motivation was to allow src.conf.5 to be generated in a git working tree or other VCS that does not expand the $FreeBSD$ tags, but it also eliminates spurious diffs when regenerating on a stable branch and would have avoided the spurious changes here. That change is in Phabricator review D7997: https://reviews.freebsd.org/D7997.