Import changes from FreeBSD ports tree