Files moved upstream from one tarball to another. This blocks portupgrade.
Add a CONFLICTS to at least report this early in the build instead of
at install time.

While here, pet portlint.

Reported by: se