From 5f7e575382ff820356e8016711bda899e3c7355c Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 9 Oct 2019 21:23:40 +0000 Subject: [PATCH] Fix footer variable expansion in the relnotes.html pages for 12.0 and 12.1. Sponsored by: Rubicon Communications, LLC (Netgate) --- .../htdocs/releases/12.0R/relnotes/Makefile | 13 +++++++++++++ .../htdocs/releases/12.1R/relnotes/Makefile | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile index 9c84b31b38..fd64181e59 100644 --- a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile +++ b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile @@ -9,7 +9,20 @@ FORMATS?= html txt INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED= +RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEMAILLIST!= grep -o 'release.maillist "\([^"]*\)"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEURL!= grep -o 'release.url \"[^\"]*\"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' + XSLTPROCFLAGS+= --param toc.section.depth "'3'" +XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" +XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'" +XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" XSLXHTML= http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-release.xsl .PHONY: ${DOC}.parsed.xml diff --git a/en_US.ISO8859-1/htdocs/releases/12.1R/relnotes/Makefile b/en_US.ISO8859-1/htdocs/releases/12.1R/relnotes/Makefile index 9c84b31b38..fd64181e59 100644 --- a/en_US.ISO8859-1/htdocs/releases/12.1R/relnotes/Makefile +++ b/en_US.ISO8859-1/htdocs/releases/12.1R/relnotes/Makefile @@ -9,7 +9,20 @@ FORMATS?= html txt INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED= +RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEMAILLIST!= grep -o 'release.maillist "\([^"]*\)"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEURL!= grep -o 'release.url \"[^\"]*\"' \ + ${.CURDIR}/../share/xml/release.ent | \ + sed 's|[^ ]* "\([^"]*\)"|\1|' + XSLTPROCFLAGS+= --param toc.section.depth "'3'" +XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" +XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'" +XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" XSLXHTML= http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-release.xsl .PHONY: ${DOC}.parsed.xml