Log Message: Match the template builtin.mk file in bsd.builtin.mk, and make the two packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links) use the new format correctly.