diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index f3f58c297732..217d518b7b14 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -1,32 +1,40 @@
 PORTNAME=	bitmap2pp
-DISTVERSION=	4.39.2
+DISTVERSION=	4.40.0
 CATEGORIES=	graphics perl5
 MASTER_SITES=	SF/dktools/dktools/dktools-${DISTVERSION}
 DISTNAME=	dktools-${DISTVERSION}
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	Convert PNG/JPEG/TIFF to PDF/EPS
 WWW=		https://sourceforge.net/p/dktools/wiki/bitmap2pp/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		jpeg localbase:ldflags
+USES=		compiler jpeg localbase:ldflags
 GNU_CONFIGURE=	yes
 # We do not want to include sys/termios.h even if it exists, and we do not want
 # to depend on BDB for db.h (it is used by other parts of dktools).
 CONFIGURE_ENV=	ac_cv_header_db_h=no
 
 ALL_TARGET=		${PORTNAME}
 CONFLICTS_INSTALL=	dktools[0-9]*
-PLIST_FILES=		bin/${PORTNAME} \
-			share/man/man1/${PORTNAME}.1.gz
+PLIST_SUB=		SOVER=${DISTVERSION:R}
+
+.include <bsd.port.pre.mk>
+
+# GCC is assumed if "CC=cc" is set thus set CC accordingly if clang is used.
+.if ${COMPILER_TYPE} == clang && !defined(USE_GCC) && ${CC} == cc
+CC=	clang
+.endif
 
 do-install:
+	${INSTALL_LIB} ${WRKSRC}/libdk4*.so* ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man/man1/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man/man1/${PORTNAME}.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/bmeps/distinfo b/graphics/bmeps/distinfo
index c329d706f23d..8f4868f7d737 100644
--- a/graphics/bmeps/distinfo
+++ b/graphics/bmeps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1772450915
-SHA256 (dktools-4.39.2.tar.gz) = 6f0dcb1af7bad4ee36516e4cde6a63bbef5a6004b145f876e1b70e3b3aebbaeb
-SIZE (dktools-4.39.2.tar.gz) = 15877706
+TIMESTAMP = 1775000604
+SHA256 (dktools-4.40.0.tar.gz) = 005db94e6cf28ed9d5337646dc63b6ba851d124da3a5e7e9056ac4a6e3609beb
+SIZE (dktools-4.40.0.tar.gz) = 25596544
diff --git a/graphics/bmeps/files/patch-src_libdk4c_dk4fs.c b/graphics/bmeps/files/patch-src_libdk4c_dk4fs.c
new file mode 100644
index 000000000000..cb48cc8de82e
--- /dev/null
+++ b/graphics/bmeps/files/patch-src_libdk4c_dk4fs.c
@@ -0,0 +1,11 @@
+--- src/libdk4c/dk4fs.c.orig	2026-03-28 18:46:03 UTC
++++ src/libdk4c/dk4fs.c
+@@ -134,7 +134,7 @@ dk4fs_check_regular_file(
+ #if DK4_ON_WINDOWS && (DK4_WIN_AVOID_CRT || DK4_WIN_DENY_CRT)
+ #if DK4_CHAR_SIZE > 1
+   WIN32_FIND_DATAW	ffdata;
+-#els
++#else
+   WIN32_FIND_DATAA	ffdata;
+ #endif
+   HANDLE		ha;
diff --git a/graphics/bmeps/pkg-plist b/graphics/bmeps/pkg-plist
new file mode 100644
index 000000000000..a9ccf8628940
--- /dev/null
+++ b/graphics/bmeps/pkg-plist
@@ -0,0 +1,30 @@
+bin/bitmap2pp
+lib/libdk4app.so
+lib/libdk4app.so.%%SOVER%%
+lib/libdk4base.so
+lib/libdk4base.so.%%SOVER%%
+lib/libdk4bif.so
+lib/libdk4bif.so.%%SOVER%%
+lib/libdk4bifa.so
+lib/libdk4bifa.so.%%SOVER%%
+lib/libdk4c.so
+lib/libdk4c.so.%%SOVER%%
+lib/libdk4gra.so
+lib/libdk4gra.so.%%SOVER%%
+lib/libdk4graa.so
+lib/libdk4graa.so.%%SOVER%%
+lib/libdk4lat.so
+lib/libdk4lat.so.%%SOVER%%
+lib/libdk4ma.so
+lib/libdk4ma.so.%%SOVER%%
+lib/libdk4maio8d.so
+lib/libdk4maio8d.so.%%SOVER%%
+lib/libdk4maio8h.so
+lib/libdk4maio8h.so.%%SOVER%%
+lib/libdk4maiodd.so
+lib/libdk4maiodd.so.%%SOVER%%
+lib/libdk4maiodh.so
+lib/libdk4maiodh.so.%%SOVER%%
+lib/libdk4maiowh.so
+lib/libdk4maiowh.so.%%SOVER%%
+share/man/man1/bitmap2pp.1.gz