[Bug 275745] Mk/bsd.local.mk: Propose renaming to bsd.local.mk.sample

From: <bugzilla-noreply_at_freebsd.org>
Date: Sat, 16 Dec 2023 13:27:12 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275745

--- Comment #4 from Jason W. Bacon <jwb@freebsd.org> ---
I misspoke in the original description: stashing must be done before every pull
to update the ports tree, which is actually the real problem.  Commits can work
around it without stashing, of course.

But in general, doing local modifications to any file that's part of FreeBSD
base or ports is likely to cause headaches with some future update.  Since
bsd.local.mk is essentially empty by default, renaming it to an inactive file
like Mk/bsd.local.mk.sample and directing users to copy it to the active
Mk/bsd.local.mk seems like a good solution.  bsd.local.mk.sample can receive
updates without risk of conflict, while local modifications to bsd.local.mk are
irrelevant to git, since it's not in the repo.

-- 
You are receiving this mail because:
You are on the CC list for the bug.