*: Fix merge resolution errors after chasing editors/emacs updates
None of these ports built after the merges to chase editors/emacs
because the distinfos were not updated. Revert the changes for these
ports and just bump PORTREVSION.
Reported by: jhale
Fixes: 082542e6 */*: Chase editors/emacs update
Fixes: bb5373b0 Chase editors/emacs update