mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Emacs: Add new wayland flavor

Browse Source 
Emacs requires mutually exclusive build parameters depending on whether
the user is running under X11 or Wayland.  Rather than require either
set of users to build a custom package, create a new wayland flavor, and
use default options appropriate for users running under X.

PR:		278167
Reviewed by:	ashish, jbeich
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D44917
This commit is contained in:
Joseph Mingrone 2024-04-23 14:11:39 -03:00
parent b3b6a06455
commit 604adf973a
No known key found for this signature in database
GPG Key ID: 36A40C83B0D6EF9E
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/Uses/emacs.mk
View File

@ -79,7 +79,7 @@ _EMACS_RUN_DEP= yes
# Only set FLAVORS when...
. if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS)
FLAVORS= full canna nox devel_full devel_nox
FLAVORS= full canna nox wayland devel_full devel_nox
# Sort the default to be first
. if defined(EMACS_DEFAULT)
FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}}

31
editors/emacs/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= emacs
DISTVERSION= 29.3
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= editors
MASTER_SITES= GNU
@ -15,20 +15,23 @@ COMMENT= GNU editing macros ${COMMENT_${FLAVOR}}
WWW= https://www.gnu.org/software/emacs/
COMMENT_nox= (No X flavor)
COMMENT_canna= (Canna Japanese input flavor)
COMMENT_wayland= (Wayland flavor)
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgmp.so:math/gmp
FLAVORS= full canna nox
FLAVORS= full canna nox wayland
canna_PKGNAMESUFFIX= -canna
canna_LIB_DEPENDS= libcanna.so:japanese/canna-lib
canna_CONFLICTS_INSTALL= emacs emacs-nox
canna_CONFLICTS_INSTALL= emacs emacs-nox emacs-wayland
canna_DESCR= ${.CURDIR}/pkg-descr-canna
full_CONFLICTS_INSTALL= emacs-canna emacs-nox
full_CONFLICTS_INSTALL= emacs-canna emacs-nox emacs-wayland
nox_PKGNAMESUFFIX= -nox
nox_CONFLICTS_INSTALL= emacs emacs-canna
nox_CONFLICTS_INSTALL= emacs emacs-canna emacs-wayland
wayland_PKGNAMESUFFIX= -wayland
wayland_CONFLICTS_INSTALL= emacs emacs-canna emacs-nox
USES= cpe gmake localbase:ldflags ncurses pkgconfig tar:xz
CPE_VENDOR= gnu
@ -42,8 +45,7 @@ CONFIGURE_ARGS= --disable-build-details \
--without-selinux
.if ${FLAVOR:U} == canna
CONFIGURE_ARGS+= --with-canna
.endif
.if ${FLAVOR:U} == nox
.elif ${FLAVOR:U} == nox
CONFIGURE_ARGS+= --with-sound=no \
--with-x-toolkit=no \
--without-cairo \
@ -66,6 +68,8 @@ CONFIGURE_ARGS+= --with-sound=no \
--without-xim \
--without-xpm \
--without-xwidgets
.elif ${FLAVOR:U} == wayland
CONFIGURE_ARGS+= --without-x
.else
CONFIGURE_ARGS+= --with-x
.endif
@ -102,16 +106,21 @@ OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
XFT XIM XML XWIDGETS
OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \
MODULES OSS SCROLLBARS SOURCES SQLITE3 SVG \
THREADS TIFF TREESITTER WEBP XML
MODULES OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \
THREADS TIFF TREESITTER WEBP XIM 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
.if ${FLAVOR:U} == nox
OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
.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