Sync our 10.x ports with the FreeBSD tree, remove some ones which are fixed for 10 upstream