GNU Emacs updates

editors/emacs:

• Update to 25.1[1]
• Update CANNA patchset[2]
• Cleanup CONFLICTS_INSTALL list[1]
• Add LLDB option for lldb support (provided by 3rd party) to GUD[1]
• Add various other options, and re-order options[1]
• Incorporate games stuff in pkg-plist[1]
• Remove outdated diffs[1]

editors/emacs-nox11:

• Update to 25.1[3]
• Cleanup CONFLICTS_INSTALL list[3]

editors/emacs-devel:

• Update to git revision 25dca60d

Mk/bsd.emacs.mk:

• Update version numbers[4]

PR: 212807 [1], 212808 [3], 212809 [4]
Submitted by: Joseph Mingrone <jrm@ftfl.ca> [1][3][4]

		TAKANO Yuji <takachan@running-dog.net> (private email) [2]