- Update the release notes to DocBook 4.5 XML to build with the

  updated documentation tree

4 files changed, 45 insertions, 13 deletions

diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index e78c527..19247ac 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -2,12 +2,21 @@
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
+# XXX
+RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
+.if ${RELEASETYPE} == "current"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
+.elif ${RELEASETYPE} == "snapshot"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'snapshot'"
+.elif ${RELEASETYPE} == "release"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'"
+.endif
+
 # Find the RELNOTESng document catalogs
-EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/xml/catalog
-EXTRA_CATALOGS+= ${RELN_ROOT}/share/xml/catalog
+EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
+		file://${RELN_ROOT}/share/xml/catalog.xml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${RELN_ROOT}/share/xml/default.dsl
 DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
 
 #
@@ -23,7 +32,7 @@ MAN4DIR?=	${RELN_ROOT}/../../share/man/man4
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${RELN_ROOT}/share/misc/dev.archlist.txt
 DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/xml
-CLEANFILES+=	${DEV-AUTODIR}/dev-auto.xml ${DEV-AUTODIR}/catalog-auto
+CLEANFILES+=	${DEV-AUTODIR}/dev-auto.ent
 
 MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
@@ -33,7 +42,7 @@ MAN2HWNOTES_FLAGS=	-c
 .endif
 
 # Dependency that the article makefiles can use to pull in
-# dev-auto.xml.
-${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.xml: ${MAN4PAGES} \
+# dev-auto.ent.
+${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.ent: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
-	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.xml
+	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.ent
diff --git a/release/doc/share/xml/Makefile b/release/doc/share/xml/Makefile
index d7112ec..b2c1b6d 100644
--- a/release/doc/share/xml/Makefile
+++ b/release/doc/share/xml/Makefile
@@ -5,11 +5,7 @@ RELN_ROOT?= ${.CURDIR}/../..
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
-dev-auto.xml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
+dev-auto.ent: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD}
 	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
 
-catalog-auto:
-	${ECHO_CMD} 'PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"' \
-		'"dev-auto.xml"' > ${.TARGET}
-
-all: dev-auto.xml
+all: dev-auto.ent
diff --git a/release/doc/share/xml/catalog.xml b/release/doc/share/xml/catalog.xml
new file mode 100644
index 0000000..b2a322f
--- /dev/null
+++ b/release/doc/share/xml/catalog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public
+        publicId="-//FreeBSD//ENTITIES Release Specification//EN"
+        uri="release.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"
+	uri="dev-auto.ent"/>
+</catalog>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index dcfb897..1d31710 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -29,11 +29,24 @@
 
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
+<!-- WARNING: Do not forget to also change the release type in
+     doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
 <!ENTITY % release.type.current  "INCLUDE">
 <!ENTITY % release.type.snapshot "IGNORE">
 <!ENTITY % release.type.release "IGNORE">
 
+<![%release.type.current;[
+<!ENTITY release '&release.current;'>
+]]>
+<![%release.type.snapshot;[
+<!ENTITY release '&release.prev;'>
+]]>
+<![%release.type.release;[
+<!ENTITY release '&release.current;'>
+]]>
+<!ENTITY release ''>
+
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
 <!ENTITY release.manpath.xorg          "7.5.1">