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

[Kyle Evans]

On Sun, Apr 19, 2020 at 3:05 PM Cy Schubert <Cy.Schubert at cschubert.com> wrote:
>
> In message <CACNAnaHs2pUPNeZmMUT-MvM6-d5Z3NXp5SEkW5KEKu5G7nmpfA at mail.gmail.c
> om>
> , Kyle Evans writes:
> > On Sun, Apr 19, 2020 at 12:01 PM Cy Schubert <cy at freebsd.org> wrote:
> > >
> > > Author: cy
> > > Date: Sun Apr 19 17:01:21 2020
> > > New Revision: 360102
> > > URL: https://svnweb.freebsd.org/changeset/base/360102
> > >
> > > Log:
> > >   Conditionally install Kerberos rc files based on MK_KERBEROS_SCRIPTS
> > >   instead of MK_KERBEROS. The reason for this change is some users
> > >   prefer to build FreeBSD WITHOUT_KERBEROS, wanting to retain the
> > >   Kerberos rc scripts to start/stop MIT Kerberos or Heimdal from ports.
> > >
> > >   PR:           197337
> > >   Reported by:  Adam McDougall <ebay at looksharp.net>
> > >   Reviewed by:  imp
> > >   Differential Revision:        https://reviews.freebsd.org/D24252
> > >
> > > [... snip ...]
> > > Modified: head/share/mk/src.opts.mk
> > > ===========================================================================
> > ===
> > > --- head/share/mk/src.opts.mk   Sun Apr 19 17:01:17 2020        (r360101)
> > > +++ head/share/mk/src.opts.mk   Sun Apr 19 17:01:21 2020        (r360102)
> > > @@ -237,6 +237,7 @@ __DEFAULT_DEPENDENT_OPTIONS= \
> > >      INET \
> > >      INET6 \
> > >      KERBEROS \
> > > +    KERBEROS_SCRIPTS \
> > >      KVM \
> > >      NETGRAPH \
> > >      PAM \
> > >
> >
> > This hunk seems to be wrong, looking at more context. It's setting up
> > a MK_KERBEROS_SCRIPTS_SUPPORT option... I'm  kinda guessing what you
> > intended is what the other commentary on this has been about --
> > defaulting KERBEROS_SCRIPTS to ON unless KERBEROS is OFF. Just moving
> > it up to the __DEFAULT_DEPENDENT_OPTIONS block doesn't seem to do the
> > trick, though, I guess kerberos is weird.
>
> The point is to leave KERBEROS_SCRIPTS on while disabling KERBEROS to allow
> those who choose not to install Heimdal in base to use one of the ports
> instead.
>
> The other option might be to revert this and install conflicting scripts in
> ports, which I'm not enamoured with. This would be the source of additional
> PRs from people who attempt to enable one while not disabling the other. I
> have no tolerance for those types of PRs, as my coworkers at $JOB can
> attest to.
>

The keyword is default; to default it to off if KERBEROS is off, which
assumes the absence of any user-specified WITH_/WITHOUT_
KERBEROS_SCRIPTS. As soon as the user specifies one way or the other,
the relationship is broken.