Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile @@ -6,14 +6,12 @@ .if exists(../Makefile.inc) .include "../Makefile.inc" .endif +.if exists(Makefile.inc) +.include "Makefile.inc" +.endif RELN_ROOT?= ${.CURDIR} -_OS?= FreeBSD -_REVISION?= 12.0 -_BRANCH?= RELEASE -THISRELEASE?= ${_OS}-${_REVISION}-${_BRANCH} - DOCS= index.xml \ schedule.xml @@ -21,8 +19,8 @@ SUBDIR= errata readme relnotes -.if defined(MAN4DIR) && !empty(MAN4DIR) -SUBDIR+= hardware +.if exists(${SVN}) +SUBDIR+=hardware .endif # PGP-signed checksums Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc @@ -10,3 +10,20 @@ .endif DOCBOOK_DEPS_DISABLE= YES .endif +.include "${DOC_PREFIX}/share/mk/doc.commands.mk" + +_OS?= FreeBSD +_REVMAJOR?= 12 +_REVMINOR?= 0 +_REVISION?= ${REVMAJOR}.${REVMINOR} +_BRANCH?= CURRENT +THISRELEASE?= ${_OS}-${_REVISION}-${_BRANCH} + +HOSTNAME!= hostname +.if (${_BRANCH:MCURRENT*} != "" || ${_BRANCH:MALPHA*} != "") +SRCBRANCH= head +.elif (${_BRANCH:MPRERELEASE} != "" || ${_BRANCH:MBETA*} != "" || ${_BRANCH:MSTABLE*} != "") +SRCBRANCH= stable/${_REVMAJOR} +.elif (${_BRANCH:MRC*} != "" || ${_BRANCH:MRELEASE*} != "") +SRCBRANCH= releng/${_REVMAJOR}.${_REVMINOR} +.endif Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/errata.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/errata.xml +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/errata.xml @@ -24,7 +24,7 @@ $FreeBSD$ - 2017 + 2018 The &os; Documentation Project Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile @@ -4,9 +4,10 @@ .include "../Makefile.inc" .endif -# The path used on build-web is 'src/share/man/man4'. -.if make(all) && (!defined(MAN4DIR) || empty(MAN4DIR) || !exists(${MAN4DIR})) -. warning "MAN4DIR not found. Unable to build hardware.html" +MAN4TMP!= ${MKTEMP} -d ${.CURDIR}/svn.XXXXXXXX +MAN4DIR= ${MAN4TMP} +.if exists(${MAN4DIR}) + rm -rf ${MAN4DIR} .endif MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4 @@ -19,14 +20,27 @@ MAN2HWNOTES_FLAGS= -c .endif -DOC= hardware -FORMATS?= html +DOC?= hardware +FORMATS?= html txt INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED= -hardware.parsed.xml: dev-auto.ent -dev-auto.ent: +CLEANDIRS+= ${.CURDIR}/svn.* + +.if ${.TARGET:M${DOC}.html} +hardware.parsed.xml: dev-auto.ent man4-rmsrc +dev-auto.ent: man4-src-checkout ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} || (rm -f ${.TARGET}) CLEANFILES+= dev-auto.ent +.endif + +man4-src-checkout: + mkdir -p ${MAN4TMP} + ${SVN} co svn://svn.freebsd.org/base/${SRCBRANCH}/share/man/man4 \ + ${MAN4TMP} + +man4-rmsrc: + @# Just in case. + rm -rf ${MAN4DIR} || true .include "${DOC_PREFIX}/share/mk/doc.project.mk" Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml @@ -46,6 +46,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project @@ -827,8 +828,6 @@ &hwlist.ipheth; - &hwlist.ixgb; - &hwlist.ixgbe; &hwlist.ixl; @@ -853,8 +852,6 @@ &hwlist.nge; - &hwlist.nxge; - &hwlist.oce; &hwlist.pcn; @@ -910,8 +907,6 @@ &hwlist.vx; - &hwlist.vxge; - &hwlist.wb; &hwlist.xe; @@ -1005,8 +1000,6 @@ &hwlist.cp; &hwlist.ctau; - - &hwlist.cm; Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/readme.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/readme.xml +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/readme/readme.xml @@ -43,6 +43,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project Index: head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml @@ -25,7 +25,7 @@ - 2017 + 2018 The &os; Documentation Project Index: head/share/mk/doc.commands.mk =================================================================== --- head/share/mk/doc.commands.mk +++ head/share/mk/doc.commands.mk @@ -15,6 +15,7 @@ GREP?= /usr/bin/grep LN?= /bin/ln MKDIR?= /bin/mkdir +MKTEMP?= /usr/bin/mktemp MV?= /bin/mv RM?= /bin/rm ISPELL?= ispell