OK for 4.7-RELEASE
Fails on 5.1-RELEASE-p8

Append commented braces to help read all those ".if" ".endif" etc constructs.
	Use "%" key in vi editor to bounce between matching "{" & "}".
Also add single quote characters etc, to satisfy syntax checker
	~jhs/public_html/src/bsd/jhs/bin/public/brackets/brackets.c

*** 4.7-RELEASE/src/release/Makefile	Wed Nov  6 12:37:56 2002
--- new/src/release/Makefile	Wed Nov  6 12:42:12 2002
***************
*** 37,51 ****
  # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
  # are building an official release.  Otherwise, we are building for
  # a branch.
! .if defined(RELEASETAG)
  ISRELEASE!=	expr "${RELEASETAG}" : '^RELENG_.*_RELEASE$$' || true
! .if ${ISRELEASE} != 0
  # Convert "RELENG_ver_RELEASE" to "RELEASE_ver" for ports and doc trees.
  AUXRELEASETAG!=	echo ${RELEASETAG} | sed -e 's/^RELENG_/RELEASE_/' -e 's/_RELEASE$$//'
  DOCRELEASETAG?=		${AUXRELEASETAG}
  PORTSRELEASETAG?=	${AUXRELEASETAG}
! .endif
! .endif
  
  # If you want to pass flags to the world build such as -j X, use
  # WORLD_FLAGS.  Similarly, you can specify make flags for kernel
--- 37,51 ----
  # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
  # are building an official release.  Otherwise, we are building for
  # a branch.
! .if defined(RELEASETAG)		#{
  ISRELEASE!=	expr "${RELEASETAG}" : '^RELENG_.*_RELEASE$$' || true
! .if ${ISRELEASE} != 0		#{
  # Convert "RELENG_ver_RELEASE" to "RELEASE_ver" for ports and doc trees.
  AUXRELEASETAG!=	echo ${RELEASETAG} | sed -e 's/^RELENG_/RELEASE_/' -e 's/_RELEASE$$//'
  DOCRELEASETAG?=		${AUXRELEASETAG}
  PORTSRELEASETAG?=	${AUXRELEASETAG}
! .endif		#}
! .endif		#}
  
  # If you want to pass flags to the world build such as -j X, use
  # WORLD_FLAGS.  Similarly, you can specify make flags for kernel
***************
*** 54,64 ****
  #KERNEL_FLAGS=-j4
  
  TARGET_ARCH?=	${MACHINE_ARCH}
! .if ${TARGET_ARCH} == ${MACHINE_ARCH}
  TARGET?=	${MACHINE}
! .else
  TARGET?=	${TARGET_ARCH}
! .endif
  CROSSMAKE=	${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
  NATIVEMAKE=	${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE}
  
--- 54,64 ----
  #KERNEL_FLAGS=-j4
  
  TARGET_ARCH?=	${MACHINE_ARCH}
! .if ${TARGET_ARCH} == ${MACHINE_ARCH}		#{
  TARGET?=	${MACHINE}
! .else		#}{
  TARGET?=	${TARGET_ARCH}
! .endif		#}
  CROSSMAKE=	${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
  NATIVEMAKE=	${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE}
  
***************
*** 99,115 ****
  # can take a huge amount of time, in particular on slower disks),
  # setting ${MINIMALDOCPORTS} allows to install and build just those
  # ports that are really required for getting the docs up & running.
! .if defined(NOPORTS) && !defined(NODOC)
  DOMINIMALDOCPORTS=	YES
  .include "Makefile.inc.docports"
! .endif
  
  # Helper variable
! .if defined(NOPORTS)
! .if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES"
  NOPORTSATALL=	YES
! .endif
! .endif
  
  # 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
--- 99,115 ----
  # can take a huge amount of time, in particular on slower disks),
  # setting ${MINIMALDOCPORTS} allows to install and build just those
  # ports that are really required for getting the docs up & running.
! .if defined(NOPORTS) && !defined(NODOC)		#{
  DOMINIMALDOCPORTS=	YES
  .include "Makefile.inc.docports"
! .endif		#}
  
  # Helper variable
! .if defined(NOPORTS)		#{
! .if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES"		#{
  NOPORTSATALL=	YES
! .endif		#}
! .endif		#}
  
  # 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
***************
*** 117,145 ****
  ALLLANG?=	yes
  DOCPORTS=	textproc/docproj
  # Set this to wherever the distfiles required by release procedures.
! .if defined(DOCDISTFILES)
  # Respect DOCDISTFILES which is used before.
  RELEASEDISTFILES?=	${DOCDISTFILES}
! .else
  RELEASEDISTFILES?=	${.CURDIR}/../../ports/distfiles
! .endif
  # Set this to 1 if you want -P to be used for automatic keyboard detection
  # on the boot floppy.  WARNING: Breaks on some Athlon (K7) motherboards.
  AUTO_KEYBOARD_DETECT?= 0
  
! .if !defined(NODOC)
  DIST_DOCS_ARCH_INDEP=	readme errata
  DIST_DOCS_ARCH_DEP=	installation relnotes hardware
! .endif
  
  # Things which without too much trouble can be considered variables
  # BIN_DISTS are special in that they get full /etc installation sets.
  #
! .if ${TARGET_ARCH} == "i386"
  COMPAT_DISTS?=	compat1x compat20 compat21 compat22 compat3x compat4x
! .else
  COMPAT_DISTS?=	compat4x
! .endif
  OTHER_DISTS?=	catpages manpages games proflibs dict info doc
  CRYPTO_DISTS?=	crypto krb4 krb5
  BIN_DISTS?=	bin
--- 117,145 ----
  ALLLANG?=	yes
  DOCPORTS=	textproc/docproj
  # Set this to wherever the distfiles required by release procedures.
! .if defined(DOCDISTFILES)		#{
  # Respect DOCDISTFILES which is used before.
  RELEASEDISTFILES?=	${DOCDISTFILES}
! .else		#}{
  RELEASEDISTFILES?=	${.CURDIR}/../../ports/distfiles
! .endif		#}
  # Set this to 1 if you want -P to be used for automatic keyboard detection
  # on the boot floppy.  WARNING: Breaks on some Athlon (K7) motherboards.
  AUTO_KEYBOARD_DETECT?= 0
  
! .if !defined(NODOC)		#{
  DIST_DOCS_ARCH_INDEP=	readme errata
  DIST_DOCS_ARCH_DEP=	installation relnotes hardware
! .endif		#}
  
  # Things which without too much trouble can be considered variables
  # BIN_DISTS are special in that they get full /etc installation sets.
  #
! .if ${TARGET_ARCH} == "i386"		#{
  COMPAT_DISTS?=	compat1x compat20 compat21 compat22 compat3x compat4x
! .else		#}{
  COMPAT_DISTS?=	compat4x
! .endif		#}
  OTHER_DISTS?=	catpages manpages games proflibs dict info doc
  CRYPTO_DISTS?=	crypto krb4 krb5
  BIN_DISTS?=	bin
***************
*** 153,160 ****
  # Various floppy image parameters.
  #
  
! .if ${TARGET_ARCH} == "i386"
! .if ${TARGET} == "pc98"
  SMALLBOOTSIZE=		1200
  BOOTSIZE=		1440
  FIXITSIZE=		1440
--- 153,160 ----
  # Various floppy image parameters.
  #
  
! .if ${TARGET_ARCH} == "i386"		#{
! .if ${TARGET} == "pc98"		#{
  SMALLBOOTSIZE=		1200
  BOOTSIZE=		1440
  FIXITSIZE=		1440
***************
*** 166,172 ****
  BOOTLABEL=		fd1440
  FIXITLABEL=		fd1440
  MFSLABEL=		minimum3
! .else
  BOOTSIZE=		1440
  FIXITSIZE=		1440
  MFSSIZE=		4320
--- 166,172 ----
  BOOTLABEL=		fd1440
  FIXITLABEL=		fd1440
  MFSLABEL=		minimum3
! .else		#}{
  BOOTSIZE=		1440
  FIXITSIZE=		1440
  MFSSIZE=		4320
***************
*** 178,185 ****
  FIXITLABEL=		fd1440
  MFSLABEL=		minimum3
  BIGBOOTLABEL=		minimum2
! .endif
! .elif ${TARGET_ARCH} == "alpha"
  BOOTSIZE=		1440
  FIXITSIZE=		2880
  MFSSIZE=		4320
--- 178,185 ----
  FIXITLABEL=		fd1440
  MFSLABEL=		minimum3
  BIGBOOTLABEL=		minimum2
! .endif		#}
! .elif ${TARGET_ARCH} == "alpha"
  BOOTSIZE=		1440
  FIXITSIZE=		2880
  MFSSIZE=		4320
***************
*** 191,215 ****
  FIXITLABEL=		minimum2
  MFSLABEL=		auto
  BIGBOOTLABEL=		minimum2
! .endif
  
  ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
  
  # Things that need to be recompiled with Kerberos support.
! .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
  K4PROGS!=	cd ${.CURDIR}/../kerberosIV; ${MAKE} -V KPROGS
! .endif
! .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
  K5PROGS!=	cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
! .endif
  
  # Things that need to be compiled without crypto support in releases
! .if !defined(FIXCRYPTO)
  FIXCRYPTO=	bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump 
! .if !defined(NO_SENDMAIL)
  FIXCRYPTO+=	usr.sbin/sendmail
! .endif
! .endif
  
  
  VNDEVICE?=		vn0
--- 191,215 ----
  FIXITLABEL=		minimum2
  MFSLABEL=		auto
  BIGBOOTLABEL=		minimum2
! .endif		#}
  
  ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
  
  # Things that need to be recompiled with Kerberos support.
! .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)		#{
  K4PROGS!=	cd ${.CURDIR}/../kerberosIV; ${MAKE} -V KPROGS
! .endif		#}
! .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)		#{
  K5PROGS!=	cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
! .endif		#}
  
  # Things that need to be compiled without crypto support in releases
! .if !defined(FIXCRYPTO)		#{
  FIXCRYPTO=	bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump 
! .if !defined(NO_SENDMAIL)		#{
  FIXCRYPTO+=	usr.sbin/sendmail
! .endif		#}
! .endif		#}
  
  
  VNDEVICE?=		vn0
***************
*** 227,245 ****
  # Where the bootstrap ports (see DOCPORTS) get installed.
  LOCALDIR=		/usr/local/bin
  
! .if !defined(CRUNCH_TARGETS)
  CRUNCH_TARGETS=	boot fixit
! .endif
  
  EXTRAS= cdrom.1 ftp.1
! .if defined(MAKE_ISOS)
  EXTRAS+= iso.1
! .if ${TARGET} != "pc98"
  BOOTABLE="-b"
! .endif
! .endif
  
! .if !defined(NODOC)
  DOCREL= doc.1 doc.2
  # If you are an optimist & hope all 7650 ports are in good order,
  # uncomment next line (or assert PREANPORTS=-P on command line),
--- 227,245 ----
  # Where the bootstrap ports (see DOCPORTS) get installed.
  LOCALDIR=		/usr/local/bin
  
! .if !defined(CRUNCH_TARGETS)		#{
  CRUNCH_TARGETS=	boot fixit
! .endif		#}
  
  EXTRAS= cdrom.1 ftp.1
! .if defined(MAKE_ISOS)		#{
  EXTRAS+= iso.1
! .if ${TARGET} != "pc98"		#{
  BOOTABLE="-b"
! .endif		#}
! .endif		#}
  
! .if !defined(NODOC)		#{
  DOCREL= doc.1 doc.2
  # If you are an optimist & hope all 7650 ports are in good order,
  # uncomment next line (or assert PREANPORTS=-P on command line),
***************
*** 252,264 ****
  # "make readmes" with "cd: can''t cd to ripit-atapi"
  # An alternate more drastic way to avoid make breaking is assert NOPORTREADMES
  
! .endif
  
! .if !defined(NOPORTREADMES)
  MAKEREADMES=	make readmes PORTSDIR=${CHROOTDIR}/usr/ports
! .else
  MAKEREADMES=	true
! .endif
  
  TMAKE!=		echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
  		cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE
--- 252,264 ----
  # "make readmes" with "cd: can''t cd to ripit-atapi"
  # An alternate more drastic way to avoid make breaking is assert NOPORTREADMES
  
! .endif		#}
  
! .if !defined(NOPORTREADMES)		#{
  MAKEREADMES=	make readmes PORTSDIR=${CHROOTDIR}/usr/ports
! .else		#}{
  MAKEREADMES=	true
! .endif		#}
  
  TMAKE!=		echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
  		cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE
***************
*** 267,288 ****
  WMAKE=		${WMAKEENV} ${MAKE}
  
  rerelease release:
! .if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)
  	@echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
! .endif
! .if defined(NOPORTSATALL) && !defined(NODOC)
  	@echo "Ports are required for building the docs.  Either set NODOC or"
  	@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
  	@exit 1
! .endif
! .if make(release)
! .if exists(${CHROOTDIR})
  # The first command will fail on a handful of files that have their schg
  # flags set.  But it greatly speeds up the next two commands.
  	-rm -rf ${CHROOTDIR} 2>/dev/null
  	-chflags -R noschg ${CHROOTDIR}/.
  	-rm -rf ${CHROOTDIR}
! .endif
  	mkdir -p ${CHROOTDIR}
  	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
  	cd ${.CURDIR}/.. && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
--- 267,288 ----
  WMAKE=		${WMAKEENV} ${MAKE}
  
  rerelease release:
! .if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)		#{
  	@echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
! .endif		#}
! .if defined(NOPORTSATALL) && !defined(NODOC)		#{
  	@echo "Ports are required for building the docs.  Either set NODOC or"
  	@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
  	@exit 1
! .endif		#}
! .if make(release)		#{
! .if exists(${CHROOTDIR})		#{
  # The first command will fail on a handful of files that have their schg
  # flags set.  But it greatly speeds up the next two commands.
  	-rm -rf ${CHROOTDIR} 2>/dev/null
  	-chflags -R noschg ${CHROOTDIR}/.
  	-rm -rf ${CHROOTDIR}
! .endif		#}
  	mkdir -p ${CHROOTDIR}
  	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
  	cd ${.CURDIR}/.. && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
***************
*** 291,363 ****
  	if [ -f /etc/resolv.conf ]; then \
  		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
  	fi
! .if !defined(RELEASETAG)
  	cd ${CHROOTDIR}/usr && rm -rf src && \
  		cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASESRCMODULE}
! .else
  	cd ${CHROOTDIR}/usr && rm -rf src && \
  		cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${RELEASETAG} ${RELEASESRCMODULE}
! .endif
! .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
  	cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES}
! .endif
! .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT})
  	cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
! .endif
! .if !defined(NOPORTS)
! .if defined(PORTSRELEASETAG)
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
! .else
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
! .endif
! .elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES"
! .if defined(PORTSRELEASETAG)
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS}
! .else
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${MINIMALDOCPORTS}
! .endif
! .endif
! .if !defined(NODOC)
! .if defined(DOCRELEASETAG)
  	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${DOCRELEASETAG} ${RELEASEDOCMODULE}
! .else
  	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASEDOCMODULE}
! .endif
  	if [ -d ${RELEASEDISTFILES}/ ]; then \
  		cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
  	else \
  		mkdir -p ${CHROOTDIR}/usr/ports/distfiles; \
  	fi
! .if defined(PREFETCHDISTFILES)
  	@for i in ${DOCPORTS}; do \
  		cd ${CHROOTDIR}/usr/ports/$$i && \
  			make PORTSDIR=${CHROOTDIR}/usr/ports BATCH=yes \
  			WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes \
  			fetch-recursive ; \
  	done
! .endif
! .endif
! .endif
! .if make(rerelease)
! .if !defined(RELEASENOUPDATE)
! .if !defined(RELEASETAG)
  	cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d -A
! .else
  	cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d -r ${RELEASETAG}
! .endif
! .if !defined(NOPORTS)
  	cd ${CHROOTDIR}/usr/ports && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d
! .endif
! .if defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES"
  	for i in ${MINIMALDOCPORTS}; do \
  		( cd ${CHROOTDIR}/usr/$$i && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d ) ; \
  	done
! .endif
! .if !defined(NODOC)
  	cd ${CHROOTDIR}/usr/doc && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d
! .endif
! .endif
! .endif
  	# Add version information to those things that need it.
  	( cd ${CHROOTDIR}/usr/src/sys/conf && \
  	  mv newvers.sh foo && \
--- 291,363 ----
  	if [ -f /etc/resolv.conf ]; then \
  		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
  	fi
! .if !defined(RELEASETAG)		#{
  	cd ${CHROOTDIR}/usr && rm -rf src && \
  		cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASESRCMODULE}
! .else		#}{
  	cd ${CHROOTDIR}/usr && rm -rf src && \
  		cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${RELEASETAG} ${RELEASESRCMODULE}
! .endif		#}
! .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})		#{
  	cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES}
! .endif		#}
! .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT})		#{
  	cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
! .endif		#}
! .if !defined(NOPORTS)		#{
! .if defined(PORTSRELEASETAG)		#{
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
! .else		#}{
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES}
! .endif		#}
! .elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES"
! .if defined(PORTSRELEASETAG)		#{
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS}
! .else		#}{
  	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${MINIMALDOCPORTS}
! .endif		#}
! .endif		#}
! .if !defined(NODOC)		#{
! .if defined(DOCRELEASETAG)		#{
  	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} -r ${DOCRELEASETAG} ${RELEASEDOCMODULE}
! .else		#}{
  	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} ${PREANPORTS} ${RELEASEDOCMODULE}
! .endif		#}
  	if [ -d ${RELEASEDISTFILES}/ ]; then \
  		cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
  	else \
  		mkdir -p ${CHROOTDIR}/usr/ports/distfiles; \
  	fi
! .if defined(PREFETCHDISTFILES)		#{
  	@for i in ${DOCPORTS}; do \
  		cd ${CHROOTDIR}/usr/ports/$$i && \
  			make PORTSDIR=${CHROOTDIR}/usr/ports BATCH=yes \
  			WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes \
  			fetch-recursive ; \
  	done
! .endif		#}
! .endif		#}
! .endif		#}
! .if make(rerelease)		#{
! .if !defined(RELEASENOUPDATE)		#{
! .if !defined(RELEASETAG)		#{
  	cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d -A
! .else		#}{
  	cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d -r ${RELEASETAG}
! .endif		#}
! .if !defined(NOPORTS)		#{
  	cd ${CHROOTDIR}/usr/ports && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d
! .endif		#}
! .if defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES"		#{
  	for i in ${MINIMALDOCPORTS}; do \
  		( cd ${CHROOTDIR}/usr/$$i && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d ) ; \
  	done
! .endif		#}
! .if !defined(NODOC)		#{
  	cd ${CHROOTDIR}/usr/doc && cvs -R -q update ${CVSCMDARGS} ${PREANPORTS} -d
! .endif		#}
! .endif		#}
! .endif		#}
  	# Add version information to those things that need it.
  	( cd ${CHROOTDIR}/usr/src/sys/conf && \
  	  mv newvers.sh foo && \
***************
*** 372,442 ****
  	echo "export VNDEVICE=${VNDEVICE}"	>> ${CHROOTDIR}/mk
  	echo "export OBJFORMAT=${OBJFORMAT}"	>> ${CHROOTDIR}/mk
  	echo "export MODULES_WITH_WORLD=YES"	>> ${CHROOTDIR}/mk
! .if defined(RELEASETAG)
  	echo "export RELEASETAG=\"${RELEASETAG}\""	>> ${CHROOTDIR}/mk
! .endif
! .if defined(NOPORTS)
  	echo "export NOPORTS=${NOPORTS}"	>> ${CHROOTDIR}/mk
! .endif
! .if defined(MAKE_ISOS)
  	echo "export MAKE_ISOS=${MAKE_ISOS}"	>> ${CHROOTDIR}/mk
! .endif
! .if defined(DOMINIMALDOCPORTS)
  	echo "export DOMINIMALDOCPORTS=${DOMINIMALDOCPORTS}" >> ${CHROOTDIR}/mk
! .endif
! .if defined(NODOC)
  	echo "export NODOC=${NODOC}"		>> ${CHROOTDIR}/mk
! .endif
! .if defined(ALLLANG) && ${ALLLANG} != "NO" && ${ALLLANG} != "no"
  	echo "export ALLLANG=${ALLLANG}"	>> ${CHROOTDIR}/mk
! .else
  	echo "export DOC_LANG=en_US.ISO8859-1"	>> ${CHROOTDIR}/mk
! .endif
! .if defined(AUTO_KEYBOARD_DETECT)
  	echo "export AUTO_KEYBOARD_DETECT=\"${AUTO_KEYBOARD_DETECT}\"" 	>> ${CHROOTDIR}/mk
! .endif
! .if defined(NOSRC)
  	echo "export NOSRC=${NOSRC}"		>> ${CHROOTDIR}/mk
! .endif
! .if defined(RELNOTES_LANG)
  	echo "export RELNOTES_LANG=${RELNOTES_LANG}"	>> ${CHROOTDIR}/mk
! .else
  	echo "export RELNOTES_LANG=en_US.ISO8859-1"	>> ${CHROOTDIR}/mk
! .endif
! .if defined(NOSHARED)
  	echo "export NOSHARED=${NOSHARED}"	>> ${CHROOTDIR}/mk
! .endif
! .if defined(BOOT_CONFIG)
  	echo "export BOOT_CONFIG=\"${BOOT_CONFIG}\"">> ${CHROOTDIR}/mk
! .endif
! .if defined(WORLD_FLAGS)
  	echo "export WORLD_FLAGS=\"${WORLD_FLAGS}\""	>> ${CHROOTDIR}/mk
! .endif
! .if defined(KERNEL_FLAGS)
  	echo "export KERNEL_FLAGS=\"${KERNEL_FLAGS}\"" >> ${CHROOTDIR}/mk
! .endif
! .if defined(TARGET)
  	echo "export TARGET=\"${TARGET}\"" >> ${CHROOTDIR}/mk
! .endif
! .if defined(TARGET_ARCH)
  	echo "export TARGET_ARCH=\"${TARGET_ARCH}\"" >> ${CHROOTDIR}/mk
! .endif
! .if defined(EXTRA_SRC)
  	echo "export EXTRA_SRC=\"${EXTRA_SRC}\""	>> ${CHROOTDIR}/mk
! .endif
! .if defined(FIXCRYPTO)
  	echo "export FIXCRYPTO=\"${FIXCRYPTO}\""	>> ${CHROOTDIR}/mk
! .endif
! .if defined(KERNELS)
  	echo "export KERNELS=\"${KERNELS}\""		>> ${CHROOTDIR}/mk
! .endif
! .if defined(NOKERBEROS)
  	echo "export NOKERBEROS=\"${NOKERBEROS}\""	>> ${CHROOTDIR}/mk
! .endif
! .if defined(NO_SENDMAIL)
  	echo "export NO_SENDMAIL=\"${NO_SENDMAIL}\""	>> ${CHROOTDIR}/mk
! .endif
  	# Don't remove this, or the build will fall over!
  	echo "export RELEASEDIR=${_R}"		>> ${CHROOTDIR}/mk
  	echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}"	>> ${CHROOTDIR}/mk
  	echo "export MANBUILDCAT=YES"		>> ${CHROOTDIR}/mk
--- 372,443 ----
  	echo "export VNDEVICE=${VNDEVICE}"	>> ${CHROOTDIR}/mk
  	echo "export OBJFORMAT=${OBJFORMAT}"	>> ${CHROOTDIR}/mk
  	echo "export MODULES_WITH_WORLD=YES"	>> ${CHROOTDIR}/mk
! .if defined(RELEASETAG)		#{
  	echo "export RELEASETAG=\"${RELEASETAG}\""	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NOPORTS)		#{
  	echo "export NOPORTS=${NOPORTS}"	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(MAKE_ISOS)		#{
  	echo "export MAKE_ISOS=${MAKE_ISOS}"	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(DOMINIMALDOCPORTS)		#{
  	echo "export DOMINIMALDOCPORTS=${DOMINIMALDOCPORTS}" >> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NODOC)		#{
  	echo "export NODOC=${NODOC}"		>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(ALLLANG) && ${ALLLANG} != "NO" && ${ALLLANG} != "no"		#{
  	echo "export ALLLANG=${ALLLANG}"	>> ${CHROOTDIR}/mk
! .else				#}{
  	echo "export DOC_LANG=en_US.ISO8859-1"	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(AUTO_KEYBOARD_DETECT)		#{
  	echo "export AUTO_KEYBOARD_DETECT=\"${AUTO_KEYBOARD_DETECT}\"" 	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NOSRC)		#{
  	echo "export NOSRC=${NOSRC}"		>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(RELNOTES_LANG)		#{
  	echo "export RELNOTES_LANG=${RELNOTES_LANG}"	>> ${CHROOTDIR}/mk
! .else				#}{
  	echo "export RELNOTES_LANG=en_US.ISO8859-1"	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NOSHARED)		#{
  	echo "export NOSHARED=${NOSHARED}"	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(BOOT_CONFIG)		#{
  	echo "export BOOT_CONFIG=\"${BOOT_CONFIG}\"">> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(WORLD_FLAGS)		#{
  	echo "export WORLD_FLAGS=\"${WORLD_FLAGS}\""	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(KERNEL_FLAGS)		#{
  	echo "export KERNEL_FLAGS=\"${KERNEL_FLAGS}\"" >> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(TARGET)		#{
  	echo "export TARGET=\"${TARGET}\"" >> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(TARGET_ARCH)		#{
  	echo "export TARGET_ARCH=\"${TARGET_ARCH}\"" >> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(EXTRA_SRC)		#{
  	echo "export EXTRA_SRC=\"${EXTRA_SRC}\""	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(FIXCRYPTO)		#{
  	echo "export FIXCRYPTO=\"${FIXCRYPTO}\""	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(KERNELS)		#{
  	echo "export KERNELS=\"${KERNELS}\""		>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NOKERBEROS)		#{
  	echo "export NOKERBEROS=\"${NOKERBEROS}\""	>> ${CHROOTDIR}/mk
! .endif				#}
! .if defined(NO_SENDMAIL)		#{
  	echo "export NO_SENDMAIL=\"${NO_SENDMAIL}\""	>> ${CHROOTDIR}/mk
! .endif				#}
  	# Don't remove this, or the build will fall over!
+ 	# Spare ' character to satisfy brackets.c
  	echo "export RELEASEDIR=${_R}"		>> ${CHROOTDIR}/mk
  	echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}"	>> ${CHROOTDIR}/mk
  	echo "export MANBUILDCAT=YES"		>> ${CHROOTDIR}/mk
***************
*** 565,582 ****
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
  	    SUBDIR_OVERRIDE="${FIXCRYPTO}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
  	cd ${.CURDIR}/..; \
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS4 \
  	    SUBDIR_OVERRIDE="kerberosIV ${K4PROGS}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .endif
! .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
  	cd ${.CURDIR}/..; \
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \
  	    SUBDIR_OVERRIDE="kerberos5 ${K5PROGS}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .endif
  	-chflags -R noschg ${RD}/trees
  	touch release.3
  
--- 566,583 ----
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
  	    SUBDIR_OVERRIDE="${FIXCRYPTO}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)		#{
  	cd ${.CURDIR}/..; \
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS4 \
  	    SUBDIR_OVERRIDE="kerberosIV ${K4PROGS}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .endif		#}
! .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)		#{
  	cd ${.CURDIR}/..; \
  	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \
  	    SUBDIR_OVERRIDE="kerberos5 ${K5PROGS}" \
  	    buildworld distributeworld DISTDIR=${RD}/trees
! .endif		#}
  	-chflags -R noschg ${RD}/trees
  	touch release.3
  
***************
*** 603,613 ****
  .for j in ${CRUNCH_TARGETS}
  	rm -rf ${j}_crunch
  	mkdir ${j}_crunch
! .if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf)
  	cd ${j}_crunch; ${WMAKEENV} crunchgen ${.CURDIR}/${TARGET}/${j}_crunch.conf
! .else
  	cd ${j}_crunch; ${WMAKEENV} crunchgen ${.CURDIR}/${j}_crunch.conf
! .endif
  	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
  	cd ${.CURDIR}/..; ${TMAKE} build-tools
  	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk all
--- 604,614 ----
  .for j in ${CRUNCH_TARGETS}
  	rm -rf ${j}_crunch
  	mkdir ${j}_crunch
! .if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf)		#{
  	cd ${j}_crunch; ${WMAKEENV} crunchgen ${.CURDIR}/${TARGET}/${j}_crunch.conf
! .else		#}{
  	cd ${j}_crunch; ${WMAKEENV} crunchgen ${.CURDIR}/${j}_crunch.conf
! .endif		#}
  	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
  	cd ${.CURDIR}/..; ${TMAKE} build-tools
  	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk all
***************
*** 629,634 ****
--- 630,636 ----
  	done \
  
  	# Remove all the directories we don't need.
+ 	# Spare ' character to satisfy brackets.c
  	-cd ${RD}/trees && \
  		find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir
  	touch release.6
***************
*** 668,674 ****
  # --==## Make source dists ##==--
  #
  release.8:
! .if !defined(NOSRC)
  	@cd ${.CURDIR} && $(MAKE) doTARBALL SD=/usr/src \
  		TD=src TN=sbase ARG="[A-Z]*"
  	@for i in `cd /usr/src && echo [a-z]*` ; do \
--- 670,676 ----
  # --==## Make source dists ##==--
  #
  release.8:
! .if !defined(NOSRC)		#{
  	@cd ${.CURDIR} && $(MAKE) doTARBALL SD=/usr/src \
  		TD=src TN=sbase ARG="[A-Z]*"
  	@for i in `cd /usr/src && echo [a-z]*` ; do \
***************
*** 681,687 ****
  				SD=/usr/src TD=src ARG="$$i" ; \
  		fi ; \
  	done
! .if defined(EXTRA_SRC)
  	@set ${EXTRA_SRC} && \
  	while [ $$# -ge 2 ] ; do \
  		if [ -d /usr/src/$$1 ] ; then \
--- 683,689 ----
  				SD=/usr/src TD=src ARG="$$i" ; \
  		fi ; \
  	done
! .if defined(EXTRA_SRC)		#{
  	@set ${EXTRA_SRC} && \
  	while [ $$# -ge 2 ] ; do \
  		if [ -d /usr/src/$$1 ] ; then \
***************
*** 689,695 ****
  				SD=/usr/src TN="s$$2" TD=src ARG="$$1" ; \
  		fi && shift && shift ; \
  	done
! .endif
  	if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \
  		if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \
  		if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \
--- 691,697 ----
  				SD=/usr/src TN="s$$2" TD=src ARG="$$1" ; \
  		fi && shift && shift ; \
  	done
! .endif		#}
  	if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \
  		if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \
  		if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \
***************
*** 699,705 ****
  		md5 * > CHECKSUM.MD5 ) ; fi
  	(cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5)
  	@echo "src distribution is finished."
! .endif
  	touch release.8
  
  # Complete the bootfd
--- 701,707 ----
  		md5 * > CHECKSUM.MD5 ) ; fi
  	(cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5)
  	@echo "src distribution is finished."
! .endif		#}
  	touch release.8
  
  # Complete the bootfd
***************
*** 732,740 ****
  		ln -sf /stand $$dir; \
  	  done )
  	cp ${RD}/trees/bin/sbin/dhclient-script ${RD}/mfsfd/stand
! .if ${TARGET_ARCH} == "i386"
  	cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
! .endif
  	cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
  	cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
  	echo "nameserver      42/tcp name"	> ${RD}/mfsfd/stand/etc/services
--- 734,742 ----
  		ln -sf /stand $$dir; \
  	  done )
  	cp ${RD}/trees/bin/sbin/dhclient-script ${RD}/mfsfd/stand
! .if ${TARGET_ARCH} == "i386"		#{
  	cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
! .endif		#}
  	cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
  	cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
  	echo "nameserver      42/tcp name"	> ${RD}/mfsfd/stand/etc/services
***************
*** 743,749 ****
  	echo "domain          53/udp          nameserver" >> ${RD}/mfsfd/stand/etc/services
  	echo "cmd             514/tcp    shell" >> ${RD}/mfsfd/stand/etc/services
  	gzip -9c ${RD}/trees/bin/COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
! .if !defined(NODOC)
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
  	done
--- 745,751 ----
  	echo "domain          53/udp          nameserver" >> ${RD}/mfsfd/stand/etc/services
  	echo "cmd             514/tcp    shell" >> ${RD}/mfsfd/stand/etc/services
  	gzip -9c ${RD}/trees/bin/COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
! .if !defined(NODOC)		#{
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
  	done
***************
*** 751,790 ****
  	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${TARGET_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
! .endif
  	-test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
  	@mkdir -p ${RD}/mfsfd/boot
  	@cp ${RD}/trees/bin/boot/boot* ${RD}/mfsfd/boot
! .if ${TARGET} == "i386"
  	@cp ${RD}/trees/bin/boot/mbr ${RD}/mfsfd/boot
! .endif
  	@cp ${RD}/trees/bin/boot/loader.help ${RD}/mfsfd/boot
  	@echo "Making the regular boot floppy."
  	@tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
  		tar xf - -C ${RD}/mfsfd/stand
  	@echo "Compressing doc files..."
  	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
! .if exists(${.CURDIR}/${TARGET}/drivers.conf)
  	@mkdir -p ${RD}/mfsfd/stand/modules
  	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk \
  	    ${.CURDIR}/${TARGET}/drivers.conf \
  	    ${RD}/trees/bin/modules ${RD}/mfsfd/stand/modules
! .endif
  	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
  		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
  	@gzip -9vc mfsroot > mfsroot.gz
! .if ${TARGET} == "pc98"
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
  		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
  		${BOOTINODE} ${SMALLBOOTLABEL}
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
! .else
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
  		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
! .endif
  	@rm mfsroot mfsroot.gz
  	@echo "Regular and MFS boot floppies made."
  	touch release.9
--- 753,792 ----
  	  gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${TARGET_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
! .endif		#}
  	-test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
  	@mkdir -p ${RD}/mfsfd/boot
  	@cp ${RD}/trees/bin/boot/boot* ${RD}/mfsfd/boot
! .if ${TARGET} == "i386"		#{
  	@cp ${RD}/trees/bin/boot/mbr ${RD}/mfsfd/boot
! .endif		#}
  	@cp ${RD}/trees/bin/boot/loader.help ${RD}/mfsfd/boot
  	@echo "Making the regular boot floppy."
  	@tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
  		tar xf - -C ${RD}/mfsfd/stand
  	@echo "Compressing doc files..."
  	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
! .if exists(${.CURDIR}/${TARGET}/drivers.conf)		#{
  	@mkdir -p ${RD}/mfsfd/stand/modules
  	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk \
  	    ${.CURDIR}/${TARGET}/drivers.conf \
  	    ${RD}/trees/bin/modules ${RD}/mfsfd/stand/modules
! .endif		#}
  	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
  		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
  	@gzip -9vc mfsroot > mfsroot.gz
! .if ${TARGET} == "pc98"		#{
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
  		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
  		${BOOTINODE} ${SMALLBOOTLABEL}
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
! .else		#}{
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
  		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
  	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
! .endif		#}
  	@rm mfsroot mfsroot.gz
  	@echo "Regular and MFS boot floppies made."
  	touch release.9
***************
*** 816,828 ****
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
  		${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
  # Do our last minute floppies directory setup in a convenient place.
! .if !defined(NODOC)
  	@cp ${RND}/${RELNOTES_LANG}/installation/${TARGET_ARCH}/article.txt \
  		${RD}/floppies/README.TXT
  	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
! .else
  	@(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
! .endif
  	touch release.10
  
  #
--- 818,830 ----
  	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
  		${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
  # Do our last minute floppies directory setup in a convenient place.
! .if !defined(NODOC)		#{
  	@cp ${RND}/${RELNOTES_LANG}/installation/${TARGET_ARCH}/article.txt \
  		${RD}/floppies/README.TXT
  	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
! .else		#}{
  	@(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
! .endif		#}
  	touch release.10
  
  #
***************
*** 834,840 ****
  	-@ln -s . ${FD}/${BUILDNAME}
  	@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
  	@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
! .if !defined(NODOC)
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
--- 836,842 ----
  	-@ln -s . ${FD}/${BUILDNAME}
  	@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
  	@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
! .if !defined(NODOC)		#{
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
***************
*** 846,856 ****
  	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD}
  	@mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT
  	@mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM
! .endif
  	@echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf
! .if !defined(NOPORTS)
  	@tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD}
! .endif
  	touch ftp.1
  
  #
--- 848,858 ----
  	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD}
  	@mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT
  	@mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM
! .endif		#}
  	@echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf
! .if !defined(NOPORTS)		#{
  	@tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD}
! .endif		#}
  	touch ftp.1
  
  #
***************
*** 873,879 ****
  	@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(NODOC)
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
--- 875,881 ----
  	@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(NODOC)		#{
  	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
  	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
***************
*** 885,892 ****
  	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
  	@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
  	@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
! .endif
! .if ${TARGET} != "pc98"
  	@echo "Setting up /boot"
  	@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
  	@ln -f ${RD}/image.boot/mfsroot.gz ${CD_DISC1}/boot/mfsroot.gz
--- 887,894 ----
  	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1}
  	@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
  	@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
! .endif		#}
! .if ${TARGET} != "pc98"		#{
  	@echo "Setting up /boot"
  	@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
  	@ln -f ${RD}/image.boot/mfsroot.gz ${CD_DISC1}/boot/mfsroot.gz
***************
*** 894,917 ****
  	@echo 'mfsroot_load="YES"' > ${CD_DISC1}/boot/loader.conf
  	@echo 'mfsroot_type="mfs_root"' >> ${CD_DISC1}/boot/loader.conf
  	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC1}/boot/loader.conf
! .if ${TARGET} == "i386"
  	@echo 'userconfig_script_load="YES"' >> ${CD_DISC1}/boot/loader.conf
  	@echo 'intro' > ${CD_DISC1}/boot/kernel.conf
! .endif
  	@ln -f ${CD_DISC1}/boot/loader.conf ${CD_DISC2}/boot/loader.conf
  	@ln -f ${CD_DISC2}/kernel.GENERIC ${CD_DISC1}/kernel
! .endif
! .if ${TARGET} == "i386"
  	@mkdir -p ${CD_DISC2}/floppies
  	@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
! .endif
! .if !defined(NOPORTS)
  	@mkdir -p ${CD_DISC1}/ports && \
  	  tar --exclude CVS --exclude 'ports/distfiles/*' -czf \
  	  ${CD_DISC1}/ports/ports.tgz -C /usr ports && \
  	  cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \
  	  && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5)
! .endif
  	touch cdrom.1
  
  iso.1:
--- 896,919 ----
  	@echo 'mfsroot_load="YES"' > ${CD_DISC1}/boot/loader.conf
  	@echo 'mfsroot_type="mfs_root"' >> ${CD_DISC1}/boot/loader.conf
  	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC1}/boot/loader.conf
! .if ${TARGET} == "i386"		#{
  	@echo 'userconfig_script_load="YES"' >> ${CD_DISC1}/boot/loader.conf
  	@echo 'intro' > ${CD_DISC1}/boot/kernel.conf
! .endif		#}
  	@ln -f ${CD_DISC1}/boot/loader.conf ${CD_DISC2}/boot/loader.conf
  	@ln -f ${CD_DISC2}/kernel.GENERIC ${CD_DISC1}/kernel
! .endif		#}
! .if ${TARGET} == "i386"		#{
  	@mkdir -p ${CD_DISC2}/floppies
  	@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
! .endif		#}
! .if !defined(NOPORTS)		#{
  	@mkdir -p ${CD_DISC1}/ports && \
  	  tar --exclude CVS --exclude 'ports/distfiles/*' -czf \
  	  ${CD_DISC1}/ports/ports.tgz -C /usr ports && \
  	  cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \
  	  && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5)
! .endif		#}
  	touch cdrom.1
  
  iso.1:
***************
*** 959,973 ****
  # TD=
  # ARG=
  doTARBALL:
! .if !defined(SD)
  	@echo "SD undefined in doTARBALL" && exit 1
! .endif
! .if !defined(TD)
  	@echo "TD undefined in doTARBALL" && exit 1
! .endif
! .if !defined(ARG)
  	@echo "ARG undefined in doTARBALL" && exit 1
! .endif
  	@rm -rf ${RD}/dists/${TD}/${TN}*
  	@mkdir -p ${RD}/dists/${TD}
  	@( cd ${SD} && \
--- 961,975 ----
  # TD=
  # ARG=
  doTARBALL:
! .if !defined(SD)		#{
  	@echo "SD undefined in doTARBALL" && exit 1
! .endif		#}
! .if !defined(TD)		#{
  	@echo "TD undefined in doTARBALL" && exit 1
! .endif		#}
! .if !defined(ARG)		#{
  	@echo "ARG undefined in doTARBALL" && exit 1
! .endif		#}
  	@rm -rf ${RD}/dists/${TD}/${TN}*
  	@mkdir -p ${RD}/dists/${TD}
  	@( cd ${SD} && \
***************
*** 1014,1028 ****
  	${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c
  
  installCRUNCH:
! .if !defined(CRUNCH)
  	@echo "CRUNCH undefined in installCRUNCH" && exit 1
! .endif
! .if !defined(DIR)
  	@echo "DIR undefined in installCRUNCH" && exit 1
! .endif
! .if !defined(ZIP)
  	@echo "ZIP undefined in installCRUNCH" && exit 1
! .endif
  	@if ${ZIP} ; then \
  		gzip -9 < ${RD}/crunch/${CRUNCH} > ${DIR}/${CRUNCH}_crunch ; \
  	else \
--- 1016,1030 ----
  	${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c
  
  installCRUNCH:
! .if !defined(CRUNCH)		#{
  	@echo "CRUNCH undefined in installCRUNCH" && exit 1
! .endif		#}
! .if !defined(DIR)		#{
  	@echo "DIR undefined in installCRUNCH" && exit 1
! .endif		#}
! .if !defined(ZIP)		#{
  	@echo "ZIP undefined in installCRUNCH" && exit 1
! .endif		#}
  	@if ${ZIP} ; then \
  		gzip -9 < ${RD}/crunch/${CRUNCH} > ${DIR}/${CRUNCH}_crunch ; \
  	else \
***************
*** 1047,1061 ****
  	@rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
  	@cd ${.CURDIR}/../sys/${TARGET}/conf && \
  	    sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS
! .if ${TARGET_ARCH} == "i386"
  	@echo "options  INTRO_USERCONFIG" >> \
  	  ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
! .endif
! .if exists(${.CURDIR}/${TARGET}/drivers.conf)
  	@awk -f ${.CURDIR}/scripts/driver-remove.awk \
  		${.CURDIR}/${TARGET}/drivers.conf \
  		${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
! .endif
  	cd ${.CURDIR}/..; \
  	INSTKERNNAME=BOOTMFS \
  	    ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES -DNO_KERNELCLEAN \
--- 1049,1063 ----
  	@rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
  	@cd ${.CURDIR}/../sys/${TARGET}/conf && \
  	    sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS
! .if ${TARGET_ARCH} == "i386"		#{
  	@echo "options  INTRO_USERCONFIG" >> \
  	  ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
! .endif		#}
! .if exists(${.CURDIR}/${TARGET}/drivers.conf)		#{
  	@awk -f ${.CURDIR}/scripts/driver-remove.awk \
  		${.CURDIR}/${TARGET}/drivers.conf \
  		${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
! .endif		#}
  	cd ${.CURDIR}/..; \
  	INSTKERNNAME=BOOTMFS \
  	    ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES -DNO_KERNELCLEAN \
***************
*** 1070,1108 ****
  	mv ${RD}/kernels/BOOTMFS ${RD}/image.${FSIMAGE}/kernel
  	@echo "Setting up /boot directory for ${FSIMAGE} floppy"
  	@mkdir -p ${RD}/image.${FSIMAGE}/boot
! .if ${TARGET} == "i386"
  	@kgzip -vo ${RD}/image.${FSIMAGE}/boot/loader /boot/loader
! .else
  	@cp /boot/loader ${RD}/image.${FSIMAGE}/boot
! .endif
  	@echo "load /kernel" > ${RD}/image.${FSIMAGE}/boot/loader.rc
! .if !defined(FDSIZE) || ${FDSIZE} != "BIG"
  	@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
! .endif
  	@echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
! .if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
  	@echo "-P" >> ${RD}/image.${FSIMAGE}/boot.config
! .endif
  	@gzip -9v ${RD}/image.${FSIMAGE}/kernel
  	@rm -f ${RD}/floppies/${FSIMAGE}.flp
! .if defined(FDSIZE) && ${FDSIZE} == "BIG"
  	@cp mfsroot.gz ${RD}/image.${FSIMAGE}
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${BIGBOOTLABEL}
! .elif defined(FDSIZE) && ${FDSIZE} == "SMALL"
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${SMALLBOOTLABEL}
! .else
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${BOOTLABEL}
! .endif
  	@echo "Created ${RD}/floppies/${FSIMAGE}.flp"
  
  .include <bsd.prog.mk>
--- 1072,1110 ----
  	mv ${RD}/kernels/BOOTMFS ${RD}/image.${FSIMAGE}/kernel
  	@echo "Setting up /boot directory for ${FSIMAGE} floppy"
  	@mkdir -p ${RD}/image.${FSIMAGE}/boot
! .if ${TARGET} == "i386"		#{
  	@kgzip -vo ${RD}/image.${FSIMAGE}/boot/loader /boot/loader
! .else		#}{
  	@cp /boot/loader ${RD}/image.${FSIMAGE}/boot
! .endif		#}
  	@echo "load /kernel" > ${RD}/image.${FSIMAGE}/boot/loader.rc
! .if !defined(FDSIZE) || ${FDSIZE} != "BIG"		#{
  	@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
! .endif		#}
  	@echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
  	@echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
! .if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}		#{
  	@echo "-P" >> ${RD}/image.${FSIMAGE}/boot.config
! .endif		#}
  	@gzip -9v ${RD}/image.${FSIMAGE}/kernel
  	@rm -f ${RD}/floppies/${FSIMAGE}.flp
! .if defined(FDSIZE) && ${FDSIZE} == "BIG"		#{
  	@cp mfsroot.gz ${RD}/image.${FSIMAGE}
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${BIGBOOTLABEL}
! .elif defined(FDSIZE) && ${FDSIZE} == "SMALL"
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${SMALLBOOTLABEL}
! .else		#}{
  	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
  		${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
  		${BOOTINODE} ${BOOTLABEL}
! .endif		#}
  	@echo "Created ${RD}/floppies/${FSIMAGE}.flp"
  
  .include <bsd.prog.mk>