Sync to pkgsrc proper for furthur update.