9 files changed, 43 insertions, 43 deletions

diff --git a/release/Makefile b/release/Makefile
index 791404c0035e..aab01fec1ce0 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -122,7 +122,7 @@ 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.
+# BASE_DISTS are special in that they get full /etc installation sets.
 #
 .if ${MACHINE_ARCH} == "i386"
 COMPAT_DISTS?=	compat1x compat20 compat21 compat22 compat3x compat4x
@@ -131,8 +131,8 @@ COMPAT_DISTS?=	compat4x
 .endif
 OTHER_DISTS?=	manpages catpages games proflibs dict info doc
 CRYPTO_DISTS?=	crypto krb4 krb5
-BIN_DISTS?=	bin
-DISTRIBUTIONS?=	${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
+BASE_DISTS?=	base
+DISTRIBUTIONS?=	${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
 KERNELS?=	GENERIC
 
 BOOT1=	etc/defaults/rc.conf
@@ -436,7 +436,7 @@ release.1:
 
 # Install the system into the various distributions.
 release.2:
-	cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/bin
+	cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base
 	cd ${.CURDIR}/.. && make distribworld DISTDIR=${RD}/trees
 .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
 	cd ${.CURDIR}/../kerberosIV && ( \
@@ -463,12 +463,12 @@ release.3:
 	rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel}
 	cd ${.CURDIR} && ${MAKE} doSTDKERNEL KERNEL=${kernel} KODIR=/${kernel}
 	rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel}
-	-mkdir ${RD}/trees/bin/boot/${kernel}
-	cp -p ${RD}/kernels/${kernel}/kernel ${RD}/trees/bin/boot/${kernel}
+	-mkdir ${RD}/trees/base/boot/${kernel}
+	cp -p ${RD}/kernels/${kernel}/kernel ${RD}/trees/base/boot/${kernel}
 .endfor
 	# Install a standard boot kernel+modules
-	mkdir -p ${RD}/trees/bin/boot/kernel
-	cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/bin/boot/kernel
+	mkdir -p ${RD}/trees/base/boot/kernel
+	cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/base/boot/kernel
 	touch release.3
 
 # Make and install the three crunched binaries which live on the floppies.
@@ -603,7 +603,7 @@ release.8:
 		mkdir -p etc/defaults dev mnt stand/help
 	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
 		DIR=${RD}/mfsfd/stand ZIP=false
-	( cd ${RD}/trees/bin/dev && \
+	( cd ${RD}/trees/base/dev && \
 		ls console tty bpf0 ttyd0 ttyv0 ttyv1 ttyv2 ttyv3 null zero card0 card1 card2 card3 usb usb0 uhid0 ums0 ulpt0 ugen0 kbd0 kmem mem xpt0 | \
 	cpio -dump ${RD}/mfsfd/dev )
 	( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] )
@@ -616,10 +616,10 @@ release.8:
 	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
+	cd ${RD}/trees/base && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
 	( for F in netconfig protocols ; do \
 		sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
-		${RD}/trees/bin/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
+		${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
 	  done )
 	grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
 	    ${.CURDIR}/../etc/services | \
@@ -694,11 +694,11 @@ release.9:
 	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=fixit \
 		DIR=${RD}/fixitfd/stand ZIP=false
 	@( cd ${RD}/fixitfd/dev && \
-		cp ${RD}/trees/bin/dev/MAKEDEV MAKEDEV && \
+		cp ${RD}/trees/base/dev/MAKEDEV MAKEDEV && \
 		chmod 755 MAKEDEV)
-	@cp ${RD}/trees/bin/etc/spwd.db ${RD}/trees/bin/etc/group \
-		${RD}/trees/bin/etc/protocols ${RD}/fixitfd/etc
-	@cp ${RD}/trees/bin/usr/share/misc/scsi_modes \
+	@cp ${RD}/trees/base/etc/spwd.db ${RD}/trees/base/etc/group \
+		${RD}/trees/base/etc/protocols ${RD}/fixitfd/etc
+	@cp ${RD}/trees/base/usr/share/misc/scsi_modes \
 		${RD}/fixitfd/usr/share/misc
 	@cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
 	@cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
@@ -825,7 +825,7 @@ doc.1:
 	@for i in ${DOCPORTS}; do \
 	  cd /usr/ports/$$i && make all install clean BATCH=yes JADETEX=no FORCE_PKG_REGISTER=yes; \
 	done
-	@cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/bin/usr/share/doc
+	@cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc
 	touch doc.1
 
 #
diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index 5d6fc4517fa3..c87a38bf86a9 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
 echo -n "you want to do this over your installed system (y/n)? "
 read ans 
 if [ "$ans" = "y" ]; then
-	cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
+	cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 fi
diff --git a/release/scripts/bin-install.sh b/release/scripts/bin-install.sh
index 5d6fc4517fa3..c87a38bf86a9 100755
--- a/release/scripts/bin-install.sh
+++ b/release/scripts/bin-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
 echo -n "you want to do this over your installed system (y/n)? "
 read ans 
 if [ "$ans" = "y" ]; then
-	cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
+	cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 fi
diff --git a/release/scripts/dict-make.sh b/release/scripts/dict-make.sh
index 355d6ffcb328..2e4d3220eb76 100755
--- a/release/scripts/dict-make.sh
+++ b/release/scripts/dict-make.sh
@@ -4,15 +4,15 @@
 #
 
 # Move the dict stuff out to its own dist
-if [ -d ${RD}/trees/bin/usr/share/dict ]; then
-	tar -cf - -C ${RD}/trees/bin/usr/share/dict . |
+if [ -d ${RD}/trees/base/usr/share/dict ]; then
+	tar -cf - -C ${RD}/trees/base/usr/share/dict . |
 		tar -xpf - -C ${RD}/trees/dict/usr/share/dict &&
-	rm -rf ${RD}/trees/bin/usr/share/dict;
+	rm -rf ${RD}/trees/base/usr/share/dict;
 fi
 
 for i in airport birthtoken flowers inter.phone na.phone zipcodes; do
-	if [ -f ${RD}/trees/bin/usr/share/misc/$i ]; then
-		mv ${RD}/trees/bin/usr/share/misc/$i \
+	if [ -f ${RD}/trees/base/usr/share/misc/$i ]; then
+		mv ${RD}/trees/base/usr/share/misc/$i \
 			${RD}/trees/dict/usr/share/misc;
 	fi;
 done
diff --git a/release/scripts/doc-make.sh b/release/scripts/doc-make.sh
index 2cb4029e6ec8..033554007abe 100755
--- a/release/scripts/doc-make.sh
+++ b/release/scripts/doc-make.sh
@@ -4,8 +4,8 @@
 #
 
 # Create the doc dist.
-if [ -d ${RD}/trees/bin/usr/share/doc ]; then
-	( cd ${RD}/trees/bin/usr/share/doc;
+if [ -d ${RD}/trees/base/usr/share/doc ]; then
+	( cd ${RD}/trees/base/usr/share/doc;
 	find . | cpio -dumpl ${RD}/trees/doc/usr/share/doc ) &&
-	rm -rf ${RD}/trees/bin/usr/share/doc
+	rm -rf ${RD}/trees/base/usr/share/doc
 fi
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index de839e28a36f..6e83d1474737 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -4,22 +4,22 @@
 #
 
 # Move all the games out to their own dist
-if [ -d ${RD}/trees/bin/usr/games ]; then
-	tar -cf - -C ${RD}/trees/bin/usr/games . |
+if [ -d ${RD}/trees/base/usr/games ]; then
+	tar -cf - -C ${RD}/trees/base/usr/games . |
 		tar -xpf - -C ${RD}/trees/games/usr/games &&
-	rm -rf ${RD}/trees/bin/usr/games;
+	rm -rf ${RD}/trees/base/usr/games;
 fi
 
-if [ -d ${RD}/trees/bin/usr/share/games ]; then
-	tar -cf - -C ${RD}/trees/bin/usr/share/games . |
+if [ -d ${RD}/trees/base/usr/share/games ]; then
+	tar -cf - -C ${RD}/trees/base/usr/share/games . |
 		tar -xpf - -C ${RD}/trees/games/usr/share/games &&
-	rm -rf ${RD}/trees/bin/usr/share/games;
+	rm -rf ${RD}/trees/base/usr/share/games;
 fi
 
-if [ -d ${RD}/trees/bin/var/games ]; then
-	tar -cf - -C ${RD}/trees/bin/var/games . |
+if [ -d ${RD}/trees/base/var/games ]; then
+	tar -cf - -C ${RD}/trees/base/var/games . |
 		tar -xpf - -C ${RD}/trees/games/var/games &&
-	rm -rf ${RD}/trees/bin/var/games;
+	rm -rf ${RD}/trees/base/var/games;
 fi
 
 if [ -d ${RD}/trees/manpages/usr/share/man/man6 ]; then
diff --git a/release/scripts/info-make.sh b/release/scripts/info-make.sh
index faa3d0c7efe6..12fd29d93873 100755
--- a/release/scripts/info-make.sh
+++ b/release/scripts/info-make.sh
@@ -4,8 +4,8 @@
 #
 
 # Move the info files out to their own dist
-if [ -d ${RD}/trees/bin/usr/share/info ]; then
-	tar -cf - -C ${RD}/trees/bin/usr/share/info . |
+if [ -d ${RD}/trees/base/usr/share/info ]; then
+	tar -cf - -C ${RD}/trees/base/usr/share/info . |
 		tar -xpf - -C ${RD}/trees/info/usr/share/info &&
-	rm -rf ${RD}/trees/bin/usr/share/info;
+	rm -rf ${RD}/trees/base/usr/share/info;
 fi
diff --git a/release/scripts/manpages-make.sh b/release/scripts/manpages-make.sh
index fae9dd3487b7..bb1326f3d506 100755
--- a/release/scripts/manpages-make.sh
+++ b/release/scripts/manpages-make.sh
@@ -3,10 +3,10 @@
 # $FreeBSD$
 #
 
-# Move all the manpages out to their own dist, using the bin dist as a
+# Move all the manpages out to their own dist, using the base dist as a
 # starting point.
-if [ -d ${RD}/trees/bin/usr/share/man ]; then
-	( cd ${RD}/trees/bin/usr/share/man;
+if [ -d ${RD}/trees/base/usr/share/man ]; then
+	( cd ${RD}/trees/base/usr/share/man;
 	find . | cpio -dumpl ${RD}/trees/manpages/usr/share/man > /dev/null 2>&1) &&
-	rm -rf ${RD}/trees/bin/usr/share/man;
+	rm -rf ${RD}/trees/base/usr/share/man;
 fi
diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh
index 0c5e699897e5..e03b8b2bb551 100755
--- a/release/scripts/proflibs-make.sh
+++ b/release/scripts/proflibs-make.sh
@@ -4,7 +4,7 @@
 #
 
 # Move the profiled libraries out to their own dist
-for i in ${RD}/trees/bin/usr/lib/*_p.a; do
+for i in ${RD}/trees/base/usr/lib/*_p.a; do
 	if [ -f $i ]; then
 		mv $i ${RD}/trees/proflibs/usr/lib;
 	fi;