editors/emacs-devel: Update to 2024-07-04 snapshot, fa6f088a48

Upstream bumped Emacs's major version from 30 to 31, so a PORTREVISION
bump of most consumers will be necessary.

Sponsored by:	The FreeBSD Foundation

4 files changed, 23 insertions, 10 deletions

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index e5bbb4a53fea..335f5a1c5dc7 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -105,7 +105,7 @@ EMACS_FLAVOR=	full
 .  endif
 
 .  if ${FLAVOR:Mdevel*}
-EMACS_VER=		30.0.50
+EMACS_VER=		31.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .  else
 EMACS_VER=		29.4
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 1476a8671fbd..e49da8fb2f0f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	emacs
-DISTVERSION=	30.0.50.20240615
-PORTREVISION=	2
+DISTVERSION=	31.0.50.20240704
 PORTEPOCH=	3
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -10,9 +9,6 @@ COMMENT=	GNU editing macros ${COMMENT_${FLAVOR}}
 WWW=		https://www.gnu.org/software/emacs/
 COMMENT_nox=	(No X flavor)
 
-PATCH_SITES+=  https://github.com/emacs-mirror/emacs/commit/
-PATCHFILES+=   c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch:-p1
-
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
@@ -28,7 +24,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	25452986cb
+GH_TAGNAME=	fa6f088a48
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index aca5505d77b6..38de8d1577c2 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719196469
-SHA256 (emacs-mirror-emacs-30.0.50.20240615-25452986cb_GH0.tar.gz) = 6229fb101852367adc18120386c8b0508c6ec620dcb714421b175d012c58e30d
-SIZE (emacs-mirror-emacs-30.0.50.20240615-25452986cb_GH0.tar.gz) = 50514262
+TIMESTAMP = 1720110684
+SHA256 (emacs-mirror-emacs-31.0.50.20240704-fa6f088a48_GH0.tar.gz) = 90265add1a3c87a97d1dff9c68379f823e87d594ac307af73054ecf783c6b357
+SIZE (emacs-mirror-emacs-31.0.50.20240704-fa6f088a48_GH0.tar.gz) = 50597231
 SHA256 (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = fa7978109a164a894479c2827b297228566bfdf46d1a3def00975a35595ba0bf
 SIZE (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = 2873
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index bdab7f988906..c3986563ccbb 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -42,6 +42,7 @@ share/applications/emacsclient.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.27
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.28
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.29
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.30
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.unknown
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
@@ -183,6 +184,7 @@ share/applications/emacsclient.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/charsets/stdenc.map
 %%DATADIR%%/%%EMACS_VER%%/etc/charsets/symbol.map
 %%DATADIR%%/%%EMACS_VER%%/etc/compilation.txt
+%%DATADIR%%/%%EMACS_VER%%/etc/copyright-assign.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/e/README
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
@@ -1570,6 +1572,18 @@ share/applications/emacsclient.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz
@@ -4243,6 +4257,8 @@ share/applications/emacsclient.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.elc
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
@@ -4388,6 +4404,7 @@ share/applications/emacsclient.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-28.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-29.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-30.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-31.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h