Revert r224760, and enhance the sed patterns from r224659 to comment out

the _compat entries in the WITHOUT_NIS case rather then delete them.

Approved by:	re (kib)

etc/Makefile

@@ -256,6 +256,10 @@ distribution:
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
+.if ${MK_NIS} == "no"
+	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+		${DESTDIR}/etc/nsswitch.conf
+.endif
 
 distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/

etc/nsswitch.conf

@@ -1,23 +1,15 @@
 #
+# nsswitch.conf(5) - name service switch configuration file
 # $FreeBSD$
 #
-# To enable NIS the commented entries should replace their uncommented
-# equivalents.  See nsswitch.conf(5) for more information.
-#
-group: files
-#group_compat: nis
-#group: compat
-
-passwd: files
-#passwd_compat: nis
-#passwd: compat
-
-services: files
-#services_compat: nis
-#services: compat
-
+group: compat
+group_compat: nis
 hosts: files dns
 networks: files
+passwd: compat
+passwd_compat: nis
 shells: files
+services: compat
+services_compat: nis
 protocols: files
 rpc: files