Attachment #236618 for bug #266454

View | Details | Raw Unified | Return to bug 266454
Collapse All | Expand All




#                             This will prevent flavors.
#
# Variables, which can be read by ports:
# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-28.2)
# EMACS_FLAVOR:               Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
# EMACS_LIBDIR:               Emacs Library directory without ${PREFIX} (e.g. share/emacs)
# EMACS_LIBDIR_WITH_VER:      Library directory without ${PREFIX} including version (e.g. share/emacs/28.2)
# EMACS_MAJOR_VER:            Emacs major version (e.g. 28)
# EMACS_PKGNAMESUFFIX:        PKGNAMESUFFIX to distinguish Emacs flavors
# EMACS_SITE_LISPDIR:         Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
# EMACS_VER:                  Emacs version (e.g. 28.2)
# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.2/site-lisp)
#-------------------------------------------------------------------------------
#
# MAINTAINER:	emacs@FreeBSD.org

EMACS_VER=		29.0.50
EMACS_PORTDIR=		editors/emacs-devel
.  else
EMACS_VER=		28.2
EMACS_PORTDIR=		editors/emacs
.  endif


Lines 1-6 Link Here

(-)b/audio/emms/Makefile (-1 / +1 lines)
1	PORTNAME= emms	1	PORTNAME= emms
2	DISTVERSION= 5.0	2	DISTVERSION= 5.0
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= audio elisp	4	CATEGORIES= audio elisp
5	MASTER_SITES= GNU	5	MASTER_SITES= GNU
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-5 Link Here

(-)b/cad/dinotrace/Makefile (+1 lines)
1	PORTNAME= dinotrace	1	PORTNAME= dinotrace
2	PORTVERSION= 9.4f	2	PORTVERSION= 9.4f
		3	PORTREVISION= 1
3	CATEGORIES= cad	4	CATEGORIES= cad
4	MASTER_SITES= http://www.veripool.org/ftp/	5	MASTER_SITES= http://www.veripool.org/ftp/
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/cad/verilog-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= verilog-mode.el	1	PORTNAME= verilog-mode.el
2	PORTVERSION= 801	2	PORTVERSION= 801
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= cad elisp	4	CATEGORIES= cad elisp
5	MASTER_SITES= http://www.veripool.org/ftp/	5	MASTER_SITES= http://www.veripool.org/ftp/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/databases/bbdb/Makefile (-1 / +1 lines)
1	PORTNAME= bbdb	1	PORTNAME= bbdb
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.2.2a	3	DISTVERSION= 3.2.2a
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= databases elisp	5	CATEGORIES= databases elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-7 Link Here

(-)b/databases/closql/Makefile (-1 / +1 lines)
1	PORTNAME= closql	1	PORTNAME= closql
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.2.1	3	DISTVERSION= 1.2.1
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= databases elisp	5	CATEGORIES= databases elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/databases/emacsql/Makefile (-1 / +1 lines)
1	PORTNAME= emacsql	1	PORTNAME= emacsql
2	DISTVERSION= 3.0.0-17	2	DISTVERSION= 3.0.0-17
3	PORTREVISION= 1	3	PORTREVISION= 2
4	DISTVERSIONSUFFIX= -g3747260	4	DISTVERSIONSUFFIX= -g3747260
5	CATEGORIES= databases elisp	5	CATEGORIES= databases elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/databases/gnats4/Makefile (-1 / +1 lines)
1	PORTNAME= gnats	1	PORTNAME= gnats
2	PORTVERSION= 4.1.0	2	PORTVERSION= 4.1.0
3	PORTREVISION= 15	3	PORTREVISION= 16
4	CATEGORIES= databases devel	4	CATEGORIES= databases devel
5	MASTER_SITES= GNU	5	MASTER_SITES= GNU
6	PKGNAMESUFFIX= 4	6	PKGNAMESUFFIX= 4

Lines 1-6 Link Here

(-)b/databases/pg.el/Makefile (-1 / +1 lines)
1	PORTNAME= pg.el	1	PORTNAME= pg.el
2	DISTVERSION= 0.13	2	DISTVERSION= 0.13
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= databases elisp	4	CATEGORIES= databases elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/deskutils/howm/Makefile (-1 / +1 lines)
1	PORTNAME= howm	1	PORTNAME= howm
2	PORTVERSION= 1.4.8	2	PORTVERSION= 1.4.8
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= deskutils	4	CATEGORIES= deskutils
5	MASTER_SITES= http://howm.sourceforge.jp/a/	5	MASTER_SITES= http://howm.sourceforge.jp/a/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/devel/cask/Makefile (-1 / +1 lines)
1	PORTNAME= cask	1	PORTNAME= cask
2	PORTVERSION= 0.8.3	2	PORTVERSION= 0.8.3
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 7	4	PORTREVISION= 8
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-5 Link Here

(-)b/devel/clojure-cider/Makefile (+1 lines)
1	PORTNAME= clojure-cider	1	PORTNAME= clojure-cider
2	PORTVERSION= 1.5.0	2	PORTVERSION= 1.5.0
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
4	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/devel/dash.el/Makefile (-1 / +1 lines)
1	PORTNAME= dash.el	1	PORTNAME= dash.el
2	DISTVERSION= 2.19.1	2	DISTVERSION= 2.19.1
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/devel/distel/Makefile (-1 / +1 lines)
1	PORTNAME= distel	1	PORTNAME= distel
2	PORTVERSION= 4.1.1	2	PORTVERSION= 4.1.1
3	PORTREVISION= 9	3	PORTREVISION= 10
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/devel/epl.el/Makefile (-1 / +1 lines)
1	PORTNAME= epl.el	1	PORTNAME= epl.el
2	PORTVERSION= 0.8	2	PORTVERSION= 0.8
3	PORTREVISION= 9	3	PORTREVISION= 10
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/devel/forge-devel/Makefile (+1 lines)
1	PORTNAME= forge	1	PORTNAME= forge
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.1-69	3	DISTVERSION= 0.3.1-69
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -g6a820a4	5	DISTVERSIONSUFFIX= -g6a820a4
5	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/devel/forge/Makefile (-1 / +1 lines)
1	PORTNAME= forge	1	PORTNAME= forge
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.1	3	DISTVERSION= 0.3.1
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-5 Link Here

(-)b/devel/gettext-po-mode/Makefile (-1 / +1 lines)
1	PORTNAME= gettext-po-mode	1	PORTNAME= gettext-po-mode
2	PORTREVISION= 1	2	PORTREVISION= 2
3		3
4	MAINTAINER= mandree@FreeBSD.org	4	MAINTAINER= mandree@FreeBSD.org
5	COMMENT= GNU gettext po-mode for emacs	5	COMMENT= GNU gettext po-mode for emacs

Lines 1-6 Link Here

(-)b/devel/ghub-devel/Makefile (+1 lines)
1	PORTNAME= ghub	1	PORTNAME= ghub
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.5.6-36	3	DISTVERSION= 3.5.6-36
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -g4e5bb75	5	DISTVERSIONSUFFIX= -g4e5bb75
5	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/devel/ghub/Makefile (-1 / +1 lines)
1	PORTNAME= ghub	1	PORTNAME= ghub
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.5.6	3	DISTVERSION= 3.5.6
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/devel/git-modes/Makefile (-1 / +1 lines)
1	PORTNAME= git-modes	1	PORTNAME= git-modes
2	DISTVERSION= 1.4.0	2	DISTVERSION= 1.4.0
3	PORTREVISION= 2	3	PORTREVISION= 3
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/devel/libegit2/Makefile (-1 / +1 lines)
1	PORTNAME= libegit2	1	PORTNAME= libegit2
2	DISTVERSION= g20200515	2	DISTVERSION= g20200515
3	PORTREVISION= 7	3	PORTREVISION= 8
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-5 Link Here

(-)b/devel/lua-mode/Makefile (+1 lines)
1	PORTNAME= lua-mode	1	PORTNAME= lua-mode
2	PORTVERSION= 20210802	2	PORTVERSION= 20210802
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX=v	4	DISTVERSIONPREFIX=v
4	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/devel/magit-devel/Makefile (+1 lines)
1	PORTNAME= magit	1	PORTNAME= magit
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.3.0-430	3	DISTVERSION= 3.3.0-430
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -gc1def981	5	DISTVERSIONSUFFIX= -gc1def981
5	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/devel/magit/Makefile (-1 / +1 lines)
1	PORTNAME= magit	1	PORTNAME= magit
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.3.0	3	DISTVERSION= 3.3.0
4	PORTREVISION= 3	4	PORTREVISION= 4
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/devel/p5-Sepia/Makefile (-1 / +1 lines)
1	PORTNAME= Sepia	1	PORTNAME= Sepia
2	PORTVERSION= 0.992	2	PORTVERSION= 0.992
3	PORTREVISION= 19	3	PORTREVISION= 20
4	CATEGORIES= devel perl5	4	CATEGORIES= devel perl5
5	MASTER_SITES= CPAN	5	MASTER_SITES= CPAN
6	PKGNAMEPREFIX= p5-	6	PKGNAMEPREFIX= p5-

Lines 1-6 Link Here

(-)b/devel/pkg-info.el/Makefile (-1 / +1 lines)
1	PORTNAME= pkg-info.el	1	PORTNAME= pkg-info.el
2	PORTVERSION= 0.6	2	PORTVERSION= 0.6
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/devel/psvn/Makefile (-1 / +1 lines)
1	PORTNAME= psvn	1	PORTNAME= psvn
2	PORTVERSION= 20150720.214200	2	PORTVERSION= 20150720.214200
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	MASTER_SITES= http://www.xsteve.at/prg/emacs/	5	MASTER_SITES= http://www.xsteve.at/prg/emacs/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/devel/tablist/Makefile (+1 lines)
1	PORTNAME= tablist	1	PORTNAME= tablist
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.0-13	3	DISTVERSION= 1.0-13
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -gfaab7a0	5	DISTVERSIONSUFFIX= -gfaab7a0
5	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/devel/transient-devel/Makefile (+1 lines)
1	PORTNAME= transient	1	PORTNAME= transient
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.7-159	3	DISTVERSION= 0.3.7-159
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -g6b9c93a	5	DISTVERSIONSUFFIX= -g6b9c93a
5	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/devel/transient/Makefile (-1 / +1 lines)
1	PORTNAME= transient	1	PORTNAME= transient
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.7	3	DISTVERSION= 0.3.7
4	PORTREVISION= 3	4	PORTREVISION= 4
5	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/devel/treepy.el/Makefile (-1 / +1 lines)
1	PORTNAME= treepy.el	1	PORTNAME= treepy.el
2	DISTVERSION= 0.1.2	2	DISTVERSION= 0.1.2
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-7 Link Here

(-)b/devel/xcscope.el/Makefile (-1 / +1 lines)
1	PORTNAME= xcscope.el	1	PORTNAME= xcscope.el
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.5	3	DISTVERSION= 1.5
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= devel	5	CATEGORIES= devel
6		6
7	MAINTAINER= jhb@FreeBSD.org	7	MAINTAINER= jhb@FreeBSD.org

Lines 1-6 Link Here

(-)b/editors/apel/Makefile (-1 / +1 lines)
1	PORTNAME= apel	1	PORTNAME= apel
2	PORTVERSION= 10.8.${SNAPDATE}	2	PORTVERSION= 10.8.${SNAPDATE}
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6




PORTNAME=	emacs
DISTVERSION=	28.2
PORTREVISION=	1
PORTEPOCH=	3
CATEGORIES=	editors
MASTER_SITES=	GNU

.if ${FLAVOR:U} == canna
PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs28canna/:canna
PATCHFILES+=	emacs28.1-canna-20220406b.diff.gz:-p1:canna
.endif

MAINTAINER=	emacs@FreeBSD.org

GNU_CONFIGURE=		yes
CONFIGURE_ARGS=		--disable-build-details \
			--localstatedir=/var \
			--without-libsystemd \
			--without-gconf \
			--without-libsystemd \
			--without-selinux
.if ${FLAVOR:U} == canna
CONFIGURE_ARGS+=	--with-canna

PLIST_SUB=	EMACS_VER=${DISTVERSION} \
		GNU_HOST=${CONFIGURE_TARGET}

OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
				M17N MAILUTILS MODULES NATIVECOMP OTF \
				SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
				XIM XML XWIDGETS
OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
				HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
				MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \

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 \
				HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
				PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
				XWIDGETS
.endif
OPTIONS_SUB=			YES

ACL_DESC=		Access control list support
CAIRO_DESC=		Cairo graphics library support [implies PNG, XFT]
FCITXPATCH_DESC=	Patch to pass C-Space to Fcitx input method
FILENOTIFY_DESC=	File notification support
GFILE_DESC=		File notification via gfile
GRAPHICS_DESC=		Graphics support

CAIRO_CONFIGURE_WITH=		cairo
DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH=		dbus
FCITXPATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_xfns.c
GFILE_USE=			GNOME=glib20
GFILE_CONFIGURE_ON=		--with-file-notification=gfile
GIF_LIB_DEPENDS=		libgif.so:graphics/giflib

Lines 1-5 Link Here

(-)b/editors/emacs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1649256614	1	TIMESTAMP = 1663333582
2	SHA256 (emacs-28.1.tar.xz) = 28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1	2	SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
3	SIZE (emacs-28.1.tar.xz) = 47699512	3	SIZE (emacs-28.2.tar.xz) = 47722600
4	SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684	4	SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684
5	SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564	5	SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564




--- src/xfns.c.orig	2020-02-17 01:35:32 UTC
+++ src/xfns.c
@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyles *);
 
 static const XIMStyle supported_xim_styles[] =
 {
-  XIMPreeditPosition | XIMStatusArea,
   XIMPreeditPosition | XIMStatusNothing,
+  XIMPreeditPosition | XIMStatusArea,
   XIMPreeditPosition | XIMStatusNone,
   XIMPreeditNothing | XIMStatusArea,
   XIMPreeditNothing | XIMStatusNothing,

Lines 3652-3657 share/metainfo/emacs.metainfo.xml Link Here

(-)b/editors/emacs/pkg-plist (+2 lines)
3652	%%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.elc	3652	%%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.elc
3653	%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.el.gz	3653	%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.el.gz
3654	%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.elc	3654	%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.elc
		3655	%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.el.gz
		3656	%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.elc
3655	%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el.gz	3657	%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el.gz
3656	%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc	3658	%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
3657	%%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz	3659	%%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz

Lines 1-6 Link Here

(-)b/editors/flim/Makefile (-1 / +1 lines)
1	PORTNAME= flim	1	PORTNAME= flim
2	PORTVERSION= 1.14.9.${SNAPDATE}	2	PORTVERSION= 1.14.9.${SNAPDATE}
3	PORTREVISION= 3	3	PORTREVISION= 4
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= editors elisp	5	CATEGORIES= editors elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/editors/paredit-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= paredit-mode.el	1	PORTNAME= paredit-mode.el
2	PORTVERSION= 24	2	PORTVERSION= 24
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	MASTER_SITES= http://mumble.net/~campbell/emacs/	5	MASTER_SITES= http://mumble.net/~campbell/emacs/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/editors/psgml/Makefile (-1 / +1 lines)
1	PORTNAME= psgml	1	PORTNAME= psgml
2	PORTVERSION= 1.4.0	2	PORTVERSION= 1.4.0
3	PORTREVISION= 14	3	PORTREVISION= 15
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/1.3.2	5	MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/1.3.2
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/editors/semi/Makefile (-1 / +1 lines)
1	PORTNAME= semi	1	PORTNAME= semi
2	PORTVERSION= ${SEMI_VER}.${SNAPDATE}	2	PORTVERSION= ${SEMI_VER}.${SNAPDATE}
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-7 Link Here

(-)b/editors/slime/Makefile (-1 / +1 lines)
1	PORTNAME= slime	1	PORTNAME= slime
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.26.1-9	3	DISTVERSION= 2.26.1-9
4	PORTREVISION= 4	4	PORTREVISION= 5
5	DISTVERSIONSUFFIX= -gf368e22a	5	DISTVERSIONSUFFIX= -gf368e22a
6	CATEGORIES= editors elisp	6	CATEGORIES= editors elisp
7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/editors/sly-asdf/Makefile (-1 / +1 lines)
1	PORTNAME= sly-asdf	1	PORTNAME= sly-asdf
2	PORTVERSION= 20210308	2	PORTVERSION= 20210308
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/editors/sly-named-readtables/Makefile (-1 / +1 lines)
1	PORTNAME= sly-named-readtables	1	PORTNAME= sly-named-readtables
2	PORTVERSION= 20191013	2	PORTVERSION= 20191013
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/editors/sly-quicklisp/Makefile (-1 / +1 lines)
1	PORTNAME= sly-quicklisp	1	PORTNAME= sly-quicklisp
2	PORTVERSION= 20200707	2	PORTVERSION= 20200707
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/editors/sly/Makefile (-1 / +1 lines)
1	PORTNAME= sly	1	PORTNAME= sly
2	DISTVERSION= 1.0.43	2	DISTVERSION= 1.0.43
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= editors elisp	4	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-5 Link Here

(-)b/editors/tamago/Makefile (+1 lines)
1	PORTNAME= tamago	1	PORTNAME= tamago
2	PORTVERSION= 4.0.6.0.20041122.19.15	2	PORTVERSION= 4.0.6.0.20041122.19.15
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
4	CATEGORIES= editors elisp	5	CATEGORIES= editors elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/editors/web-mode/Makefile (-1 / +1 lines)
1	PORTNAME= web-mode	1	PORTNAME= web-mode
2	PORTVERSION= 15.1	2	PORTVERSION= 15.1
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 11	4	PORTREVISION= 12
5	CATEGORIES= editors elisp	5	CATEGORIES= editors elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/editors/with-editor-devel/Makefile (+1 lines)
1	PORTNAME= with-editor	1	PORTNAME= with-editor
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.2.0-26	3	DISTVERSION= 3.2.0-26
		4	PORTREVISION= 1
4	DISTVERSIONSUFFIX= -g1d5860c	5	DISTVERSIONSUFFIX= -g1d5860c
5	CATEGORIES= editors elisp	6	CATEGORIES= editors elisp
6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/editors/with-editor/Makefile (-1 / +1 lines)
1	PORTNAME= with-editor	1	PORTNAME= with-editor
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.2.0	3	DISTVERSION= 3.2.0
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= editors elisp	5	CATEGORIES= editors elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/irc/riece/Makefile (-1 / +1 lines)
1	PORTNAME= riece	1	PORTNAME= riece
2	PORTVERSION= 9.0.0	2	PORTVERSION= 9.0.0
3	PORTREVISION= 17	3	PORTREVISION= 18
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= irc elisp	5	CATEGORIES= irc elisp
6	MASTER_SITES= SAVANNAH	6	MASTER_SITES= SAVANNAH

Lines 1-7 Link Here

(-)b/japanese/boiled-mozc/Makefile (-1 / +1 lines)
1	PORTNAME= boiled-mozc	1	PORTNAME= boiled-mozc
2	PORTVERSION= 0.7	2	PORTVERSION= 0.7
3	DISTVERSIONPREFIX=v	3	DISTVERSIONPREFIX=v
4	PORTREVISION= 11	4	PORTREVISION= 12
5	CATEGORIES= japanese editors elisp	5	CATEGORIES= japanese editors elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/japanese/cp5022x-el/Makefile (-1 / +1 lines)
1	PORTNAME= cp5022x	1	PORTNAME= cp5022x
2	PORTVERSION= 0.0.20120324	2	PORTVERSION= 0.0.20120324
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= japanese elisp	4	CATEGORIES= japanese elisp
5	PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/japanese/ddskk/Makefile (-1 / +1 lines)
1	PORTNAME= ddskk	1	PORTNAME= ddskk
2	DISTVERSION= 16.2	2	DISTVERSION= 16.2
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= japanese elisp	4	CATEGORIES= japanese elisp
5	MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \	5	MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
6	http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \	6	http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \

Lines 1-6 Link Here

(-)b/japanese/lookup/Makefile (-1 / +1 lines)
1	PORTNAME= lookup	1	PORTNAME= lookup
2	PORTVERSION= 1.99.96.20180209	2	PORTVERSION= 1.99.96.20180209
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= japanese elisp	4	CATEGORIES= japanese elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/japanese/migemo.el/Makefile (-1 / +1 lines)
1	PORTNAME= migemo.el	1	PORTNAME= migemo.el
2	PORTVERSION= 1.9.2	2	PORTVERSION= 1.9.2
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= japanese elisp	4	CATEGORIES= japanese elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-7 Link Here

(-)b/japanese/mozc-server/Makefile (-1 / +1 lines)
1	PORTNAME= mozc	1	PORTNAME= mozc
2	PORTVERSION= 2.23.2815.102.01	2	PORTVERSION= 2.23.2815.102.01
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION?= 7	4	PORTREVISION?= 8
5	CATEGORIES= japanese	5	CATEGORIES= japanese
6		6
7	MAINTAINER= hrs@FreeBSD.org	7	MAINTAINER= hrs@FreeBSD.org

Lines 1-6 Link Here

(-)b/japanese/navi2ch/Makefile (-1 / +1 lines)
1	PORTNAME= navi2ch	1	PORTNAME= navi2ch
2	PORTVERSION= 2.0.0.d	2	PORTVERSION= 2.0.0.d
3	PORTREVISION= 15	3	PORTREVISION= 16
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= japanese www elisp	5	CATEGORIES= japanese www elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/japanese/yc.el/Makefile (-1 / +1 lines)
1	PORTNAME= yc.el	1	PORTNAME= yc.el
2	PORTVERSION= 5.2.1	2	PORTVERSION= 5.2.1
3	PORTREVISION= 20	3	PORTREVISION= 21
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= japanese elisp	5	CATEGORIES= japanese elisp
6	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/	6	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/

Lines 1-7 Link Here

(-)b/lang/alchemist.el/Makefile (-1 / +1 lines)
1	PORTNAME= alchemist.el	1	PORTNAME= alchemist.el
2	PORTVERSION= 1.8.2	2	PORTVERSION= 1.8.2
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 9	4	PORTREVISION= 10
5	CATEGORIES= lang	5	CATEGORIES= lang
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/lang/clojure-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= clojure-mode.el	1	PORTNAME= clojure-mode.el
2	PORTVERSION= 5.11.0	2	PORTVERSION= 5.11.0
3	PORTREVISION= 6	3	PORTREVISION= 7
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= lang elisp	5	CATEGORIES= lang elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/lang/csharp-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= csharp-mode.el	1	PORTNAME= csharp-mode.el
2	PORTVERSION= 0.9.2	2	PORTVERSION= 0.9.2
3	PORTREVISION= 6	3	PORTREVISION= 7
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	CATEGORIES= lang elisp	5	CATEGORIES= lang elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/lang/elixir-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= elixir-mode.el	1	PORTNAME= elixir-mode.el
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	PORTVERSION= 2.3.1	3	PORTVERSION= 2.3.1
4	PORTREVISION= 9	4	PORTREVISION= 10
5	CATEGORIES= lang	5	CATEGORIES= lang
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/lang/haskell-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= haskell-mode	1	PORTNAME= haskell-mode
2	DISTVERSION= 17.2	2	DISTVERSION= 17.2
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= lang elisp	4	CATEGORIES= lang elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/lang/php-mode.el/Makefile (+1 lines)
1	PORTNAME= php-mode.el	1	PORTNAME= php-mode.el
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.24.1	3	DISTVERSION= 1.24.1
		4	PORTREVISION= 1
4	CATEGORIES= lang elisp	5	CATEGORIES= lang elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		7

Lines 1-6 Link Here

(-)b/lang/tuareg-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= tuareg-mode	1	PORTNAME= tuareg-mode
2	PORTVERSION= 2.0.8	2	PORTVERSION= 2.0.8
3	PORTREVISION= 11	3	PORTREVISION= 12
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= lang elisp	5	CATEGORIES= lang elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/mail/anubis/Makefile (-1 / +1 lines)
1	PORTNAME= anubis	1	PORTNAME= anubis
2	PORTVERSION= 4.2	2	PORTVERSION= 4.2
3	PORTREVISION= 14	3	PORTREVISION= 15
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= GNU	5	MASTER_SITES= GNU
6		6

Lines 1-6 Link Here

(-)b/mail/c-sig/Makefile (-1 / +1 lines)
1	PORTNAME= c-sig	1	PORTNAME= c-sig
2	PORTVERSION= 3.8.0.1	2	PORTVERSION= 3.8.0.1
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= mail elisp	4	CATEGORIES= mail elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-7 Link Here

(-)b/mail/mailest/Makefile (-1 / +1 lines)
1	PORTNAME= mailest	1	PORTNAME= mailest
2	PORTVERSION= 0.9.24	2	PORTVERSION= 0.9.24
3	DISTVERSIONPREFIX= ${PORTNAME}-	3	DISTVERSIONPREFIX= ${PORTNAME}-
4	PORTREVISION= 7	4	PORTREVISION= 8
5	CATEGORIES= mail	5	CATEGORIES= mail
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-5 Link Here

(-)b/mail/mailutils/Makefile (+1 lines)
1	PORTNAME= mailutils	1	PORTNAME= mailutils
2	PORTVERSION= 3.15	2	PORTVERSION= 3.15
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	MASTER_SITES= GNU GNU_ALPHA	5	MASTER_SITES= GNU GNU_ALPHA
5		6

Lines 2-8 PORTNAME= mew Link Here

(-)b/mail/mew-devel/Makefile (-1 / +1 lines)
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 6.8-72	3	DISTVERSION= 6.8-72
4	DISTVERSIONSUFFIX= -gfc4bca6	4	DISTVERSIONSUFFIX= -gfc4bca6
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= mail elisp	6	CATEGORIES= mail elisp
7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
8		8

Lines 1-6 Link Here

(-)b/mail/mew/Makefile (-1 / +1 lines)
1	PORTNAME= mew	1	PORTNAME= mew
2	PORTVERSION= 6.8	2	PORTVERSION= 6.8
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= mail elisp	4	CATEGORIES= mail elisp
5	MASTER_SITES= http://www.mew.org/Release/	5	MASTER_SITES= http://www.mew.org/Release/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/mail/mu4e-maildirs/Makefile (-1 / +1 lines)
1	PORTNAME= mu4e-maildirs	1	PORTNAME= mu4e-maildirs
2	PORTVERSION= 0.8.20201028	2	PORTVERSION= 0.8.20201028
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= mail	4	CATEGORIES= mail
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-5 Link Here

(-)b/mail/mu4e/Makefile (+1 lines)
1	PORTNAME= mu4e	1	PORTNAME= mu4e
2	PORTVERSION= 1.6.10	2	PORTVERSION= 1.6.10
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
5		6

Lines 1-3 Link Here

(-)b/mail/notmuch-emacs/Makefile (+1 lines)
		1	PORTREVISION= 1
1	CATEGORIES= mail elisp	2	CATEGORIES= mail elisp
2	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}	3	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}
3	COMMENT= Emacs major-mode for the Notmuch email search and tagging application	4	COMMENT= Emacs major-mode for the Notmuch email search and tagging application

Lines 1-6 Link Here

(-)b/mail/wanderlust/Makefile (-1 / +1 lines)
1	PORTNAME= wanderlust	1	PORTNAME= wanderlust
2	PORTVERSION= 2.15.9.b.${SNAPDATE}	2	PORTVERSION= 2.15.9.b.${SNAPDATE}
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= mail elisp	4	CATEGORIES= mail elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/mail/x-face-e21/Makefile (-1 / +1 lines)
1	PORTNAME= x-face-e21	1	PORTNAME= x-face-e21
2	PORTVERSION= 20070306	2	PORTVERSION= 20070306
3	PORTREVISION= 23	3	PORTREVISION= 24
4	CATEGORIES= mail elisp	4	CATEGORIES= mail elisp
5	MASTER_SITES= http://www.jpl.org/elips/	5	MASTER_SITES= http://www.jpl.org/elips/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/mail/xcite/Makefile (-1 / +1 lines)
1	PORTNAME= xcite	1	PORTNAME= xcite
2	PORTVERSION= 1.60	2	PORTVERSION= 1.60
3	PORTREVISION= 18	3	PORTREVISION= 19
4	CATEGORIES= mail elisp	4	CATEGORIES= mail elisp
5	MASTER_SITES= https://www.gentei.org/~yuuji/software/	5	MASTER_SITES= https://www.gentei.org/~yuuji/software/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/math/coq/Makefile (-1 / +1 lines)
1	PORTNAME= coq	1	PORTNAME= coq
2	PORTVERSION= 8.6	2	PORTVERSION= 8.6
3	PORTREVISION= 11	3	PORTREVISION= 12
4	PORTEPOCH= 3	4	PORTEPOCH= 3
5	CATEGORIES= math	5	CATEGORIES= math
6	MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \	6	MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \

Lines 1-6 Link Here

(-)b/math/ess/Makefile (-1 / +1 lines)
1	PORTNAME= ess	1	PORTNAME= ess
2	DISTVERSION= 18.10.2	2	DISTVERSION= 18.10.2
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= math	4	CATEGORIES= math
5	MASTER_SITES= http://ess.r-project.org/downloads/ess/ \	5	MASTER_SITES= http://ess.r-project.org/downloads/ess/ \
6	http://stat.ethz.ch/ESS/downloads/ess/	6	http://stat.ethz.ch/ESS/downloads/ess/

Lines 1-5 Link Here

(-)b/misc/compat.el/Makefile (+1 lines)
1	PORTNAME= compat.el	1	PORTNAME= compat.el
2	DISTVERSION= 28.1.2.2	2	DISTVERSION= 28.1.2.2
		3	PORTREVISION= 1
3	CATEGORIES= misc elisp	4	CATEGORIES= misc elisp
4	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
5		6

Lines 1-6 Link Here

(-)b/misc/elscreen/Makefile (-1 / +1 lines)
1	PORTNAME= elscreen	1	PORTNAME= elscreen
2	PORTVERSION= 1.4.6.20180320	2	PORTVERSION= 1.4.6.20180320
3	PORTREVISION= 7	3	PORTREVISION= 8
4	CATEGORIES= misc elisp	4	CATEGORIES= misc elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/net/gnu-radius/Makefile (-1 / +1 lines)
1	PORTNAME= gnu-radius	1	PORTNAME= gnu-radius
2	PORTVERSION= 1.6.1	2	PORTVERSION= 1.6.1
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= net	4	CATEGORIES= net
5	MASTER_SITES= GNU/radius	5	MASTER_SITES= GNU/radius
6	DISTNAME= radius-${PORTVERSION}	6	DISTNAME= radius-${PORTVERSION}

Lines 1-6 Link Here

(-)b/print/a2ps/Makefile (-1 / +1 lines)
1	PORTNAME= a2ps	1	PORTNAME= a2ps
2	PORTVERSION= 4.13b	2	PORTVERSION= 4.13b
3	PORTREVISION= 16	3	PORTREVISION= 17
4	CATEGORIES= print	4	CATEGORIES= print
5	MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n	5	MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n
6		6

Lines 1-5 Link Here

(-)b/print/auctex/Makefile (+1 lines)
1	PORTNAME= auctex	1	PORTNAME= auctex
2	PORTVERSION= 13.1	2	PORTVERSION= 13.1
		3	PORTREVISION= 1
3	CATEGORIES= print elisp	4	CATEGORIES= print elisp
4	MASTER_SITES= GNU	5	MASTER_SITES= GNU
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/print/hyperlatex/Makefile (-1 / +1 lines)
1	PORTNAME= Hyperlatex	1	PORTNAME= Hyperlatex
2	DISTVERSION= 2.9a	2	DISTVERSION= 2.9a
3	PORTREVISION= 15	3	PORTREVISION= 16
4	CATEGORIES= print	4	CATEGORIES= print
5	MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a	5	MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 2-8 PORTNAME= pdf-tools Link Here

(-)b/print/pdf-tools/Makefile (-1 / +1 lines)
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.91-54	3	DISTVERSION= 0.91-54
4	DISTVERSIONSUFFIX= -gbb0b71f	4	DISTVERSIONSUFFIX= -gbb0b71f
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= print elisp	6	CATEGORIES= print elisp
7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
8		8

Lines 1-6 Link Here

(-)b/print/yatex/Makefile (-1 / +1 lines)
1	PORTNAME= yatex	1	PORTNAME= yatex
2	PORTVERSION= 1.82	2	PORTVERSION= 1.82
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES?= print elisp	4	CATEGORIES?= print elisp
5	MASTER_SITES= http://www.yatex.org/	5	MASTER_SITES= http://www.yatex.org/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/security/starttls/Makefile (-1 / +1 lines)
1	PORTNAME= starttls	1	PORTNAME= starttls
2	PORTVERSION= 0.10	2	PORTVERSION= 0.10
3	PORTREVISION= 24	3	PORTREVISION= 25
4	CATEGORIES= security	4	CATEGORIES= security
5	MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/	5	MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/sysutils/lr/Makefile (-1 / +1 lines)
1	PORTNAME= lr	1	PORTNAME= lr
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.5.1	3	DISTVERSION= 1.5.1
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= sysutils	5	CATEGORIES= sysutils
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= ports@FreeBSD.org

Lines 1-6 Link Here

(-)b/sysutils/puppet-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= puppet-mode.el	1	PORTNAME= puppet-mode.el
2	PORTVERSION= 0.2	2	PORTVERSION= 0.2
3	PORTREVISION= 11	3	PORTREVISION= 12
4	CATEGORIES= sysutils elisp	4	CATEGORIES= sysutils elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/textproc/dictem/Makefile (-1 / +1 lines)
1	PORTNAME= dictem	1	PORTNAME= dictem
2	PORTVERSION= 1.0.4	2	PORTVERSION= 1.0.4
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= textproc net elisp	4	CATEGORIES= textproc net elisp
5	MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION}	5	MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION}
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-6 Link Here

(-)b/textproc/dictionary/Makefile (-1 / +1 lines)
1	PORTNAME= dictionary	1	PORTNAME= dictionary
2	PORTVERSION= 1.8.7	2	PORTVERSION= 1.8.7
3	PORTREVISION= 29	3	PORTREVISION= 30
4	CATEGORIES= textproc net elisp	4	CATEGORIES= textproc net elisp
5	MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \	5	MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \
6	http://bsdchat.com/dist/dryice/	6	http://bsdchat.com/dist/dryice/

Lines 1-6 Link Here

(-)b/textproc/doc-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= doc-mode.el	1	PORTNAME= doc-mode.el
2	PORTVERSION= 1.1	2	PORTVERSION= 1.1
3	PORTREVISION= 22	3	PORTREVISION= 23
4	CATEGORIES= textproc elisp	4	CATEGORIES= textproc elisp
5	MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION}	5	MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION}
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}

Lines 1-7 Link Here

(-)b/textproc/markdown-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= markdown-mode.el	1	PORTNAME= markdown-mode.el
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.5	3	DISTVERSION= 2.5
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= textproc elisp	5	CATEGORIES= textproc elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		7

Lines 1-6 Link Here

(-)b/textproc/muse/Makefile (-1 / +1 lines)
1	PORTNAME= muse	1	PORTNAME= muse
2	PORTVERSION= 3.20	2	PORTVERSION= 3.20
3	PORTREVISION= 20	3	PORTREVISION= 21
4	CATEGORIES= textproc elisp	4	CATEGORIES= textproc elisp
5	MASTER_SITES= http://download.gna.org/muse-el/ \	5	MASTER_SITES= http://download.gna.org/muse-el/ \
6	LOCAL/dryice \	6	LOCAL/dryice \

Lines 1-5 Link Here

(-)b/textproc/uim-el/Makefile (+1 lines)
1	PORTNAME= uim-el	1	PORTNAME= uim-el
2	PORTVERSION= 1.8.9.b.${SNAPDATE}	2	PORTVERSION= 1.8.9.b.${SNAPDATE}
		3	PORTREVISION= 1
3	CATEGORIES= textproc	4	CATEGORIES= textproc
4	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
5		6

Lines 1-6 Link Here

(-)b/textproc/xml-lite.el/Makefile (-1 / +1 lines)
1	PORTNAME= xml-lite.el	1	PORTNAME= xml-lite.el
2	PORTVERSION= 1.1	2	PORTVERSION= 1.1
3	PORTREVISION= 17	3	PORTREVISION= 18
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= textproc elisp	5	CATEGORIES= textproc elisp
6	MASTER_SITES= http://dogbiscuit.org/mdub/software/	6	MASTER_SITES= http://dogbiscuit.org/mdub/software/

Lines 1-6 Link Here

(-)b/textproc/yaml-mode.el/Makefile (-1 / +1 lines)
1	PORTNAME= yaml-mode.el	1	PORTNAME= yaml-mode.el
2	PORTVERSION= 0.0.15	2	PORTVERSION= 0.0.15
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= textproc elisp	4	CATEGORIES= textproc elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		6

Lines 1-6 Link Here

(-)b/textproc/yaml.el/Makefile (+1 lines)
1	PORTNAME= yaml.el	1	PORTNAME= yaml.el
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.5.1	3	DISTVERSION= 0.5.1
		4	PORTREVISION= 1
4	CATEGORIES= textproc elisp	5	CATEGORIES= textproc elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		7

Lines 1-5 Link Here

(-)b/www/emacs-w3m/Makefile (-1 / +1 lines)
1	PORTNAME= emacs-w3m	1	PORTNAME= emacs-w3m
2	PORTVERSION= 1.4.632.b.${SNAPDATE}	2	PORTVERSION= 1.4.632.b.${SNAPDATE}
		3	PORTREVISION= 1
3	CATEGORIES= www elisp	4	CATEGORIES= www elisp
4	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
5		6
6	-

Return to bug 266454

Lines 34-48 Link Here

(-)b/Mk/Uses/emacs.mk (-5 / +5 lines)
34	# This will prevent flavors.	34	# This will prevent flavors.
35	#	35	#
36	# Variables, which can be read by ports:	36	# Variables, which can be read by ports:
37	# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.1)	37	# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.2)
38	# EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})	38	# EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
39	# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs)	39	# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs)
40	# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.1)	40	# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.2)
41	# EMACS_MAJOR_VER: Emacs major version (e.g. 28)	41	# EMACS_MAJOR_VER: Emacs major version (e.g. 28)
42	# EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors	42	# EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors
43	# EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)	43	# EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
44	# EMACS_VER: Emacs version (e.g. 28.1)	44	# EMACS_VER: Emacs version (e.g. 28.2)
45	# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.1/site-lisp)	45	# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.2/site-lisp)
46	#-------------------------------------------------------------------------------	46	#-------------------------------------------------------------------------------
47	#	47	#
48	# MAINTAINER: emacs@FreeBSD.org	48	# MAINTAINER: emacs@FreeBSD.org
Lines 108-114 EMACS_FLAVOR= full Link Here
108	EMACS_VER= 29.0.50	108	EMACS_VER= 29.0.50
109	EMACS_PORTDIR= editors/emacs-devel	109	EMACS_PORTDIR= editors/emacs-devel
110	. else	110	. else
111	EMACS_VER= 28.1	111	EMACS_VER= 28.2
112	EMACS_PORTDIR= editors/emacs	112	EMACS_PORTDIR= editors/emacs
113	. endif	113	. endif
114		114

Lines 1-13 Link Here

(-)b/editors/emacs/Makefile (-15 / +11 lines)
1	PORTNAME= emacs	1	PORTNAME= emacs
2	DISTVERSION= 28.1	2	DISTVERSION= 28.2
3	PORTREVISION= 1
4	PORTEPOCH= 3	3	PORTEPOCH= 3
5	CATEGORIES= editors	4	CATEGORIES= editors
6	MASTER_SITES= GNU	5	MASTER_SITES= GNU
7		6
8	.if ${FLAVOR:U} == canna	7	.if ${FLAVOR:U} == canna
9	PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna	8	PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna
10	PATCHFILES+= emacs28.1-canna-20220406b.diff.gz:-p1:canna	9	PATCHFILES+= emacs28.1-canna-20220406b.diff.gz:-p1:canna
11	.endif	10	.endif
12		11
13	MAINTAINER= emacs@FreeBSD.org	12	MAINTAINER= emacs@FreeBSD.org
Lines 40-47 USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt Link Here
40	GNU_CONFIGURE= yes	39	GNU_CONFIGURE= yes
41	CONFIGURE_ARGS= --disable-build-details \	40	CONFIGURE_ARGS= --disable-build-details \
42	--localstatedir=/var \	41	--localstatedir=/var \
43	--without-libsystemd \
44	--without-gconf \	42	--without-gconf \
		43	--without-libsystemd \
45	--without-selinux	44	--without-selinux
46	.if ${FLAVOR:U} == canna	45	.if ${FLAVOR:U} == canna
47	CONFIGURE_ARGS+= --with-canna	46	CONFIGURE_ARGS+= --with-canna
Lines 95-104 PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \ Link Here
95	PLIST_SUB= EMACS_VER=${DISTVERSION} \	94	PLIST_SUB= EMACS_VER=${DISTVERSION} \
96	GNU_HOST=${CONFIGURE_TARGET}	95	GNU_HOST=${CONFIGURE_TARGET}
97		96
98	OPTIONS_DEFINE= ACL DBUS FCITXPATCH GNUTLS GSETTINGS \	97	OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
99	HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \	98	M17N MAILUTILS MODULES NATIVECOMP OTF \
100	NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \	99	SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
101	XIM XML XWIDGETS
102	OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \	100	OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
103	HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \	101	HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
104	MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \	102	MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
Lines 110-125 OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE Link Here
110	OPTIONS_RADIO_SOUND= ALSA OSS	108	OPTIONS_RADIO_SOUND= ALSA OSS
111	OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D	109	OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
112	.if ${FLAVOR:U} == nox	110	.if ${FLAVOR:U} == nox
113	OPTIONS_EXCLUDE= ALSA CAIRO DBUS FCITXPATCH GFILE GIF \	111	OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
114	GSETTINGS GTK2 GTK3 HARFBUZZ JPEG LCMS2 M17N \	112	HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
115	MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \	113	PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
116	XAW XAW3D XFT XIM XPM XWIDGETS	114	XWIDGETS
117	.endif	115	.endif
118	OPTIONS_SUB= YES	116	OPTIONS_SUB= YES
119		117
120	ACL_DESC= Access control list support	118	ACL_DESC= Access control list support
121	CAIRO_DESC= Cairo graphics library support [implies PNG, XFT]	119	CAIRO_DESC= Cairo graphics library support [implies PNG, XFT]
122	FCITXPATCH_DESC= Patch to pass C-Space to Fcitx input method
123	FILENOTIFY_DESC= File notification support	120	FILENOTIFY_DESC= File notification support
124	GFILE_DESC= File notification via gfile	121	GFILE_DESC= File notification via gfile
125	GRAPHICS_DESC= Graphics support	122	GRAPHICS_DESC= Graphics support
Lines 149-155 CAIRO_USE= GNOME=cairo Link Here
149	CAIRO_CONFIGURE_WITH= cairo	146	CAIRO_CONFIGURE_WITH= cairo
150	DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus	147	DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
151	DBUS_CONFIGURE_WITH= dbus	148	DBUS_CONFIGURE_WITH= dbus
152	FCITXPATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_xfns.c
153	GFILE_USE= GNOME=glib20	149	GFILE_USE= GNOME=glib20
154	GFILE_CONFIGURE_ON= --with-file-notification=gfile	150	GFILE_CONFIGURE_ON= --with-file-notification=gfile
155	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	151	GIF_LIB_DEPENDS= libgif.so:graphics/giflib

Removed Link Here

(-)a/editors/emacs/files/extra-patch-src_xfns.c (-12 lines)
1	--- src/xfns.c.orig 2020-02-17 01:35:32 UTC
2	+++ src/xfns.c
3	@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyles *);
4
5	static const XIMStyle supported_xim_styles[] =
6	{
7	- XIMPreeditPosition \| XIMStatusArea,
8	XIMPreeditPosition \| XIMStatusNothing,
9	+ XIMPreeditPosition \| XIMStatusArea,
10	XIMPreeditPosition \| XIMStatusNone,
11	XIMPreeditNothing \| XIMStatusArea,
12	XIMPreeditNothing \| XIMStatusNothing,