Sync with FreeBSD ports version Aug 2