port the rest of make.conf for 9.1