Track upstream CVS, now containing my pkgsrcCon work.
Catch up to cvs HEAD.