Random thought about one tiny thing I love about #FreeBSD: #etcupdate! (IIRC freebsd-update incorporates something similar, but I always update from source...)

It does a 3-way compare of /etc (local, old upstream and new upstream) and automatically updates/merges configs, or, as a last resort, marks conflicts.

Unfortunately this won't help with /usr/local/etc (configs for #ports), but it's a start to have it for base and already a big plus over any #Linux #distribution I've seen so far.

https://man.freebsd.org/cgi/man.cgi?etcupdate(8)