RELNOTESng is now the default for -CURRENT release builds. (Floppy

images get TXT renderings only; CDROM and FTP areas get TXT and HTML.)

Remove the old *.TXT release documentation files, as they
have been subsumed into RELNOTESng.  The new layout will greatly
facilitate their maintenence and help keep them internally consistent.

1 files changed, 33 insertions, 60 deletions

diff --git a/release/Makefile b/release/Makefile
index fbb407b044c0..80b250059799 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -73,11 +73,14 @@ OBJFORMAT?=		elf
 #NODOC=  YES
 #NOPORTS=  YES
 
-# RELNOTESng can be enabled be uncommenting the following variable
-# definition.  It depends on having ports and docs enabled for this
+# RELNOTESng can be disabled by uncommenting the following variable
+# definition.  RELNOTESng depends on having ports enabled for this
 # release build.
-#RELNOTESNG=	YES
-#RELNOTESNG_LANG=	en_US.ISO_8859-1
+#NORELNOTES=	YES
+
+# Uncomment and modify this definition if you want the release notes 
+# and other release documentation in a language other than English.
+#RELNOTES_LANG=	en_US.ISO_8859-1
 
 # As an alternative to installing the entire ports collection (which
 # can take a huge amount of time, in particular on slower disks),
@@ -95,8 +98,9 @@ NOPORTSATALL=	YES
 .endif
 .endif
 
-# Set ALLLANG=no if you want the release documentation to be
-# in English only.
+# Set ALLLANG=no if you want the documentation (e.g. Handbook, FAQ) to be
+# in English only.  The language for the release notes is controlled
+# by the RELNOTES_LANG variable above.
 ALLLANG?=	yes
 DOCPORTS=	textproc/docproj
 # Set this to wherever the distfiles required by ${DOCPORTS} live.
@@ -105,12 +109,9 @@ DOCDISTFILES?=	${.CURDIR}/../../ports/distfiles
 # on the boot floppy.  WARNING: Breaks on some Athlon (K7) motherboards.
 AUTO_KEYBOARD_DETECT?= 0
 
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES"
+.if !defined(NORELNOTES)
 DIST_DOCS_ARCH_INDEP=	readme errata
 DIST_DOCS_ARCH_DEP=	installation relnotes hardware
-.else
-DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
-           RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT INSTALL.TXT
 .endif
 
 # Things which without too much trouble can be considered variables
@@ -219,7 +220,7 @@ EXTRAS= cdrom.1 ftp.1
 
 .if !defined(NODOC)
 DOCREL= doc.1
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES"
+.if !defined(NORELNOTES)
 DOCREL+= doc.2
 .endif
 .endif
@@ -239,9 +240,9 @@ rerelease release:
 	@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
 	@exit 1
 .endif
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES" && defined(NODOC)
-	@echo "Ports and docs are required for building RELNOTESng.  Either"
-	@echo "unset RELNOTESNG or unset both NOPORTS and NODOC!"
+.if !defined(NORELNOTES) && defined(NODOC)
+	@echo "Docs are required for building the release notes.  Either"
+	@echo "set NORELNOTES or unset NODOC!"
 	@exit 1
 .endif
 .if make(release)
@@ -356,13 +357,13 @@ rerelease release:
 .if defined(NOSRC)
 	echo "export NOSRC=${NOSRC}"		>> ${CHROOTDIR}/mk
 .endif
-.if defined(RELNOTESNG)
-	echo "export RELNOTESNG=${RELNOTESNG}"	>> ${CHROOTDIR}/mk
+.if defined(NORELNOTES)
+	echo "export NORELNOTES=${NORELNOTES}"	>> ${CHROOTDIR}/mk
 .endif
-.if defined(RELNOTESNG_LANG)
-	echo "export RELNOTESNG_LANG=${RELNOTESNG_LANG}"	>> ${CHROOTDIR}/mk
+.if defined(RELNOTES_LANG)
+	echo "export RELNOTES_LANG=${RELNOTES_LANG}"	>> ${CHROOTDIR}/mk
 .else
-	echo "export RELNOTESNG_LANG=en_US.ISO_8859-1"	>> ${CHROOTDIR}/mk
+	echo "export RELNOTES_LANG=en_US.ISO_8859-1"	>> ${CHROOTDIR}/mk
 .endif
 .if defined(NOSHARED)
 	echo "export NOSHARED=${NOSHARED}"	>> ${CHROOTDIR}/mk
@@ -616,22 +617,14 @@ release.8: write_mfs_in_kernel
 	ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
 	ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
 	gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES"
+.if !defined(NORELNOTES)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  gzip -9c ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
+	  gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  gzip -9c ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
+	  gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
 	done
 	@mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT.gz ${RD}/mfsfd/stand/help/INSTALL.TXT.gz
-.else
-	@for i in README.TXT RELNOTES.TXT INSTALL.TXT UPGRADE.TXT HARDWARE.TXT; do \
-	  if [ -f ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} ]; then \
-	     gzip -9c ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} > ${RD}/mfsfd/stand/help/$${i}.gz; \
-	  else \
-	     gzip -9c ${.CURDIR}/texts/$${i} > ${RD}/mfsfd/stand/help/$${i}.gz; \
-	  fi; \
-	done
 .endif
 	-test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
 	@mkdir -p ${RD}/mfsfd/boot
@@ -714,27 +707,17 @@ ftp.1:
 	-@ln -s . ${FD}/${BUILDNAME}
 	@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
 	@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES"
+.if !defined(NORELNOTES)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT
 	@mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM
-.else
-	@for i in ${DIST_DOCS}; do \
-	  if [ -f ${.CURDIR}/texts/$${i} ]; then \
-	     cp ${.CURDIR}/texts/$${i} ${FD}; \
-	  fi; \
-	  if [ -f ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} ]; then \
-	     echo "=== Platform specifics for ${MACHINE_ARCH}" >> ${FD}/$${i}; \
-	     cat ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} >> ${FD}/$${i}; \
-	  fi; \
-	done
 .endif
 	@echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf
 .if !defined(NOPORTS)
@@ -763,27 +746,17 @@ cdrom.1:
 	@cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
-.if defined(RELNOTESNG) && ${RELNOTESNG} == "YES"
+.if !defined(NORELNOTES)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
-	  cp ${.CURDIR}/doc/${RELNOTESNG_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	  cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/${MACHINE_ARCH}/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
 	@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
-.else
-	@for i in ${DIST_DOCS}; do \
-	  if [ -f ${.CURDIR}/texts/$${i} ]; then \
-	     cp ${.CURDIR}/texts/$${i} ${CD_DISC1}; \
-	  fi; \
-	  if [ -f ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} ]; then \
-	     echo "=== Platform specifics for ${MACHINE_ARCH}" >> ${CD_DISC1}/$${i}; \
-	     cat ${.CURDIR}/texts/${MACHINE_ARCH}/$${i} >> ${CD_DISC1}/$${i}; \
-	  fi; \
-        done
 .endif
 .if ${MACHINE_ARCH} == "alpha"
 	@echo "Setting up Alpha CD disc1 for booting"