diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile
index 9b05009f802b..0c3c99c853ce 100644
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.0-41
-DISTVERSIONSUFFIX=	-gdf74385
+DISTVERSION=	3.3.0
+DISTVERSIONSUFFIX=
 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/editors/with-editor-devel/distinfo b/editors/with-editor-devel/distinfo
index a665afb41370..4557add75b8d 100644
--- a/editors/with-editor-devel/distinfo
+++ b/editors/with-editor-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683780276
-SHA256 (magit-with-editor-v3.2.0-41-gdf74385_GH0.tar.gz) = 0314b55eb9be423da4b604d3ea78acf605845f1c4ada161faece75554e0f1e8a
-SIZE (magit-with-editor-v3.2.0-41-gdf74385_GH0.tar.gz) = 33294
+TIMESTAMP = 1683961081
+SHA256 (magit-with-editor-v3.3.0_GH0.tar.gz) = e6c05922b00b08d87f9c22d745a4e830fef84c36564efb39d977aacaab6221d0
+SIZE (magit-with-editor-v3.3.0_GH0.tar.gz) = 33250
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index de0ca17b9ff4..704e0e443ae3 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,59 +1,63 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.0
-PORTREVISION=	6
+DISTVERSION=	3.3.0
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${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-devel-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=	AUTHORS.md README.md with-editor.html
+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.md ${WRKSRC}/docs/AUTHORS.md \
+	${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/editors/with-editor/distinfo b/editors/with-editor/distinfo
index 1f8a17b9b843..5b07210db642 100644
--- a/editors/with-editor/distinfo
+++ b/editors/with-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644621196
-SHA256 (magit-with-editor-v3.2.0_GH0.tar.gz) = 0a0e0c3ef83e4be58387432c3d5f620ff38390d4fc1acae473347bae4344287d
-SIZE (magit-with-editor-v3.2.0_GH0.tar.gz) = 32146
+TIMESTAMP = 1683961286
+SHA256 (magit-with-editor-v3.3.0_GH0.tar.gz) = e6c05922b00b08d87f9c22d745a4e830fef84c36564efb39d977aacaab6221d0
+SIZE (magit-with-editor-v3.3.0_GH0.tar.gz) = 33250