git: 756bcc2cf8c7 - 2026Q3 - Emacs ports: Align Makefiles

The branch 2026Q3 has been updated by ashish:

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

commit 756bcc2cf8c78885a3e59a0ddeb071f723e16f5c
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2026-08-08 05:05:57 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2026-09-16 18:10:01 +0000

    Emacs ports: Align Makefiles
    
    Lightly reorganize the options sections of editors/emacs and
    editors/emacs-devel, so the two can be more easily compared.  This is a
    no-op change.
    
    Reviewed by:    ashish
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D58719
    
    (cherry picked from commit edac99244ec45578b29725ee14c1e3ee70fe8b4a)
---
 editors/emacs-devel/Makefile | 19 +++++++++++--------
 editors/emacs/Makefile       | 34 +++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 73aee065b199..a7e2146caa6f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -84,26 +84,29 @@ OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \
 				MAILUTILS MODULES NATIVECOMP OTF PGTK \
 				SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \
 				XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
-				HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \
-				NATIVECOMP OSS PGTK PNG SCROLLBARS SOURCES \
-				SQLITE3 SVG THREADS TIFF TREESITTER WEBP XML
 OPTIONS_GROUP=			GRAPHICS
 OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
 OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
+OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
+				HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \
+				NATIVECOMP OSS PGTK PNG SCROLLBARS SOURCES \
+				SQLITE3 SVG THREADS TIFF TREESITTER WEBP XML
+
+OPTIONS_EXCLUDE_armv7=		NATIVECOMP
+OPTIONS_EXCLUDE_powerpc=	NATIVECOMP
+OPTIONS_EXCLUDE_powerpc64=	NATIVECOMP
+OPTIONS_EXCLUDE_powerpc64le=	NATIVECOMP
+
 .if ${FLAVOR:U} == nox
 OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
 				HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
 				PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
 				XIM XPM XWIDGETS
 .endif
-OPTIONS_EXCLUDE_armv7=		NATIVECOMP
-OPTIONS_EXCLUDE_powerpc=	NATIVECOMP
-OPTIONS_EXCLUDE_powerpc64=	NATIVECOMP
-OPTIONS_EXCLUDE_powerpc64le=	NATIVECOMP
+
 OPTIONS_SUB=			YES
 
 ACL_DESC=		Access control list support
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 144a2dba7ad0..24f6a6cb9527 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -90,7 +90,6 @@ INFO=		auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
 		rcirc reftex remember sasl sc semantic ses sieve smtpmail \
 		speedbar srecode todo-mode tramp transient url use-package \
 		vhdl-mode viper vtable widget wisent woman
-
 INFO_PATH=	${DATADIR_REL}/info
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
@@ -105,32 +104,37 @@ OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \
 				MAILUTILS MODULES NATIVECOMP OTF PGTK \
 				SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \
 				XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
-				HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \
-				OSS PNG SCROLLBARS SOURCES SQLITE3 SVG THREADS \
-				TIFF TREESITTER WEBP XIM XML XPM
-.if ${FLAVOR:U} != nox
-OPTIONS_DEFAULT+=		NATIVECOMP
-.endif
 OPTIONS_GROUP=			GRAPHICS
 OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
 OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
+
+OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
+				HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \
+				OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \
+				THREADS TIFF TREESITTER WEBP XIM XML XPM
+
+OPTIONS_EXCLUDE_armv7=		NATIVECOMP
+OPTIONS_EXCLUDE_powerpc64=	NATIVECOMP
+
+.if ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
+				HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
+				PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
+				XIM XPM XWIDGETS
+.else
+OPTIONS_DEFAULT+=		NATIVECOMP
+.endif
+
 .if ${FLAVOR:U} == wayland
 OPTIONS_EXCLUDE+=		GTK2 MOTIF XAW XAW3D XIM ${PGTK_PREVENTS} \
 				${PGTK_IMPLIES:@i@${${i}_PREVENTS}@}
 OPTIONS_SLAVE+=			PGTK ${PGTK_IMPLIES} \
 				${PGTK_IMPLIES:@i@${${i}_IMPLIES}@}
-.elif ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE+=		ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
-				HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
-				PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
-				XIM XPM XWIDGETS
 .endif
-OPTIONS_EXCLUDE_armv7=		NATIVECOMP
-OPTIONS_EXCLUDE_powerpc64=	NATIVECOMP
+
 OPTIONS_SUB=			YES
 
 ACL_DESC=		Access control list support