Sync with pkgsrc proper to prepare another update.