Track upstream CVS, now containing my pkgsrcCon work.