diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index c35db7eefe47..09ecdca2fde1 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	mc
 PORTVERSION=	4.8.28
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		https://ftp.osuosl.org/pub/midnightcommander/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Midnight Commander, a free Norton Commander clone
 WWW=		https://midnight-commander.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	zip:archivers/zip
 
 .if ${:!diff --version 2>/dev/null | grep -c GNU\ diffutils || :!} < 1
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
 RUN_DEPENDS+=	gdiff:textproc/diffutils
 .endif
 
 USES=		gmake gnome libtool perl5 pkgconfig python shebangfix tar:xz
 SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
 		${WRKSRC}/src/vfs/extfs/helpers/uc1541
 python_OLD_CMD=	@PYTHON@
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
 
 PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt
 
 OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS SFTP SUBSHELL X11
 OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_SINGLE_SCREEN=	SLANG NCURSES
 OPTIONS_SUB=	yes
 
 ASPELL_DESC=	Aspell support for internal editor
 EDITOR_DESC=	Build with internal text editor
 EXTATTR_DESC=	Extended filesystem attributes support
 SCREEN_DESC=	Screen library
 SFTP_DESC=	Support for SFTP (via libssh)
 SUBSHELL_DESC=	Build with subshell support
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=aspell
 
 EDITOR_CONFIGURE_WITH=	internal-edit
 
-EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs
+EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs-core
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	charset
 
 NCURSES_CONFIGURE_ON=	--with-screen=ncurses
 NCURSES_CFLAGS+=	-DNCURSES_WIDECHAR
 
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
 SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
 SFTP_CONFIGURE_ENABLE=	vfs-sftp
 
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_ON=	--with-screen=slang
 
 SUBSHELL_CONFIGURE_WITH=subshell
 SUBSHELL_SUB_FILES=	pkg-message
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		xorg=x11,xext
 X11_VARS=		CONFLICTS_INSTALL=mc-nox11
 X11_VARS_OFF=		CONFLICTS_INSTALL=mc PKGNAMESUFFIX=-nox11
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|clang||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|x$$UNRAR_VERSION.*x|$$UNRAR_VERSION -ge |' \
 		${WRKSRC}/src/vfs/extfs/helpers/urar.in
 
 post-patch-EXTATTR-off:
 	@${REINPLACE_CMD} -e '/found_e2p=/s|yes|disabled|; /e2p library/ \
 		{ s| or|,|; s|)|&, or disabled|; }' ${WRKSRC}/configure
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${LN} -sf ../${PORTDOCS:[1]} ${WRKSRC}/doc
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-X11-on:
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/e2tools/Makefile b/sysutils/e2tools/Makefile
index 3bef62a2d4fe..52747ee78c79 100644
--- a/sysutils/e2tools/Makefile
+++ b/sysutils/e2tools/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	e2tools
 DISTVERSION=	0.1.0
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	fuz@fuz.su
 COMMENT=	Utilities to manipulate files in an ext2/ext3 filesystem
 WWW=		https://e2tools.github.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libext2fs.so:sysutils/e2fsprogs
+LIB_DEPENDS=	libext2fs.so:sysutils/e2fsprogs-core
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile
index fb45f17bd7d8..c7e56f560413 100644
--- a/sysutils/unetbootin/Makefile
+++ b/sysutils/unetbootin/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	unetbootin
 PORTVERSION=	702
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Bootable Live USB creator for various Linux distributions
 WWW=		https://unetbootin.github.io/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	7zz:archivers/7-zip \
 		syslinux:sysutils/syslinux \
-		mke2fs:sysutils/e2fsprogs
+		mke2fs:sysutils/e2fsprogs-core
 
 USES=		qt:5
 USE_QT=		buildtools:build linguisttools:build qmake:build \
 		core gui network widgets
 QMAKE_ARGS=	DEFINES+=LOCALBASE=\\\\\\\"${LOCALBASE}\\\\\\\"
 
 NO_WRKSUBDIR=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/,${PREFIX}/,g' \
 		${WRKSRC}/main.cpp
 	@${REINPLACE_CMD} -e 's,this->setWindowTitle(UNETBOOTINB,& \
 		" ${PORTVERSION}",' ${WRKSRC}/unetbootin.cpp
 
 do-configure:
 	cd ${CONFIGURE_WRKSRC} && ${LUPDATE} unetbootin.pro \
 		     && ${LRELEASE} unetbootin.pro \
 		     && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unetbootin ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/unetbootin.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/unetbootin_*.qm ${STAGEDIR}${DATADIR}
 .for n in 16 22 24 32 48 64 128 192 256 512
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps
 	${INSTALL_DATA} ${WRKSRC}/unetbootin_${n}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/unetbootin.png
 .endfor
 
 .include <bsd.port.mk>