Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 274644)
+++ etc/Makefile	(working copy)
@@ -143,7 +143,10 @@
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
-MTREE=	BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+MTREE=	BSD.root.dist BSD.usr.dist BSD.var.dist
+.if ${MK_TOOLCHAIN} != "no"
+MTREE+=	BSD.include.dist
+.endif
 .if ${MK_TESTS} != "no"
 MTREE+=	BSD.tests.dist
 .endif
@@ -302,10 +305,12 @@
 .endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
+.if ${MK_POPULATE_VAR} != "no"
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
 	    ${DESTDIR}/var/crash
+.endif
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
 .if ${MK_BOOT} != "no"
@@ -323,9 +328,13 @@
 MTREE_CMD?=	mtree
 
 MTREES=		mtree/BSD.root.dist		/		\
-		mtree/BSD.var.dist		/var		\
-		mtree/BSD.usr.dist		/usr		\
-		mtree/BSD.include.dist		/usr/include
+		mtree/BSD.usr.dist		/usr
+.if ${MK_POPULATE_VAR} != "no"
+MTREES+=	mtree/BSD.var.dist		/var
+.endif
+.if ${MK_TOOLCHAIN} != "no"
+MTREES+=	mtree/BSD.include.dist		/usr/include
+.endif
 .if ${MK_DEBUG_FILES} != "no"
 MTREES+=	mtree/BSD.debug.dist		/usr/lib
 .endif
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk	(revision 274644)
+++ share/mk/src.opts.mk	(working copy)
@@ -125,6 +125,7 @@
     PF \
     PKGBOOTSTRAP \
     PMC \
+    POPULATE_VAR \
     PORTSNAP \
     PPP \
     QUOTAS \
Index: tools/build/options/WITHOUT_POPULATE_VAR
===================================================================
--- tools/build/options/WITHOUT_POPULATE_VAR	(revision 0)
+++ tools/build/options/WITHOUT_POPULATE_VAR	(working copy)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not populate /var (useful for read-only / or diskless setup).

Property changes on: tools/build/options/WITHOUT_POPULATE_VAR
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property