WITHOUT_NIS after bsd.opts.mk / src.opts.mk split

Hi,

After the bsd.opts.mk / src.opts.mk split
WITHOUT_NIS in src.conf doesn't work.

src.conf is included in src.opts.mk after bsd.own.mk
which includes bsd.opts.mk.

Should bsd.opts.mk options overrides now be set in
make.conf instead of src.conf?

Was on r265455, updated to r265715 and rebuilt with -DNO_CLEAN.

Thanks,
Guy