svn commit: r318286 - stable/11/tools/build/options

[Ed Maste]

Author: emaste
Date: Mon May 15 13:05:02 2017
New Revision: 318286
URL: https://svnweb.freebsd.org/changeset/base/318286

Log:
  MFC r316706: 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.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/tools/build/options/makeman
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tools/build/options/makeman
==============================================================================
--- stable/11/tools/build/options/makeman	Mon May 15 10:02:45 2017	(r318285)
+++ stable/11/tools/build/options/makeman	Mon May 15 13:05:02 2017	(r318286)
@@ -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
 
@@ -119,12 +119,9 @@ show()
 main()
 {
 
-	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
@@ -237,7 +234,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 'It is a default setting on'