git: f32475f3a44f - main - Mk/Uses/emacs.mk: Do not use Emacs major version in package names

The branch main has been updated by jrm:

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

commit f32475f3a44fe79191e6063066459c82a7a43986
Author:     Yasuhiro KIMURA <yasu@utahime.org>
AuthorDate: 2021-10-21 15:05:29 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-11-15 15:06:15 +0000

    Mk/Uses/emacs.mk: Do not use Emacs major version in package names
    
    PR:             259259
    Differential Revision:  https://reviews.freebsd.org/D32613
---
 Mk/Uses/emacs.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index 31f9935351ec..6cc2a98dcc13 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -101,7 +101,7 @@ EMACS_FLAVOR=	full
 .endif
 
 .if ${FLAVOR:Mdevel*}
-EMACS_VER=			29.0.50
+EMACS_VER=		29.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
 EMACS_VER=		27.2
@@ -113,12 +113,14 @@ EMACS_LIBDIR=		share/emacs
 EMACS_LIBDIR_WITH_VER=	share/emacs/${EMACS_VER}
 EMACS_PORT_NAME=	emacs${EMACS_MAJOR_VER}
 
-.if ${FLAVOR:M*nox}
-EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}_nox
-.elif ${FLAVOR:Mcanna}
-EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}_canna
+.if ${EMACS_FLAVOR} == "devel_full"
+EMACS_PKGNAMESUFFIX=	-emacs_devel
+.elif ${EMACS_FLAVOR} == "devel_nox"
+EMACS_PKGNAMESUFFIX=	-emacs_devel_nox
+.elif ${EMACS_FLAVOR} == "full"
+EMACS_PKGNAMESUFFIX=
 .else
-EMACS_PKGNAMESUFFIX=		-${EMACS_PORT_NAME}
+EMACS_PKGNAMESUFFIX=	-emacs_${EMACS_FLAVOR}
 .endif
 
 EMACS_CMD=	${PREFIX}/bin/emacs-${EMACS_VER}