diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile
index d583de2811dd..6bbcb17bcdbf 100644
--- a/devel/ding-libs/Makefile
+++ b/devel/ding-libs/Makefile
@@ -1,43 +1,32 @@
 PORTNAME=	ding-libs
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.2
 CATEGORIES=	devel
-MASTER_SITES=	https://releases.pagure.org/SSSD/ding-libs/ \
-		LOCAL/tobik/ding-libs
-DIST_SUBDIR=	ding-libs
-
-# Build fixes for non-Linux systems
-PATCH_SITES=	LOCAL/tobik/ding-libs \
-		https://pagure.io/SSSD/ding-libs/c/
-PATCHFILES=	8fc522605a90e670fe76dc1b44669230c121a96e.patch:-p1 \
-		72c19bd018b107ecf5a80963b433e9922f7243fd.patch:-p1 \
-		315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch:-p1 \
-		be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch:-p1 \
-		a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch:-p1
+MASTER_SITES=	https://github.com/SSSD/ding-libs/releases/download/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of useful libraries for developers
-WWW=		https://pagure.io/SSSD/ding-libs/
+WWW=		https://github.com/SSSD/ding-libs/
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 
 USES=		iconv gettext-runtime libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 CONFIGURE_ENV=	DOXYGEN=""
 LIBS+=		${ICONV_LIB} -lintl
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS TEST
 
 # libcheck is required to run *all* the unit tests.
 # Without it only 14/20 tests will run.
 TEST_BUILD_DEPENDS=	check>=0:devel/check
 TEST_USES=		pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/ding-libs/distinfo b/devel/ding-libs/distinfo
index b651578af857..dc5580e82495 100644
--- a/devel/ding-libs/distinfo
+++ b/devel/ding-libs/distinfo
@@ -1,13 +1,3 @@
-TIMESTAMP = 1527583392
-SHA256 (ding-libs/ding-libs-0.6.1.tar.gz) = a319a327deb81f2dfab9ce4a4926e80e1dac5dcfc89f4c7e548cec2645af27c1
-SIZE (ding-libs/ding-libs-0.6.1.tar.gz) = 904092
-SHA256 (ding-libs/8fc522605a90e670fe76dc1b44669230c121a96e.patch) = d1f5265adb08915349c7bda9dad80fd3dc50b87e39da89a5380b9e36fd54b5ca
-SIZE (ding-libs/8fc522605a90e670fe76dc1b44669230c121a96e.patch) = 1604
-SHA256 (ding-libs/72c19bd018b107ecf5a80963b433e9922f7243fd.patch) = 7d0423031d45b78fdadc4a927333da76d1f0bdc3f83a0fe7cd4f3b1bc1b6cb42
-SIZE (ding-libs/72c19bd018b107ecf5a80963b433e9922f7243fd.patch) = 1568
-SHA256 (ding-libs/315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch) = 0b4df91d6c8bec9732375f79bd007af0690871c6eeff06d748f946294379abb8
-SIZE (ding-libs/315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch) = 991
-SHA256 (ding-libs/be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch) = e129950a3bee6498f60ce9db7c98b8ce0e974cfea032a717ae06fa748f872c0c
-SIZE (ding-libs/be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch) = 4037
-SHA256 (ding-libs/a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch) = d39a70ecb642c5fc6ccec16e4d9a3e32ec672497a9e3ea9e9844a8e553214611
-SIZE (ding-libs/a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch) = 862
+TIMESTAMP = 1763824955
+SHA256 (ding-libs-0.6.2.tar.gz) = e5f07f34f5921bcb5ccccfe3751c28497879a6451cd7b395e99e24d9b5728e8d
+SIZE (ding-libs-0.6.2.tar.gz) = 957577
diff --git a/devel/ding-libs/files/patch-configure b/devel/ding-libs/files/patch-configure
deleted file mode 100644
index 6240169e6680..000000000000
--- a/devel/ding-libs/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-Get rid of bashism
-
-https://pagure.io/SSSD/ding-libs/c/90f715c882a715f8cb827db14167ce8976a0fcd9
-
---- configure.orig	2017-09-22 15:44:32 UTC
-+++ configure
-@@ -12658,7 +12658,7 @@ BASICOBJECTS_VERSION=0.1.1
- INI_CONFIG_VERSION=1.3.1
- 
- 
-- if git log -1 &>/dev/null; then
-+ if git log -1 > /dev/null 2>&1; then
-   GIT_CHECKOUT_TRUE=
-   GIT_CHECKOUT_FALSE='#'
- else
diff --git a/devel/ding-libs/files/patch-ini_ini__save__ut.c b/devel/ding-libs/files/patch-ini_ini__save__ut.c
deleted file mode 100644
index f99502e67592..000000000000
--- a/devel/ding-libs/files/patch-ini_ini__save__ut.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ini/ini_save_ut.c.orig	2018-05-29 07:31:23 UTC
-+++ ini/ini_save_ut.c
-@@ -180,7 +180,7 @@ static int basic_test(void)
-                  (srcdir == NULL) ? "." : srcdir,
-                  cmp_files[i]);
- 
--        snprintf(command, PATH_MAX * 3, "cmp -l -b %s %s", resname, cmpname);
-+        snprintf(command, PATH_MAX * 3, "cmp -l %s %s", resname, cmpname);
-         error = system(command);
-         if ((error) || (WEXITSTATUS(error))) {
-             printf("Failed to compare files %d %d.\n",  error,
diff --git a/devel/ding-libs/files/patch-path__utils_path__utils__ut.c b/devel/ding-libs/files/patch-path__utils_path__utils__ut.c
deleted file mode 100644
index d4183d1444bc..000000000000
--- a/devel/ding-libs/files/patch-path__utils_path__utils__ut.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- path_utils/path_utils_ut.c.orig	2018-05-29 08:04:46 UTC
-+++ path_utils/path_utils_ut.c
-@@ -62,7 +62,7 @@ START_TEST(test_dirname)
-     fail_unless_str_equal(p, "//foo");
- 
-     fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS);
--    fail_unless_str_equal(p, "//");
-+    fail_unless_str_equal(p, "/");
- 
-     fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS);
-     fail_unless_str_equal(p, "foo");