Error while compiling ROOT 6.14/04 on macOS 10.14 (Mojave)

It seems 6.14.06 is out but it still has the build issue with freetype, when /usr/include headers are missing. Did the fixes for this in master not get ported to this branch after all ?