Replace csup by portsnap in a couple of places