diff --git a/editors/textadept/Makefile b/editors/textadept/Makefile
index 19679b66c2cb..92da4da66cb4 100644
--- a/editors/textadept/Makefile
+++ b/editors/textadept/Makefile
@@ -1,88 +1,87 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	textadept
 PORTVERSION=	11.1
 DISTVERSIONPREFIX=	${PORTNAME}_
 CATEGORIES=	editors
 MASTER_SITES=	https://www.scintilla.org/:sci \
 		http://www.lua.org/ftp/:lua \
 		http://www.inf.puc-rio.br/~roberto/lpeg/:lpeg
 DISTFILES=	scintilla${SCI_VER}.tgz:sci \
 		lua-${LUA_VER}.tar.gz:lua \
 		lpeg-${LPEG_VER}.tar.gz:lpeg
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Fast, minimalist, extensible cross-platform text editor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++17-lang desktop-file-utils gmake gnome iconv \
 		pkgconfig
 USE_CXXSTD=	c++17
 USE_GNOME=	cairo gdkpixbuf2 glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	orbitalquark keplerproject:lfs
 GH_PROJECT=	scintillua:scilua luafilesystem:lfs gtdialog:gtd
 GH_TAGNAME=	scintillua_${SCILUA_VER}:scilua v${LFS_VER}:lfs \
 		${GTD_HASH}:gtd
 
 SCI_VER=	446
 SCILUA_VER=	4.4.5-2
 LUA_VER=	5.3.5
 LPEG_VER=	1.0.2
 LFS_VER=	1_8_0
 GTD_HASH=	6458754
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		UI
 OPTIONS_SINGLE_UI=	GTK2 GTK3
 OPTIONS_DEFAULT=	GTK2
 
 UI_DESC=	GTK version
 GTK2_USE=	GNOME=gtk20
 GTK3_USE=	GNOME=gtk30
 GTK3_MAKE_ARGS=	GTK3=yes
 
 # HTML files require patched https://keplerproject.github.io/luadoc/ to
 # build, which is also seemingly deprecated upstream, so just grab them
 # from the textadept package for GNU/Linux.
 DOCS_MASTER_SITES=	https://github.com/orbitalquark/${PORTNAME}/releases/download/${PORTNAME}_${PORTVERSION}/:docs
 DOCS_DISTFILES=		${PORTNAME}_${PORTVERSION}.linux.tgz:docs
 
 post-patch:
 	${LN} -s ${WRKDIR}/scintilla ${BUILD_WRKSRC}
 	${PATCH} -d ${BUILD_WRKSRC}/scintilla -N -p1 < \
 		${BUILD_WRKSRC}/scintilla.patch
 	${LN} -s ${WRKDIR}/lua-${LUA_VER} ${BUILD_WRKSRC}/lua
 	${PATCH} -d ${BUILD_WRKSRC}/lua -N -p1 < \
 		${BUILD_WRKSRC}/lua.patch
 	${LN} -s ${WRKSRC_scilua}/*.cxx ${WRKSRC_scilua}/*.h \
 		${BUILD_WRKSRC}
 	${LN} -s ${WRKSRC_scilua}/lexers ${BUILD_WRKSRC}/..
 	${RM} -r ${WRKSRC_scilua}/lexers/themes
 	@${MKDIR} ${BUILD_WRKSRC}/lua/src/lib
 	${LN} -s ${WRKDIR}/lpeg-${LPEG_VER}/*.[ch] ${BUILD_WRKSRC}/lua/src/lib
 	${LN} -s ${WRKDIR}/luafilesystem-${LFS_VER}/src/*.[ch] \
 		${BUILD_WRKSRC}/lua/src/lib
 	${LN} -s ${WRKDIR}/gtdialog-${GTD_HASH} ${BUILD_WRKSRC}/gtdialog
 # Fix build with glib 2.68.3: see https://github.com/orbitalquark/textadept/issues/110
 	${REINPLACE_CMD} -e '/static volatile/s|volatile||g' \
 		${BUILD_WRKSRC}/scintilla/gtk/ScintillaGTKAccessible.cxx
 
 post-install-DOCS-on:
 	${INSTALL_DATA} \
 		${WRKDIR}/${PORTNAME}_${PORTVERSION}.linux/docs/*.html \
 		${STAGEDIR}${DATADIR}/docs
 	${MV} ${STAGEDIR}${DATADIR}/docs ${STAGEDIR}${DOCSDIR}
 	${LN} -sf ../../${DOCSDIR_REL} ${STAGEDIR}${DATADIR}/docs
 
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${DATADIR}/docs
 
 .include <bsd.port.mk>
diff --git a/editors/textadept/distinfo b/editors/textadept/distinfo
index 8e4c6e9e6f91..b18d44d3d72e 100644
--- a/editors/textadept/distinfo
+++ b/editors/textadept/distinfo
@@ -1,17 +1,17 @@
 TIMESTAMP = 1611945515
-SHA256 (textadept/scintilla446.tgz) = 2df9306ec4539f4fe13f86bab8f2419ba90464933d7cca846d7bb6e7046ec2dc
-SIZE (textadept/scintilla446.tgz) = 1640227
-SHA256 (textadept/lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
-SIZE (textadept/lua-5.3.5.tar.gz) = 303543
-SHA256 (textadept/lpeg-1.0.2.tar.gz) = 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe
-SIZE (textadept/lpeg-1.0.2.tar.gz) = 71840
-SHA256 (textadept/textadept_11.1.linux.tgz) = 6b7fa0bc8c3490fa3ee28897735b995f0999f1cdeb93033f51d0c27add706fbe
-SIZE (textadept/textadept_11.1.linux.tgz) = 4672969
-SHA256 (textadept/orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a
-SIZE (textadept/orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 2448453
-SHA256 (textadept/keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495
-SIZE (textadept/keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 30374
-SHA256 (textadept/orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 8d891c982c2cbfca3a12c971f66e6c7593dc1daeca1696b93929a32048da1033
-SIZE (textadept/orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 227796
-SHA256 (textadept/orbitalquark-gtdialog-6458754_GH0.tar.gz) = a43b015281e43a6b9f7c96df009b6df037ab00896348e11a980a557b1d886b17
-SIZE (textadept/orbitalquark-gtdialog-6458754_GH0.tar.gz) = 331729
+SHA256 (scintilla446.tgz) = 2df9306ec4539f4fe13f86bab8f2419ba90464933d7cca846d7bb6e7046ec2dc
+SIZE (scintilla446.tgz) = 1640227
+SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
+SIZE (lua-5.3.5.tar.gz) = 303543
+SHA256 (lpeg-1.0.2.tar.gz) = 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe
+SIZE (lpeg-1.0.2.tar.gz) = 71840
+SHA256 (textadept_11.1.linux.tgz) = 6b7fa0bc8c3490fa3ee28897735b995f0999f1cdeb93033f51d0c27add706fbe
+SIZE (textadept_11.1.linux.tgz) = 4672969
+SHA256 (orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a
+SIZE (orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 2448453
+SHA256 (keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495
+SIZE (keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 30374
+SHA256 (orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 8d891c982c2cbfca3a12c971f66e6c7593dc1daeca1696b93929a32048da1033
+SIZE (orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 227796
+SHA256 (orbitalquark-gtdialog-6458754_GH0.tar.gz) = a43b015281e43a6b9f7c96df009b6df037ab00896348e11a980a557b1d886b17
+SIZE (orbitalquark-gtdialog-6458754_GH0.tar.gz) = 331729