Pkgsrc changes: o Merge in the zone names from CPAN ticket 16360. Old entries are preserved. Zone names are ambigious... Fixes PR#35250.