svn commit: r360106 - in head: libexec/rc/rc.d share/mk tools/build/mk

[Cy Schubert]

Author: cy
Date: Sun Apr 19 21:38:03 2020
New Revision: 360106
URL: https://svnweb.freebsd.org/changeset/base/360106

Log:
  Due to popular demand, revert r360102.
  
  Reported by:	many

Modified:
  head/libexec/rc/rc.d/Makefile
  head/share/mk/bsd.opts.mk
  head/share/mk/src.opts.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile	Sun Apr 19 17:53:44 2020	(r360105)
+++ head/libexec/rc/rc.d/Makefile	Sun Apr 19 21:38:03 2020	(r360106)
@@ -242,17 +242,14 @@ CONFS+=		lpd
 .if ${MK_KERBEROS} != "no"
 CONFS+=		ipropd_master
 CONFS+=		ipropd_slave
-
-DIRS+=	VAR_HEMIDAL
-VAR_HEMIDAL=	/var/heimdal
-VAR_HEMIDAL_MODE=	700
-.endif
-
-.if ${MK_KERBEROS_SCRIPTS} != "no"
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd
 _kpasswdd=	kpasswdd
+
+DIRS+=	VAR_HEMIDAL
+VAR_HEMIDAL=	/var/heimdal
+VAR_HEMIDAL_MODE=	700
 .endif
 
 .if ${MK_MAIL} != "no"

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Sun Apr 19 17:53:44 2020	(r360105)
+++ head/share/mk/bsd.opts.mk	Sun Apr 19 21:38:03 2020	(r360106)
@@ -55,7 +55,6 @@ __DEFAULT_YES_OPTIONS = \
     INCLUDES \
     INSTALLLIB \
     KERBEROS \
-    KERBEROS_SCRIPTS \
     MAKE_CHECK_USE_SANDBOX \
     MAN \
     MANCOMPRESS \

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sun Apr 19 17:53:44 2020	(r360105)
+++ head/share/mk/src.opts.mk	Sun Apr 19 21:38:03 2020	(r360106)
@@ -237,7 +237,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \
     INET \
     INET6 \
     KERBEROS \
-    KERBEROS_SCRIPTS \
     KVM \
     NETGRAPH \
     PAM \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 19 17:53:44 2020	(r360105)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 19 21:38:03 2020	(r360106)
@@ -3152,9 +3152,13 @@ OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
+OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
+OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
+OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
+OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
@@ -3874,13 +3878,6 @@ OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
-.endif
-
-.if ${MK_KERBEROS_SCRIPTS} == no
-OLD_FILES+=usr/libexec/kadmind
-OLD_FILES+=usr/libexec/kdc
-OLD_FILES+=usr/libexec/kfd
-OLD_FILES+=usr/libexec/kpasswdd
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} == no