MFH

Sponsored by:	The FreeBSD Foundation

6 files changed, 27 insertions, 4 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 3de8f97..d7e30c5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -5,6 +5,8 @@
 
 FILESGROUPS=	FILES
 
+# No need as it is empty and just causes rebuilds since this file does so much.
+UPDATE_DEPENDFILE=	no
 SUBDIR=	\
 	newsyslog.conf.d
 
@@ -461,11 +463,14 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	done
 .endif
 
-etc-examples:
+etc-examples-install: ${META_DEPS}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
-	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
+
+etc-examples: etc-examples-install
+	${_+_}cd ${.CURDIR}/defaults; \
+	    ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
 	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
 
 .include <bsd.prog.mk>
diff --git a/etc/autofs/special_media b/etc/autofs/special_media
index 2a654b1..32f9478 100755
--- a/etc/autofs/special_media
+++ b/etc/autofs/special_media
@@ -19,6 +19,9 @@ print_available() {
 		_fstype="${_fstype_and_label%% *}"
 		if [ "${_fstype}" != "${_fstype_and_label}" ]; then
 			_label="${_fstype_and_label#* }"
+			# Replace plus signs and slashes with minuses;
+			# leading plus signs have special meaning in maps,
+			_label="$(echo ${_label} | sed 's,[+/],-,g')"
 			echo "${_label}"
 			continue
 		fi
@@ -54,6 +57,10 @@ print_one() {
 		fi
 
 		_label="${_fstype_and_label#* }"
+		# Replace plus signs and slashes with minuses;
+		# leading plus signs have special meaning in maps,
+		# and multi-component keys are just not supported.
+		_label="$(echo ${_label} | sed 's,[+/],-,g')"
 		if [ "${_label}" != "${_key}" ]; then
 			# Labels don't match, try another device.
 			continue
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index 1f6ac5e..4b3a4ce 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -3,7 +3,6 @@
 .include <src.opts.mk>
 
 FILES=	devfs.rules periodic.conf rc.conf
-NO_OBJ=
 FILESDIR= /etc/defaults
 
 .if ${MK_BLUETOOTH} != "no"
diff --git a/etc/defaults/Makefile.depend b/etc/defaults/Makefile.depend
new file mode 100644
index 0000000..f80275d
--- /dev/null
+++ b/etc/defaults/Makefile.depend
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/etc/login.conf b/etc/login.conf
index 2cc6730..e352f7f 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -43,6 +43,7 @@ default:\
 	:swapuse=unlimited:\
 	:pseudoterminals=unlimited:\
 	:kqueues=unlimited:\
+	:umtxp=unlimited:\
 	:priority=0:\
 	:ignoretime@:\
 	:umask=022:
diff --git a/etc/rc.d/netwait b/etc/rc.d/netwait
index 6ccca04..e9c23ca 100755
--- a/etc/rc.d/netwait
+++ b/etc/rc.d/netwait
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: netwait
-# REQUIRE: devd routing
+# REQUIRE: devd ipfilter ipfw pf routing
 # KEYWORD: nojail
 #
 # The netwait script helps handle two situations: