svn commit: r336607 - head

[Ian Lepore]

Author: ian
Date: Sun Jul 22 16:42:22 2018
New Revision: 336607
URL: https://svnweb.freebsd.org/changeset/base/336607

Log:
  Remove the .if ${MK_FOO} wrappers around the user/group ID checks.  These
  names are referenced in mtree files without any conditional logic, so the
  users/groups must exist even if the corresponding tool(s) are disabled.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Jul 22 16:17:45 2018	(r336606)
+++ head/Makefile.inc1	Sun Jul 22 16:42:22 2018	(r336607)
@@ -1175,22 +1175,14 @@ __installcheck_DESTDIR: .PHONY
 #
 CHECK_UIDS=	auditdistd
 CHECK_GIDS=	audit
-.if ${MK_SENDMAIL} != "no"
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp
-.endif
-.if ${MK_PF} != "no"
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
-.endif
-.if ${MK_UNBOUND} != "no"
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
-.endif
-.if ${MK_NTP} != "no"
 CHECK_UIDS+=	ntpd
 CHECK_GIDS+=	ntpd
-.endif
 _installcheck_world: __installcheck_UGID
 __installcheck_UGID: .PHONY
 .for uid in ${CHECK_UIDS}