From owner-svn-doc-head@freebsd.org  Fri May  5 13:50:58 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-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 AC0C1D54C47;
 Fri,  5 May 2017 13:50:58 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6404A12BB;
 Fri,  5 May 2017 13:50:58 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45DovV5075249;
 Fri, 5 May 2017 13:50:57 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45DovZj075247;
 Fri, 5 May 2017 13:50:57 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201705051350.v45DovZj075247@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Fri, 5 May 2017 13:50:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50233 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 May 2017 13:50:58 -0000

Author: wblock
Date: Fri May  5 13:50:57 2017
New Revision: 50233
URL: https://svnweb.freebsd.org/changeset/doc/50233

Log:
  Use Subversion metadata for version information rather than grepping for
  $FreeBSD$ version strings.

Modified:
  head/share/mk/doc.commands.mk
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.commands.mk
==============================================================================
--- head/share/mk/doc.commands.mk	Fri May  5 10:33:47 2017	(r50232)
+++ head/share/mk/doc.commands.mk	Fri May  5 13:50:57 2017	(r50233)
@@ -42,6 +42,7 @@ XARGS?=		/usr/bin/xargs
 # Version control
 #
 GIT?=		/usr/local/bin/git
+SVN?=		/usr/local/bin/svn
 
 #
 # Compession and decompression

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Fri May  5 10:33:47 2017	(r50232)
+++ head/share/mk/doc.docbook.mk	Fri May  5 13:50:57 2017	(r50233)
@@ -100,15 +100,21 @@ LATESTREVISION!=cd ${.CURDIR} && ${GIT} 
 	--stringparam latestrevision.committer "%cn" \
 	--stringparam latestrevision.number "%h"' ${SRCS}
 .else
-# version numbers are expected to be in Subversion, but we cannot
-# require Subversion to be installed just to build the documents,
-# so use grep to find the version strings
-LATESTREVISION!=${GREP} -Ehos '\$$[F]reeBSD: ([^\$$ ]+ ){5}\$$' ${SRCS} | \
-		${AWK} '{ print \
-		  "--stringparam latestrevision.timestamp \""$$4" "$$5"\" " \
-		  "--stringparam latestrevision.committer \""$$6"\" " \
-		  "--stringparam latestrevision.number \""$$3"\" " \
-		}' | ${SORT} | ${TAIL} -n1
+# if using Subversion, get information from metadata
+# rather than embedded version strings
+.if exists(${DOC_PREFIX}/.svn) && exists(${SVN})
+LATESTREVISION!=cd ${.CURDIR} && ${SVN} info ${SRCS} 2>/dev/null | \
+		${AWK} 'BEGIN {	genfmt="--stringparam latestrevision."; \
+				timefmt=genfmt"timestamp \"%s %s\""; \
+				comtfmt=genfmt"committer \"%s\""; \
+				revnfmt=genfmt"number \"%u\""; \
+				fmt=timefmt" "comtfmt"\t\t"revnfmt"\n"; } \
+			/^Last Changed Author:/ { committer=$$4 } \
+		        /^Last Changed Rev:/    { number=$$4 } \
+		        /^Last Changed Date:/   { date=$$4; time=$$5; \
+				printf(fmt, date, time, committer, number) }' \
+		| ${SORT} | ${TAIL} -n1
+.endif
 .endif
 
 # if neither Subversion nor Git revision numbers are available, use
@@ -336,7 +342,7 @@ POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDS
 			     -e 's,^\(\"Language-Team:.*\\n\"\),\1\${.newline}\"Language: ${PO_LANG}\\n\",' \
 			     -e 's,^\"Content-Type: text/plain; charset=.*\\n,\"Content-Type: text/plain; charset=${PO_CHARSET}\\n,'
 
-.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran}
+.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran} || ${.TARGETS:M${DOC}.translate.xml}
 
 MASTER_SRCS!=	${MAKE} -C ${EN_DIR} -V SRCS