freebsd-examples conflicts with freebsd-runtime

[Joe Maloney]

Hi, 
it looks like /usr/share/examples/etc/make.conf is being added to runtime.plist, and examples.plist.  This causes installing, or upgrading freebsd-examples on it's own to prompt the user to remove freebsd-runtime. 

[root at joe-laptop] /usr/obj# grep -R '/usr/share/examples/etc/make.conf' *
grep: usr/src/amd64.amd64/worldstage/sys: No such file or directory
usr/src/amd64.amd64/worldstage/runtime.plist:@(root,wheel,0444,) /usr/share/examples/etc/make.conf
usr/src/amd64.amd64/worldstage/METALOG:./usr/share/examples/etc/make.conf type=file uname=root gname=wheel mode=0444 size=10614 tags=package=examples
usr/src/amd64.amd64/worldstage/METALOG:./usr/share/examples/etc/make.conf type=file uname=root gname=wheel mode=0444 size=262 tags=package=runtime
usr/src/amd64.amd64/worldstage/usr/share/games/fortune/freebsd-tips:/usr/share/examples/etc/make.conf.
Binary file usr/src/amd64.amd64/worldstage/usr/share/man/mandoc.db matches
grep: usr/src/amd64.amd64/worldstage/usr/tests/local: No such file or directory
grep: warning: usr/src/amd64.amd64/worldstage/usr/tests/sys/pjdfstest/tests: recursive directory loop
usr/src/amd64.amd64/worldstage/examples.plist:@(root,wheel,0444,) /usr/share/examples/etc/make.conf 


I suspect this could be the commit which triggered this behaviour: 

https://github.com/freebsd/freebsd/commit/9d25b3f0046282ba17451e21d1a02b0f7fed2627

-- 
Joe Maloney
QA Supervisor / iXsystems
Enterprise Storage & Servers Driven By Open Source