diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 5dd550d80e18..2d6ffe07bf14 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	emms
-DISTVERSION=	18
-PORTREVISION=	2
+DISTVERSION=	16
+PORTREVISION=	1
 CATEGORIES=	audio elisp
 MASTER_SITES=	https://elpa.gnu.org/packages/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs Multi-Media System
 WWW=		https://www.gnu.org/software/emms/index.html
 
 LICENSE=	GPLv3
 
 # do not depend on base texinfo on 10
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USES=		emacs gmake
 
 CONFLICTS_INSTALL=	emms emms-emacs_* # share/emacs/site-lisp/emms/emms-auto.el
 
 NO_ARCH=	yes
 
 INFO=		emms
 
 .include <bsd.port.mk>
diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile
index 25d795ab4830..0db5d9fb42f4 100644
--- a/databases/closql-devel/Makefile
+++ b/databases/closql-devel/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1-39
+DISTVERSION=	1.2.1-28
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g81f04f6
+DISTVERSIONSUFFIX=	-g909752e
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Store EIEIO objects using EmacSQL
 WWW=		https://github.com/magit/closql
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.2:misc/compat.el@${EMACS_FLAVOR} \
 		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.2:misc/compat.el@${EMACS_FLAVOR} \
 		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="${LOAD_PATH}"
 
 CONFLICTS_INSTALL=	closql closql-emacs_* # share/doc/closql/README.md
 
 NO_ARCH=	yes
 
 PORTDOCS=	README.org
 
 OPTIONS_DEFINE=	DOCS
 
 LOAD_PATH=	-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	   ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/emacs-sqlite3-api/Makefile b/databases/emacs-sqlite3-api/Makefile
index 41bbb6106544..ca77f9d23af7 100644
--- a/databases/emacs-sqlite3-api/Makefile
+++ b/databases/emacs-sqlite3-api/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	emacs-sqlite3-api
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18
-PORTREVISION=	1
+DISTVERSION=	0.17
+PORTREVISION=	2
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	SQLite3 API for Emacs 25+
 WWW=		https://github.com/pekingduck/emacs-sqlite3-api
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	pekingduck
 
 MAKE_ENV+=	LIB="-L${LOCALBASE}/lib -lsqlite3"
 
 CFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	README.org
 
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -f batch-byte-compile sqlite3.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlite3-api.so ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/sqlite3.el* ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile
index 9c1623da8995..a02cbe8d332c 100644
--- a/databases/emacsql-devel/Makefile
+++ b/databases/emacsql-devel/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	emacsql
-DISTVERSION=	3.1.1-64
+DISTVERSION=	3.1.1-43
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gfdcf447
+DISTVERSIONSUFFIX=	-g59de83a
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end (Development Version)
 WWW=		https://github.com/magit/emacsql
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
 BUILD_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
 		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
 		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-emacs_*
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 6891db040fd1..61558d54e1a2 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	pg.el
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.30
+DISTVERSION=	0.24
 PORTREVISION=	1
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	PostgreSQL Elisp interface
 WWW=		https://github.com/emarsden/pg-el
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emarsden
 GH_PROJECT=	pg-el
 
 CONFLICTS_INSTALL=	pg.el pg.el-emacs_* # share/doc/pg.el/README
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/pg.el \
 		${EMACS_VERSION_SITE_LISPDIR}/pg.elc
 
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile *.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index b6956f2d9392..97b0e1c68afb 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	clojure-cider
-PORTVERSION=	1.13.1
+PORTVERSION=	1.12.0
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Clojure IDE and REPL for Emacs
 WWW=		https://github.com/clojure-emacs/cider
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	clojure-mode.el${EMACS_PKGNAMESUFFIX}>0:lang/clojure-mode.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \
 		pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	cider
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/cider-client.el \
 		${EMACS_SITE_LISPDIR}/cider-eldoc.el \
 		${EMACS_SITE_LISPDIR}/cider-inspector.el \
 		${EMACS_SITE_LISPDIR}/cider-macroexpansion.el \
 		${EMACS_SITE_LISPDIR}/cider-mode.el \
 		${EMACS_SITE_LISPDIR}/cider-repl.el \
 		${EMACS_SITE_LISPDIR}/cider-scratch.el \
 		${EMACS_SITE_LISPDIR}/cider-selector.el \
 		${EMACS_SITE_LISPDIR}/cider-stacktrace.el \
 		${EMACS_SITE_LISPDIR}/cider-util.el \
 		${EMACS_SITE_LISPDIR}/cider.el \
 		${EMACS_SITE_LISPDIR}/nrepl-client.el
 
 do-install:
 .for f in ${PLIST_FILES:S,^${EMACS_SITE_LISPDIR}/,,}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile
index e6d406f622bf..520d34051306 100644
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.2-436
+DISTVERSION=	0.3.2-236
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-ga2b9227
+DISTVERSIONSUFFIX=	-g13959d3
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit (Development Version)
 WWW=		https://github.com/magit/forge
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql-devel@${EMACS_FLAVOR} \
 		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR} \
 		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.2:textproc/yaml.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	closql-devel${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql-devel@${EMACS_FLAVOR} \
 		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR} \
 		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.5.2:textproc/yaml.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="${LOAD_PATH}"
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS=	forge-emacs*
 
 NO_ARCH=	yes
 
 INFO=		forge
 PORTDOCS=	CHANGELOG README.org forge.html
 
 OPTIONS_DEFINE=	DOCS PDF
 OPTIONS_SUB=	yes
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 
 LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/forge.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/forge.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile
index ddac82f064fb..e4a61f840b7a 100644
--- a/devel/ghub-devel/Makefile
+++ b/devel/ghub-devel/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.6.0-14
+DISTVERSION=	3.6.0-8
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gc59de91
+DISTVERSIONSUFFIX=	-g0d7c81e
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Client libraries for the APIs of various Git forges
 WWW=		https://github.com/magit/ghub
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ARGS=	LOAD_PATH=" -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ."
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	ghub-emacs*
 
 NO_ARCH=	yes
 
 INFO=		ghub
 PORTDOCS=	CHANGELOG README.org ghub.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/ghub.pdf
 
 ELISP_FILES=	buck.el buck.elc ghub-autoloads.el ghub-graphql.el \
 		ghub-graphql.elc ghub.el ghub.elc glab.el glab.elc gogs.el \
 		gogs.elc gsexp.el gsexp.elc gtea.el gtea.elc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/ghub.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/ghub.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index f6cd7f45c7cd..6449e45b7a1a 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0-889
+DISTVERSION=	3.3.0-822
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g65ecb9c5
+DISTVERSIONSUFFIX=	-g5cf664cd
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Interface to Git for Emacs (Development Version)
 WWW=		https://magit.vc/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.3:devel/transient-devel@${EMACS_FLAVOR} \
 		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.3.2:editors/with-editor-devel@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.3:devel/transient-devel@${EMACS_FLAVOR} \
 		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.3.2:editors/with-editor-devel@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
 MAKE_ENV+=	docdir=${DOCSDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		INSTALL_INFO=install-info \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" \
 		VERSION=${PORTVERSION}
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 INSTALL_TARGET=	install-lisp install-info
 
 CONFLICTS_INSTALL=	magit-emacs*
 
 NO_ARCH=	yes
 
 INFO=		magit magit-section
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 PORTDOCS=	*.html *.md RelNotes/*
 
 OPTIONS_DEFINE=	DOCS LIBEGIT2 PDF
 OPTIONS_SUB=	yes
 
 LIBEGIT2_DESC=	Use libegit2 as backend (EXPERIMENTAL)
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=		gsed:textproc/gsed
 DOCS_ALL_TARGET=		html
 DOCS_BINARY_ALIAS=		sed=gsed
 LIBEGIT2_BUILD_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_BUILD_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_RUN_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_RUN_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_VARS=			MAKE_ENV+=BUILD_MAGIT_LIBGIT=true
 PDF_BUILD_DEPENDS=		texi2pdf:print/texinfo
 PDF_USES=			tex
 PDF_USE=			TEX=dvipdfmx:build
 PDF_ALL_TARGET=			pdf
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes
 	${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR}
 	${COPYTREE_SHARE} ${WRKSRC}/docs/RelNotes ${STAGEDIR}${DOCSDIR}/RelNotes
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile
index 03578088979e..a982331ac7d5 100644
--- a/devel/transient-devel/Makefile
+++ b/devel/transient-devel/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
+DISTVERSION=	0.4.3-45
 PORTREVISION=	1
-DISTVERSIONSUFFIX=
+DISTVERSIONSUFFIX=	-g9257245
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs key and popup interface for complex keybindings
 WWW=		https://github.com/magit/transient
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	transient-emacs*
 
 NO_ARCH=	yes
 
 INFO=		transient
 
 PORTDOCS=	CHANGELOG README.org transient.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/transient.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org ${WRKSRC}/CHANGELOG \
 		${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/transient.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/transient/Makefile b/devel/transient/Makefile
index 501b53d797c2..ab6dea5aff1b 100644
--- a/devel/transient/Makefile
+++ b/devel/transient/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
+DISTVERSION=	0.4.3
 PORTREVISION=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs key and popup interface for complex keybindings
 WWW=		https://github.com/magit/transient
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	transient-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		transient
 
 PORTDOCS=	CHANGELOG README.org transient.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/transient.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org ${WRKSRC}/CHANGELOG \
 		${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/transient.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile
index 28cf2b50ef50..1431a3f33284 100644
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.2-5
+DISTVERSION=	3.3.2-1
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g5db5f0e
+DISTVERSIONSUFFIX=	-gfcd186d
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 WWW=		https://github.com/magit/with-editor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	with-editor-emacs*
 
 NO_ARCH=	yes
 
 INFO=		with-editor
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc
 PORTDOCS=	README.org with-editor.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/with-editor.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org \
 		${WRKSRC}/docs/with-editor.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/with-editor.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 282301ba6632..23040873243c 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	ddskk
-DISTVERSION=	17.1.20230702
-PORTREVISION=	1
+DISTVERSION=	16.2
+PORTREVISION=	16
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
 		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
 		http://openlab.ring.gr.jp/skk/maintrunk/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 WWW=		http://openlab.ring.gr.jp/skk/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/READMEs/COPYING
 
 USES=		emacs
 
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
 		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
 		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
 ALL_TARGET=	elc info
 NO_ARCH=	yes
 
 INFO=		skk
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
 		${WRKSRC}/skk-setup.el.in
 
 pre-build:
 .for i in skk-lookup.el skk-jisx0213.el
 	@${MV} ${WRKSRC}/${i} ${WRKDIR}
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .for i in skk-lookup.el skk-jisx0213.el
 	${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja
 	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in Emacs.ad dot.emacs dot.skk
 	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 834fcdddfbeb..91d4a079ba13 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -1,117 +1,117 @@
 PORTNAME=	anubis
-PORTVERSION=	4.3
-PORTREVISION=	3
+PORTVERSION=	4.2
+PORTREVISION=	18
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Outgoing SMTP mail processor
 WWW=		https://www.gnu.org/software/anubis/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf charsetfix cpe localbase makeinfo \
 		pkgconfig shebangfix
 CHARSETFIX_MAKEFILEIN=	gnulib.mk
 CPE_VENDOR=	gnu
 SHEBANG_FILES=	contrib/msg2smtp.pl
 USE_RC_SUBR=	anubis
 GNU_CONFIGURE=	yes
 
 INFO=		anubis
 PORTEXAMPLES=	1anubisrc 2anubisrc
 
 OPTIONS_DEFINE=		NLS EXAMPLES EMACS GUILE GNUPG GNUTLS \
 			GSASL LIBWRAP PCRE PAM SOCKS TEST
 DB_DESC=		Database backend
 OPTIONS_GROUP=		DB
 OPTIONS_GROUP_DB=	GDBM MYSQL PGSQL
 OPTIONS_DEFAULT=	GDBM GNUPG GNUTLS GSASL GUILE
 OPTIONS_EXCLUDE_aarch64=TEST
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
 .if !exists(/usr/include/tcpd.h)
 OPTIONS_EXCLUDE+=	LIBWRAP
 .endif
 .if !exists(/usr/lib/libpam.so)
 OPTIONS_EXCLUDE+=	PAM
 .endif
 
 EMACS_DESC=		Install EMACS lisp files (requires emacs)
 EMACS_USES=		emacs:build
 EMACS_CONFIGURE_ON=	--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis
 EMACS_CONFIGURE_OFF=	--with-lispdir=no
 
 GDBM_IMPLIES=		GSASL
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
 GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme \
 			libgpg-error.so:security/libgpg-error
 GNUPG_CONFIGURE_WITH=	gpgme
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 GSASL_DESC=		GSASL support (required for databases)
 GSASL_LIB_DEPENDS=	libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
 GUILE_USES=		guile:1.8,alias
 GUILE_CONFIGURE_WITH=	guile
 GUILE_PORTEXAMPLES=	anubis.scm anubisrc.guile
 
 LIBWRAP_CONFIGURE_WITH=	tcp-wrappers
 
 MYSQL_IMPLIES=		GSASL
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_VARS=		REQUIRE+=mysql
 
 NLS_USES=		gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 
 PAM_CONFIGURE_WITH=	pam
 PAM_PORTEXAMPLES=	pam
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
 
 PGSQL_IMPLIES=		GSASL
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_VARS=		REQUIRE+=postgresql
 
 SOCKS_CONFIGURE_WITH=	socks-proxy
 
 .include <bsd.port.options.mk>
 
 # Default requirement for anubis rc script
 REQUIRE+=	mail
 SUB_LIST+=	REQUIRE="${REQUIRE}"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h
 	@${REINPLACE_CMD} -e 's,gdbm_db_,db_gdbm_,g' \
 		${WRKSRC}/src/anubisadm.c ${WRKSRC}/src/gdbm.c \
 		${WRKSRC}/src/headers.h ${WRKSRC}/src/main.c
 
 post-patch-TEST-off:
 	@${REINPLACE_CMD} -e 's| testsuite||' ${WRKSRC}/Makefile.am
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR}
 .if ${PORT_OPTIONS:MGUILE}
 	cd ${WRKSRC}/examples && \
 		${INSTALL_DATA} ${GUILE_PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MPAM}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam
 	${INSTALL_DATA} ${WRKSRC}/examples/pam/anubis* ${STAGEDIR}${EXAMPLESDIR}/pam
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/coq/Makefile b/math/coq/Makefile
index b249ca3c3965..04b86ca11c08 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	coq
-PORTVERSION=	8.19
-PORTREVISION=	1
+PORTVERSION=	8.6
+PORTREVISION=	20
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
 		ftp://ftp.stack.nl/pub/users/johans/coq/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Theorem prover based on lambda-C
 WWW=		https://coq.inria.fr/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
 BROKEN_armv7=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
 
 BUILD_DEPENDS=	camlp5:devel/ocaml-camlp5 \
 		ocamlfind:devel/ocaml-findlib \
 		${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/stublibs/dllnums.so:math/ocaml-num
 
 USES=		emacs gettext-runtime gmake gnome
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 pango
 USE_LDCONFIG=	${PREFIX}/lib/coq
 USE_OCAML=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-mandir ${PREFIX}/man \
 		-emacslib ${PREFIX}/share/emacs/site-lisp/coq \
 		-usecamlp5 \
 		-byteonly
 MAKE_ENV=	VERBOSE=1 USERFLAGS=-unsafe-string
 ALL_TARGET=	world
 
 CONFLICTS_INSTALL=	coq coq-emacs_* # bin/coq-tex bin/coq_makefile bin/coqc bin/coqchk bin/coqdep bin/coqdoc bin/coqide bin/coqmktop bin/coqtop bin/coqtop.byte bin/coqwc bin/coqworkmgr bin/gallina
 
 OPTIONS_DEFINE=		DOCS IDE
 OPTIONS_DEFAULT=	IDE
 OPTIONS_SUB=		yes
 IDE_DESC=		Include desktop environment (coqide)
 IDE_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_CONFIGURE_OFF=	-coqide no
 DOCS_USES=		tex
 DOCS_USE=		TEX=latex:build,dvipsk:build
 DOCS_BUILD_DEPENDS=	hevea:textproc/hevea
 DOCS_CONFIGURE_OFF=	-with-doc no
 
 STRIP_FILES=		lib/coq/dllcoqrun.so
 
 # Workaround bsd.ocaml.mk to fix packaging
 add-plist-post:
 	@${DO_NADA}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' \
 		${WRKSRC}/Makefile.doc
 # Allow passing USERFLAGS down to inner make(1) via environment
 	@${REINPLACE_CMD} -e '/User compilation flag/,+1d' \
 		${WRKSRC}/configure.ml
 
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${STRIP_FILES}
 
 .include <bsd.port.mk>
diff --git a/math/ess/Makefile b/math/ess/Makefile
index bb2ba8dd472e..d450b09dcb78 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	ess
-DISTVERSION=	24.01.1
-PORTREVISION=	1
+DISTVERSION=	18.10.2
+PORTREVISION=	18
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	R support for Emacsen
 WWW=		https://ess.r-project.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	R:math/R
 
 USES=		emacs gmake makeinfo perl5 tar:tgz
 USE_PERL5=	build
 
 NO_ARCH=	yes
 
 INFO=		ess
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DESTDIR|#DESTDIR| ; \
 		 s|^PREFIX|#PREFIX| ; \
 		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
 		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
 		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
 	@${REINPLACE_CMD} -e \
 		"s|require 'cl)|require 'cl-lib)|g" \
 		${WRKSRC}/lisp/julia-mode.el
 	@${REINPLACE_CMD} -e \
 		"/require 'cl)/d" \
 		${WRKSRC}/lisp/ess-tracebug.el \
 		${WRKSRC}/lisp/ess.el \
 
 post-install:
 	@${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
 
 .include <bsd.port.mk>
diff --git a/misc/compat.el/Makefile b/misc/compat.el/Makefile
index 4981c14d388e..65790972c6e8 100644
--- a/misc/compat.el/Makefile
+++ b/misc/compat.el/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	compat.el
-DISTVERSION=	29.1.4.5
+DISTVERSION=	29.1.4.4
 PORTREVISION=	1
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Compatibility library for Emacs Lisp
 WWW=		https://github.com/emacs-compat/compat
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-compat
 GH_PROJECT=	compat
 
 ALL_TARGET=	all compat.info
 
 NO_ARCH=	yes
 
 INFO=		compat
 PORTDOCS=	NEWS.org README.md
 
 OPTIONS_DEFINE=	DOCS
 
 ELISP_FILES=	compat-25.el compat-25.elc compat-26.el compat-26.elc \
 		compat-27.el compat-27.elc compat-28.el compat-28.elc \
 		compat-29.el compat-29.elc compat-macs.el compat.el compat.elc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat
 	${INSTALL_DATA}  ${ELISP_FILES:C/^/${WRKSRC}\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat
 	${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/yaml.el/Makefile b/textproc/yaml.el/Makefile
index 192343670363..dab174306d83 100644
--- a/textproc/yaml.el/Makefile
+++ b/textproc/yaml.el/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	yaml.el
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.5
+DISTVERSION=	0.5.4
 PORTREVISION=	1
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	YAML parser in Elisp
 WWW=		https://github.com/zkry/yaml.el
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	zkry
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/yaml.el \
 		${EMACS_VERSION_SITE_LISPDIR}/yaml.elc
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile yaml.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} yaml.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-test:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -l ert -l yaml.el \
 	-l yaml-tests.el -f ert-run-tests-batch-and-exit)
 
 .include <bsd.port.mk>