Sync with MacPorts version