git: 08fca81af1ea - 2026Q3 - editors/emacs: Update to new major release, 31.1

The branch 2026Q3 has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=08fca81af1eac42587bb5a54d52f03fb936d5b9f

commit 08fca81af1eac42587bb5a54d52f03fb936d5b9f
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2026-08-24 14:22:59 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2026-09-16 18:10:02 +0000

    editors/emacs: Update to new major release, 31.1
    
    Announcement:   https://lists.gnu.org/archive/html/info-gnu-emacs/2026-08/msg00004.html
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit f33b08e8fc362a7d256d6a50238811ad8a7f925a)
---
 Mk/Uses/emacs.mk       |  6 +++---
 editors/emacs/Makefile |  6 +++---
 editors/emacs/distinfo | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index 3f1602587521..97ecf27f7700 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -23,8 +23,8 @@
 #                             editors/emacs.
 #
 # Variables, which can be read by ports:
-# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-30.2)
-# EMACS_MAJOR_VER:            Emacs major version (e.g. 30)
+# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-31.1)
+# EMACS_MAJOR_VER:            Emacs major version (e.g. 31)
 # EMACS_LIBDIR:               Emacs Library directory without ${PREFIX} (e.g. share/emacs)
 # EMACS_SITE_LISPDIR:         Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
 #
@@ -64,7 +64,7 @@ _EMACS_VER=		32.0.50
 _EMACS_PORTDIR=		editors/emacs-devel
 _EMACS_FLAVOR=		${EMACS_DEFAULT:C/devel_//}
 .    else
-_EMACS_VER=		31.0.91
+_EMACS_VER=		31.1
 _EMACS_PORTDIR=		editors/emacs
 _EMACS_FLAVOR=		${EMACS_DEFAULT:Unox}
 .    endif
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 24f6a6cb9527..ad2ffdaebfbd 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	emacs
-DISTVERSION=	31.0.91
+DISTVERSION=	31.1
 PORTEPOCH=	3
 CATEGORIES=	editors
-MASTER_SITES=	GNU_ALPHA/emacs/pretest
+MASTER_SITES=	GNU
 
 .if ${FLAVOR:U} == canna
 PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs31canna/:canna
-PATCHFILES+=	emacs31.0.91canna-20260808.diff.gz:-p1:canna
+PATCHFILES+=	emacs31.1canna-20260824.diff.gz:-p1:canna
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index cd0b3c786b58..686db80dd4e7 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1786147712
-SHA256 (emacs-31.0.91.tar.xz) = 21cff7e087e8b4f2ff9e013e359215814c322948cee71154f94864a1b0fa40a1
-SIZE (emacs-31.0.91.tar.xz) = 57959264
-SHA256 (emacs31.0.91canna-20260808.diff.gz) = f889055802b7cf4a452e023bc9fada49396e157d3d240123fe7d91fa849de120
-SIZE (emacs31.0.91canna-20260808.diff.gz) = 30410
+TIMESTAMP = 1787624629
+SHA256 (emacs-31.1.tar.xz) = 1da5790d9580c81932b5bf700633114468da7b3412d69faa767daebf974f4586
+SIZE (emacs-31.1.tar.xz) = 57977476
+SHA256 (emacs31.1canna-20260824.diff.gz) = 87db60976b62f7c55f41d39ac801c500843f6866664ba5c0c11c12e31587b626
+SIZE (emacs31.1canna-20260824.diff.gz) = 30370