diff --git a/sysutils/createrepo_c/Makefile b/sysutils/createrepo_c/Makefile
index 33d962dd8e84..2bee78304c8d 100644
--- a/sysutils/createrepo_c/Makefile
+++ b/sysutils/createrepo_c/Makefile
@@ -2,6 +2,10 @@ PORTNAME=	createrepo_c
 DISTVERSION=	1.1.4
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/rpm-software-management/createrepo_c/commit/
+PATCHFILES=	054d55f98debe11bf85aaf81c31c42da72371e21.patch:-p1 \
+		22fe35c79136c175facbf2d1d649f55321633155.patch:-p1
+
 MAINTAINER=	ktk@netlabs.org
 COMMENT=	C implementation of createrepo
 WWW=		http://rpm-software-management.github.io/createrepo_c/
@@ -16,31 +20,22 @@ LIB_DEPENDS=	librpm.so:archivers/rpm4 \
 		libzstd.so:archivers/zstd
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		cmake pkgconfig shebangfix sqlite
-
-USE_GNOME=	libxml2
+USES=		cmake:testing gnome pathfix pkgconfig shebangfix sqlite ssl
+SHEBANG_FILES=	tests/run_tests.sh.in
+USE_GNOME=	glib20 libxml2
+USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rpm-software-management
 
-CMAKE_OFF=	ENABLE_PYTHON
+LDFLAGS=	-Wl,--as-needed
 
-SHEBANG_FILES=	tests/run_tests.sh.in
-
-USE_LDCONFIG=	yes
+CMAKE_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen \
+		ENABLE_PYTHON
 
 post-patch:
 	${REINPLACE_CMD} \
-		'/pkg_check_modules/s|REQUIRED|REQUIRED IMPORTED_TARGET|' \
-		${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}/tests/CMakeLists.txt; \
-	done
-
-do-test:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} tests && ${MAKE_CMD} test
+	    -e 's|TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::DRPM)||' \
+	    ${WRKSRC}/src/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/createrepo_c/distinfo b/sysutils/createrepo_c/distinfo
index a6910eb10c12..7a433ae36279 100644
--- a/sysutils/createrepo_c/distinfo
+++ b/sysutils/createrepo_c/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1727704540
+TIMESTAMP = 1728007966
 SHA256 (rpm-software-management-createrepo_c-1.1.4_GH0.tar.gz) = b4f020ef0400e3f9840d37d16238bda2b529b47749dcea6f43c9038056c64669
 SIZE (rpm-software-management-createrepo_c-1.1.4_GH0.tar.gz) = 638216
+SHA256 (054d55f98debe11bf85aaf81c31c42da72371e21.patch) = 1444d19e306de6fc6f3172db56998279904d35af589ed7866941d087575cb740
+SIZE (054d55f98debe11bf85aaf81c31c42da72371e21.patch) = 10607
+SHA256 (22fe35c79136c175facbf2d1d649f55321633155.patch) = d2cfd8495ec2c468c6395fc4c69e52a7d838322db7d43a026ab7eb6dd1d758b6
+SIZE (22fe35c79136c175facbf2d1d649f55321633155.patch) = 721
diff --git a/sysutils/createrepo_c/files/patch-CMakeLists.txt b/sysutils/createrepo_c/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..e88a0f9fbf6a
--- /dev/null
+++ b/sysutils/createrepo_c/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2024-10-04 02:41:38 UTC
++++ CMakeLists.txt
+@@ -157,4 +157,6 @@ ENABLE_TESTING()
+ ADD_SUBDIRECTORY (src)
+ ADD_SUBDIRECTORY (doc)
+ ENABLE_TESTING()
+-ADD_SUBDIRECTORY (tests EXCLUDE_FROM_ALL)
++IF (BUILD_TESTING)
++    ADD_SUBDIRECTORY (tests)
++ENDIF()
diff --git a/sysutils/createrepo_c/files/patch-doc_CMakeLists.txt b/sysutils/createrepo_c/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..0a1ece7220ed
--- /dev/null
+++ b/sysutils/createrepo_c/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- doc/CMakeLists.txt.orig	2024-10-04 02:15:24 UTC
++++ doc/CMakeLists.txt
+@@ -14,5 +14,5 @@ ENDIF(CREATEREPO_C_INSTALL_MANPAGES)
+             COMPONENT bin)
+ ENDIF(CREATEREPO_C_INSTALL_MANPAGES)
+ 
+-ADD_CUSTOM_TARGET (doc)
+-ADD_DEPENDENCIES (doc doc-python doc-c)
++#ADD_CUSTOM_TARGET (doc)
++#ADD_DEPENDENCIES (doc doc-python doc-c)
diff --git a/sysutils/createrepo_c/files/patch-src_compression__wrapper.c b/sysutils/createrepo_c/files/patch-src_compression__wrapper.c
index 89906a22ce47..e69de29bb2d1 100644
--- a/sysutils/createrepo_c/files/patch-src_compression__wrapper.c
+++ b/sysutils/createrepo_c/files/patch-src_compression__wrapper.c
@@ -1,10 +0,0 @@
---- src/compression_wrapper.c.orig	2024-08-14 21:41:31 UTC
-+++ src/compression_wrapper.c
-@@ -35,6 +35,7 @@
- #include "error.h"
- #include "compression_wrapper.h"
- #include <zstd.h>
-+#include <unistd.h>  // FreeBSD: Add STDOUT_FILENO
- 
- 
- #define ERR_DOMAIN                      CREATEREPO_C_ERROR