Emacs ports: Remove obsolete variable definitions
editors/emacs: The CANNA option was replaced by a flavor, so remove
CANNA_DESC.
editors/emacs and editors/emacs-devel: The X11 option was replaced by the
nox flavor, so remove WITHOUT_X11.
Reported by: ashish