From 983e409609885c24fb6cb2652ee37044fe05b05e Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 11 Apr 2017 17:01:20 +0000
Subject: [PATCH] makeman: don't copy $FreeBSD$ tags from source files into
 output

Copying the source VCS ID from WITH_/WITHOUT_* into the generated
src.conf.5 is not necessary, as it is generally possible to determine
the same information using the VCS to examine commit metadata. The
individual source files also match the name of the option recorded in
the generated file, so it is clear from where the content originated.

The copied IDs generate extraneous, non-content noise in the generated
src.conf.5 in some cases, including the first time the file is generated
on a stable branch. In addition, the source file $FreeBSD$ tags are not
expanded by git or other non-Subversion VCSs, which means that makeman
previously could not be used in a non-Subversion working tree.

I accept that there's some desire to keep these, but on balance believe
there is more benefit in removing them.

Reviewed by:	imp, ngie
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D7997
---
 tools/build/options/makeman | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index db9cb4d02fa..bf4474a501e 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # This file is in the public domain.
+#
+# $FreeBSD$
 
 set -o errexit
 export LC_ALL=C
 
-ident='$FreeBSD$'
-
 t=$(mktemp -d -t makeman)
 trap 'test -d $t && rm -rf $t' exit
 
@@ -126,12 +126,9 @@ main()
 {
 	echo "building src.conf.5 man page from files in ${PWD}" >&2
 
-	ident=${ident#$}
-	ident=${ident% $}
 	fbsdid='$'FreeBSD'$'
 	cat <<EOF
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from ${ident}
 .\" ${fbsdid}
 .Dd $(echo $(LC_TIME=C date +'%B %e, %Y'))
 .Dt SRC.CONF 5
@@ -244,7 +241,7 @@ EOF
 		fi
 
 		echo ".It Va ${opt}"
-		sed -e's/\$\(FreeBSD: .*\) \$/from \1/' ${opt}
+		sed -e'/\$FreeBSD.*\$/d' ${opt}
 		if [ -n "${targets}" ] ; then
 			echo '.Pp'
 			echo 'This is a default setting on'