diff --git a/sysutils/createrepo_c/Makefile b/sysutils/createrepo_c/Makefile
index 33d962dd8e84..ba3fe4a76c83 100644
--- a/sysutils/createrepo_c/Makefile
+++ b/sysutils/createrepo_c/Makefile
@@ -1,46 +1,50 @@
 PORTNAME=	createrepo_c
 DISTVERSION=	1.1.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	ktk@netlabs.org
 COMMENT=	C implementation of createrepo
 WWW=		http://rpm-software-management.github.io/createrepo_c/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librpm.so:archivers/rpm4 \
 		libcurl.so:ftp/curl \
 		libmodulemd.so:misc/libmodulemd \
+		libpopt.so:devel/popt \
 		libzck.so:archivers/zchunk \
 		libzstd.so:archivers/zstd
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		cmake pkgconfig shebangfix sqlite
+USES=		cmake:testing gnome pathfix pkgconfig shebangfix sqlite ssl
 
-USE_GNOME=	libxml2
+USE_GNOME=	glib20 libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rpm-software-management
 
+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 CMAKE_OFF=	ENABLE_PYTHON
 
 SHEBANG_FILES=	tests/run_tests.sh.in
 
 USE_LDCONFIG=	yes
 
 post-patch:
 	${REINPLACE_CMD} \
-		'/pkg_check_modules/s|REQUIRED|REQUIRED IMPORTED_TARGET|' \
+		-e '/pkg_check_modules/s|REQUIRED|REQUIRED IMPORTED_TARGET|' \
+		-e 's|EXCLUDE_FROM_ALL||' \
 		${WRKSRC}/CMakeLists.txt
 	for m in GLIB2 GIO GTHREAD2 LIBMODULEMD LZMA SQLITE3 RPM ZCK ZSTD; do \
 		${REINPLACE_CMD} \
 			"s/\$${$${m}_LIBRARIES}/PkgConfig::$${m}/" \
-			${WRKSRC}/src/CMakeLists.txt \
+			${WRKSRC}/src/CMakeLists.txt; \
+	done
+	for m in GLIB2; do \
+		${REINPLACE_CMD} \
+			"s/\$${$${m}_LIBRARIES}/PkgConfig::$${m}/" \
 			${WRKSRC}/tests/CMakeLists.txt; \
 	done
 
-do-test:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} tests && ${MAKE_CMD} test
-
 .include <bsd.port.mk>