editors/emacs: Update to 28.2

* Remove FCITXPATCH option as extra-patch-src_xfns.c can't be applied
  since 28.1.
* Tidy up Makefile with portfmt.
* Bump PORTREVISION of consumers.

ChangeLog:	https://www.gnu.org/software/emacs/news/NEWS.28.2

PR:		266454
Exp-run by:	antoine
Reviewed by:	ashish, jrm
Differential Revision:	https://reviews.freebsd.org/D36613

102 files changed, 118 insertions, 109 deletions

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index 83cfd57871cb..9ecf69f0ddbf 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -34,15 +34,15 @@
 #                             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.1)
+# 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.1)
+# 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.1)
-# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.1/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
@@ -108,7 +108,7 @@ EMACS_FLAVOR=	full
 EMACS_VER=		29.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .  else
-EMACS_VER=		28.1
+EMACS_VER=		28.2
 EMACS_PORTDIR=		editors/emacs
 .  endif
 
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 3ad810163f8f..f1775ebd706a 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	emms
 DISTVERSION=	5.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 3a0763fbb5ef..de3e031a4f57 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dinotrace
 PORTVERSION=	9.4f
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index 0dc73bbd7724..66c6ce237b4e 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	verilog-mode.el
 PORTVERSION=	801
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	cad elisp
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 9db9f79c92b7..82e2e99dc604 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bbdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.2a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index a545ac9b376f..43377cb3519a 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index ec18d2c30b84..61aa575b6f5f 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	emacsql
 DISTVERSION=	3.0.0-17
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g3747260
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index dbcb9482c803..5d7c100643bc 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 13c048c0fee1..009038fa6a25 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pg.el
 DISTVERSION=	0.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 4754e6c739f3..baacbf17acbd 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	howm
 PORTVERSION=	1.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index 98687d9713f2..0fdbf786a1be 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cask
 PORTVERSION=	0.8.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 2c50d905cc93..281898cfa2ee 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	clojure-cider
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile
index 3e7da595e3a5..49ccb28dbe22 100644
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dash.el
 DISTVERSION=	2.19.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index 04948b6887c0..44a0e3305257 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	distel
 PORTVERSION=	4.1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile
index 73b0b374655b..dba07197de43 100644
--- a/devel/epl.el/Makefile
+++ b/devel/epl.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	epl.el
 PORTVERSION=	0.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile
index 9ddf9545941f..6f2ccb9d8079 100644
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1-69
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g6a820a4
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
diff --git a/devel/forge/Makefile b/devel/forge/Makefile
index a5b92f50f6f7..f5509f96af32 100644
--- a/devel/forge/Makefile
+++ b/devel/forge/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/gettext-po-mode/Makefile b/devel/gettext-po-mode/Makefile
index bb35b3f658f5..4956a3bd802a 100644
--- a/devel/gettext-po-mode/Makefile
+++ b/devel/gettext-po-mode/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gettext-po-mode
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	GNU gettext po-mode for emacs
diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile
index f0f6eb68be71..0fd85bbd27ef 100644
--- a/devel/ghub-devel/Makefile
+++ b/devel/ghub-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.6-36
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g4e5bb75
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile
index 29dc31c130d6..f37ad3db5362 100644
--- a/devel/ghub/Makefile
+++ b/devel/ghub/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index e086095cf7d0..484406ce49b4 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	git-modes
 DISTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/libegit2/Makefile b/devel/libegit2/Makefile
index 83bda5009250..d63fab30f788 100644
--- a/devel/libegit2/Makefile
+++ b/devel/libegit2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libegit2
 DISTVERSION=	g20200515
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/lua-mode/Makefile b/devel/lua-mode/Makefile
index cc9f6f335820..a43e79a93271 100644
--- a/devel/lua-mode/Makefile
+++ b/devel/lua-mode/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lua-mode
 PORTVERSION=	20210802
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index 35acbefda030..ee6e7a8d6525 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0-430
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gc1def981
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 2841eb4f9bb2..182167ca1837 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index 02c8b49455f7..ad8a395f4c8c 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Sepia
 PORTVERSION=	0.992
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile
index 8cb51cad2cdf..668caea6e7c4 100644
--- a/devel/pkg-info.el/Makefile
+++ b/devel/pkg-info.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pkg-info.el
 PORTVERSION=	0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index d3d1e798671d..7ae24a17ab46 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	psvn
 PORTVERSION=	20150720.214200
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.xsteve.at/prg/emacs/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/tablist/Makefile b/devel/tablist/Makefile
index 0e63f4b93c70..b715b993c4d9 100644
--- a/devel/tablist/Makefile
+++ b/devel/tablist/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	tablist
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0-13
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gfaab7a0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile
index a046c80d3c1a..3f460f58519e 100644
--- a/devel/transient-devel/Makefile
+++ b/devel/transient-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.7-159
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g6b9c93a
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
diff --git a/devel/transient/Makefile b/devel/transient/Makefile
index fc0f346ddefd..29c5e0f83529 100644
--- a/devel/transient/Makefile
+++ b/devel/transient/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/treepy.el/Makefile b/devel/treepy.el/Makefile
index 9c716ff87112..c2a69482edf1 100644
--- a/devel/treepy.el/Makefile
+++ b/devel/treepy.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	treepy.el
 DISTVERSION=	0.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/devel/xcscope.el/Makefile b/devel/xcscope.el/Makefile
index 40c8be7de948..c71c7b8f799d 100644
--- a/devel/xcscope.el/Makefile
+++ b/devel/xcscope.el/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xcscope.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jhb@FreeBSD.org
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index c7686a13f33b..2e678aa027f0 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	apel
 PORTVERSION=	10.8.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index d89e2ddbe2cc..74dde03bc798 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	emacs
-DISTVERSION=	28.1
-PORTREVISION=	1
+DISTVERSION=	28.2
 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
+PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs28canna/:canna
+PATCHFILES+=	emacs28.1-canna-20220406b.diff.gz:-p1:canna
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
@@ -40,8 +39,8 @@ USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 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
@@ -95,10 +94,9 @@ PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
 PLIST_SUB=	EMACS_VER=${DISTVERSION} \
 		GNU_HOST=${CONFIGURE_TARGET}
 
-OPTIONS_DEFINE=			ACL DBUS FCITXPATCH GNUTLS GSETTINGS \
-				HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \
-				NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \
-				XIM XML XWIDGETS
+OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
+				M17N MAILUTILS MODULES NATIVECOMP OTF \
+				SCROLLBARS SOURCES THREADS XFT 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 \
@@ -110,16 +108,15 @@ 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 FCITXPATCH GFILE GIF \
-				GSETTINGS GTK2 GTK3 HARFBUZZ JPEG LCMS2 M17N \
-				MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
-				XAW XAW3D XFT XIM XPM XWIDGETS
+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
@@ -149,7 +146,6 @@ CAIRO_USE=			GNOME=cairo
 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
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index ed3b97dab281..aacd3598deac 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1649256614
-SHA256 (emacs-28.1.tar.xz) = 28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
-SIZE (emacs-28.1.tar.xz) = 47699512
+TIMESTAMP = 1663333582
+SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
+SIZE (emacs-28.2.tar.xz) = 47722600
 SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684
 SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564
diff --git a/editors/emacs/files/extra-patch-src_xfns.c b/editors/emacs/files/extra-patch-src_xfns.c
deleted file mode 100644
index 01b0f666e419..000000000000
--- a/editors/emacs/files/extra-patch-src_xfns.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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,
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 55d434a855d5..8128eb1b01b0 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -3652,6 +3652,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 8785c415a145..0d7fe09b33a1 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	flim
 PORTVERSION=	1.14.9.${SNAPDATE}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index 88834df6faee..83bee1d217ca 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	paredit-mode.el
 PORTVERSION=	24
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://mumble.net/~campbell/emacs/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 67eeb6e25be9..9e45005fba2c 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	psgml
 PORTVERSION=	1.4.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/1.3.2
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 9ba961df0784..cbf7aa611864 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index c5d0795c03a5..87d658f64c54 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	slime
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.26.1-9
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-gf368e22a
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile
index e16b986cef22..1f25694feba0 100644
--- a/editors/sly-asdf/Makefile
+++ b/editors/sly-asdf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sly-asdf
 PORTVERSION=	20210308
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/sly-named-readtables/Makefile b/editors/sly-named-readtables/Makefile
index a1b35636dc0c..e7c783a32244 100644
--- a/editors/sly-named-readtables/Makefile
+++ b/editors/sly-named-readtables/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sly-named-readtables
 PORTVERSION=	20191013
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/sly-quicklisp/Makefile b/editors/sly-quicklisp/Makefile
index ad5e9ddb1a72..4ee056975a7b 100644
--- a/editors/sly-quicklisp/Makefile
+++ b/editors/sly-quicklisp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sly-quicklisp
 PORTVERSION=	20200707
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/sly/Makefile b/editors/sly/Makefile
index c99df6a902b1..3b84700e8c98 100644
--- a/editors/sly/Makefile
+++ b/editors/sly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sly
 DISTVERSION=	1.0.43
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index a0649551e693..78f04eacce5f 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19.15
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile
index 5486d7e509b3..490507d39ea4 100644
--- a/editors/web-mode/Makefile
+++ b/editors/web-mode/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	web-mode
 PORTVERSION=	15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile
index 07d07bd0551b..218da4d98528 100644
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0-26
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g1d5860c
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 63aef9051414..90d2ff056adc 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 1dbb8e356ac6..fac3c8c67426 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	riece
 PORTVERSION=	9.0.0
-PORTREVISION=	17
+PORTREVISION=	18
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
diff --git a/japanese/boiled-mozc/Makefile b/japanese/boiled-mozc/Makefile
index e153e91c2ef9..9ff1ff3b8065 100644
--- a/japanese/boiled-mozc/Makefile
+++ b/japanese/boiled-mozc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	boiled-mozc
 PORTVERSION=	0.7
 DISTVERSIONPREFIX=v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/japanese/cp5022x-el/Makefile b/japanese/cp5022x-el/Makefile
index 765e9e1acd1a..357aa65fc1ee 100644
--- a/japanese/cp5022x-el/Makefile
+++ b/japanese/cp5022x-el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cp5022x
 PORTVERSION=	0.0.20120324
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	-el${EMACS_PKGNAMESUFFIX}
 
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 35eea5c922c2..d00ee04d3460 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ddskk
 DISTVERSION=	16.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
 		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 1ee2afdb7716..9e5c43e6f4a9 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lookup
 PORTVERSION=	1.99.96.20180209
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/japanese/migemo.el/Makefile b/japanese/migemo.el/Makefile
index 6311a79f2b71..c35cd3a2b9c7 100644
--- a/japanese/migemo.el/Makefile
+++ b/japanese/migemo.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	migemo.el
 PORTVERSION=	1.9.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index c515e9dc7ec3..5acca2de4604 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index d8c654052ba7..fdd02a64e530 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	navi2ch
 PORTVERSION=	2.0.0.d
-PORTREVISION=	15
+PORTREVISION=	16
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 05b9bbd469e7..7dbfdbbc9d68 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yc.el
 PORTVERSION=	5.2.1
-PORTREVISION=	20
+PORTREVISION=	21
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index b84d4cc62d7e..8cb79cfc770b 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	alchemist.el
 PORTVERSION=	1.8.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile
index 17c1f17da008..9cfce36095cb 100644
--- a/lang/clojure-mode.el/Makefile
+++ b/lang/clojure-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	clojure-mode.el
 PORTVERSION=	5.11.0
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile
index 4041f239a18a..7bae7b088e77 100644
--- a/lang/csharp-mode.el/Makefile
+++ b/lang/csharp-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	csharp-mode.el
 PORTVERSION=	0.9.2
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/lang/elixir-mode.el/Makefile b/lang/elixir-mode.el/Makefile
index 0dc43b08eb6a..65cd5cf232ea 100644
--- a/lang/elixir-mode.el/Makefile
+++ b/lang/elixir-mode.el/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elixir-mode.el
 DISTVERSIONPREFIX=	v
 PORTVERSION=	2.3.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index dd13fd5f81fe..5b6e83eed2af 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	haskell-mode
 DISTVERSION=	17.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/lang/php-mode.el/Makefile b/lang/php-mode.el/Makefile
index 1b63d4484434..4c1702be304c 100644
--- a/lang/php-mode.el/Makefile
+++ b/lang/php-mode.el/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	php-mode.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.24.1
+PORTREVISION=	1
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 8b628ca2e0b5..0df39c0ebe04 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tuareg-mode
 PORTVERSION=	2.0.8
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index e5efaf73586d..eaffa85264d2 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index e7fa2b384c21..0bb7a310dfbe 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	c-sig
 PORTVERSION=	3.8.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index f1ce4717dfc4..b3b861617ec8 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mailest
 PORTVERSION=	0.9.24
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index a5a6c2a5b279..cd3e750bb40d 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mailutils
 PORTVERSION=	3.15
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	GNU GNU_ALPHA
 
diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile
index a3e200e25ea9..87faddbb4888 100644
--- a/mail/mew-devel/Makefile
+++ b/mail/mew-devel/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	mew
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.8-72
 DISTVERSIONSUFFIX=	-gfc4bca6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 013d577b4a0f..614b6c37e94f 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mew
 PORTVERSION=	6.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
index b391c6423583..24b601e6697d 100644
--- a/mail/mu4e-maildirs/Makefile
+++ b/mail/mu4e-maildirs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mu4e-maildirs
 PORTVERSION=	0.8.20201028
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index 00b777436f0f..d9337f6f8b11 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mu4e
 PORTVERSION=	1.6.10
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index b2e1c4eea763..ab898e3161ab 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,3 +1,4 @@
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index a2a98ab91c7c..d6aea890163b 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index dc7cf958fc64..b727c5f40292 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	x-face-e21
 PORTVERSION=	20070306
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.jpl.org/elips/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile
index 2a275209373c..3bc39a7d06fa 100644
--- a/mail/xcite/Makefile
+++ b/mail/xcite/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xcite
 PORTVERSION=	1.60
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	mail elisp
 MASTER_SITES=	https://www.gentei.org/~yuuji/software/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/math/coq/Makefile b/math/coq/Makefile
index bcc9b8ca0469..0618418cad6c 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	coq
 PORTVERSION=	8.6
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 914b4f1abd9a..fe8a7fa393ad 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ess
 DISTVERSION=	18.10.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
diff --git a/misc/compat.el/Makefile b/misc/compat.el/Makefile
index 7b487d7d4c8a..405e48f6f82b 100644
--- a/misc/compat.el/Makefile
+++ b/misc/compat.el/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	compat.el
 DISTVERSION=	28.1.2.2
+PORTREVISION=	1
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index d15d262cbf54..4aee4d13a4cc 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	elscreen
 PORTVERSION=	1.4.6.20180320
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 2c90cf5cbf13..da7083afc637 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnu-radius
 PORTVERSION=	1.6.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	GNU/radius
 DISTNAME=	radius-${PORTVERSION}
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index a29fef8c8464..dc93e78f832a 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	a2ps
 PORTVERSION=	4.13b
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	print
 MASTER_SITES=	GNU LOCAL/hrs/a2ps/:i18n
 
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index b9a01fd0d2bd..9718bab6b44a 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	auctex
 PORTVERSION=	13.1
+PORTREVISION=	1
 CATEGORIES=	print elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index d81d464fa48f..bc625afa9647 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Hyperlatex
 DISTVERSION=	2.9a
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile
index 8d5dc043837f..f49045bb77ad 100644
--- a/print/pdf-tools/Makefile
+++ b/print/pdf-tools/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pdf-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.91-54
 DISTVERSIONSUFFIX=	-gbb0b71f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 19aade3a8704..87fd1f91515b 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yatex
 PORTVERSION=	1.82
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	print elisp
 MASTER_SITES=	http://www.yatex.org/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index 0bd6a10f50ca..5284486a3de1 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	starttls
 PORTVERSION=	0.10
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile
index 775eea51a1d4..191a468d6a90 100644
--- a/sysutils/lr/Makefile
+++ b/sysutils/lr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/puppet-mode.el/Makefile b/sysutils/puppet-mode.el/Makefile
index 9ca89e7e40c7..8cc40f492e21 100644
--- a/sysutils/puppet-mode.el/Makefile
+++ b/sysutils/puppet-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	puppet-mode.el
 PORTVERSION=	0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	sysutils elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index fc5e906fc536..d894fcf36edd 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dictem
 PORTVERSION=	1.0.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	SF/dictem/dictem/dictem-${PORTVERSION}
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index afbab9231eef..3f9a0c207e82 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dictionary
 PORTVERSION=	1.8.7
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	http://me.in-berlin.de/~myrkr/dictionary/ \
 		http://bsdchat.com/dist/dryice/
diff --git a/textproc/doc-mode.el/Makefile b/textproc/doc-mode.el/Makefile
index c47e652f8256..6c4631ce7545 100644
--- a/textproc/doc-mode.el/Makefile
+++ b/textproc/doc-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	doc-mode.el
 PORTVERSION=	1.1
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	textproc elisp
 MASTER_SITES=	SF/xpt/doc-mode/doc-mode-${PORTVERSION}
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile
index 5f1dc563ef98..d5ac54df22af 100644
--- a/textproc/markdown-mode.el/Makefile
+++ b/textproc/markdown-mode.el/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markdown-mode.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 38d295beba10..7e18b79a3b31 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	muse
 PORTVERSION=	3.20
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://download.gna.org/muse-el/ \
 		LOCAL/dryice \
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 0775c184a63e..42ff52a649a8 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	uim-el
 PORTVERSION=	1.8.9.b.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index 3921d45d1808..9110b7a7cc9a 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xml-lite.el
 PORTVERSION=	1.1
-PORTREVISION=	17
+PORTREVISION=	18
 PORTEPOCH=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dogbiscuit.org/mdub/software/
diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile
index a1ec5a4bc8a5..03e864aece5f 100644
--- a/textproc/yaml-mode.el/Makefile
+++ b/textproc/yaml-mode.el/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yaml-mode.el
 PORTVERSION=	0.0.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/yaml.el/Makefile b/textproc/yaml.el/Makefile
index cee2c27f71e0..1dd674c24766 100644
--- a/textproc/yaml.el/Makefile
+++ b/textproc/yaml.el/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	yaml.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index f3792de8bc6a..d70322642409 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.632.b.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	www elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}