diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index 84a3ef4f7b06..2398c265dd87 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -1,29 +1,36 @@
 PORTNAME=	di
-DISTVERSION=	4.53
+DISTVERSION=	6.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/diskinfo-di
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Disk Information Utility
 WWW=		https://diskinfo-di.sourceforge.io/
 
 LICENSE=	ZLIB
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		perl5
-USE_PERL5=	test
+USES=		cmake pathfix pkgconfig
+USE_LDCONFIG=	yes
 
-MAKE_ARGS=	-e
-MAKE_ENV=	prefix="${PREFIX}"
-TEST_TARGET=	test
+OPTIONS_DEFINE=		NLS
+OPTIONS_DEFAULT=	INTERNAL
+OPTIONS_SINGLE=		MATH
+OPTIONS_SINGLE_MATH=	GMP INTERNAL LIBTOMMATH
+OPTIONS_SUB=		yes
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
+INTERNAL_DESC=		Use internal math support
+LIBTOMMATH_DESC=	libtommath support
 
-NLS_USES=		gettext
-NLS_MAKE_ENV_OFF=	DI_NO_NLS=T
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
+GMP_CONFIGURE_ENV=	DI_USE_MATH="DI_GMP"
 
-pre-install:
-	@${STRIP_CMD} ${WRKSRC}/C/di
+INTERNAL_CONFIGURE_ENV=	DI_USE_MATH="DI_INTERNAL"
+
+LIBTOMMATH_LIB_DEPENDS=		libtommath.so:math/libtommath
+LIBTOMMATH_CONFIGURE_ENV=	DI_USE_MATH="DI_TOMMATH"
+
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Intl:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/sysutils/di/distinfo b/sysutils/di/distinfo
index a3985318ee6d..784aa776c64c 100644
--- a/sysutils/di/distinfo
+++ b/sysutils/di/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720237886
-SHA256 (di-4.53.tar.gz) = 00dd5befc11dac8d65a68b248fd34158a2e6a850c2e4e2ab77594c79aa01e83e
-SIZE (di-4.53.tar.gz) = 200828
+TIMESTAMP = 1745810354
+SHA256 (di-6.0.0.tar.gz) = 7b663e4db044b1fa4986bd018f827c18e96fe6d1f9a36732dcbb0450e7f518cb
+SIZE (di-6.0.0.tar.gz) = 133060
diff --git a/sysutils/di/files/patch-C-Makefile b/sysutils/di/files/patch-C-Makefile
deleted file mode 100644
index 92fd828d75c2..000000000000
--- a/sysutils/di/files/patch-C-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/Makefile.orig	2024-06-24 00:49:39 UTC
-+++ C/Makefile
-@@ -42,7 +42,7 @@ TEST = test
- ###
- # installation options
- #
--prefix = /usr/local
-+prefix ?= /usr/local
- PREFIX = $(prefix)
- BINDIR = $(PREFIX)/bin
- DATADIR = $(PREFIX)/share
diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile
deleted file mode 100644
index cc43dcc0b0e9..000000000000
--- a/sysutils/di/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2024-06-24 00:49:39 UTC
-+++ Makefile
-@@ -34,7 +34,7 @@ MKC_DIR = ./mkconfig
- ###
- # installation options
- #
--prefix = /usr/local
-+prefix ?= /usr/local
- PREFIX = $(prefix)
- PROG = di
- MPROG = mi
-@@ -152,7 +152,7 @@ install-prog:
- 	$(TEST) -d $(INST_BINDIR) || $(MKDIR) $(INST_BINDIR)
- 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(DITARGET)
- 	-$(RM) -f $(MTARGET) > /dev/null 2>&1
--	-$(LN) -s $(DITARGET) $(MTARGET)
-+	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
- 	@-test -f $(FROMDIR)/config.h && \
- 		grep '^#define _enable_nls 1' $(FROMDIR)/config.h >/dev/null 2>&1 && \
- 		(. ./$(FROMDIR)/di.env; $(MAKE) -e LOCALEDIR="$(LOCALEDIR)" \
diff --git a/sysutils/di/files/patch-tests.d_test__order b/sysutils/di/files/patch-tests.d_test__order
deleted file mode 100644
index 8a97595a658a..000000000000
--- a/sysutils/di/files/patch-tests.d_test__order
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests.d/test_order.orig	2024-06-24 00:49:39 UTC
-+++ tests.d/test_order
-@@ -3,5 +3,4 @@
- 3 diarg
- 3 disort
- 3 ditot
--4 diinst
- 5 dinls
diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist
index 08ce6c248d35..6064f3ee0a75 100644
--- a/sysutils/di/pkg-plist
+++ b/sysutils/di/pkg-plist
@@ -1,6 +1,11 @@
 bin/di
-bin/mi
-share/man/man1/di.1.gz
+include/di.h
+lib/libdi.so
+lib/libdi.so.6
+lib/libdi.so.6.0.0
+libdata/pkgconfig/di.pc
 %%NLS%%share/locale/de/LC_MESSAGES/di.mo
 %%NLS%%share/locale/en/LC_MESSAGES/di.mo
 %%NLS%%share/locale/es/LC_MESSAGES/di.mo
+share/man/man1/di.1.gz
+share/man/man3/libdi.3.gz