Sync Citrus iconv support with NetBSD.