Upgrade portmap to 6.0 (#2317)