diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 67a58c6aee61..1110a4932152 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	feh
-PORTVERSION=	3.9.1
-PORTREVISION=	1
+PORTVERSION=	3.10
 CATEGORIES=	graphics
 MASTER_SITES=	https://feh.finalrewind.org/
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Image viewer that utilizes Imlib2
 WWW=		https://feh.finalrewind.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libpng.so:graphics/png
+TEST_DEPENDS=	p5-Test-Command>=0:devel/p5-Test-Command
 
-USES=		compiler:c++11-lang cpe desktop-file-utils gmake localbase:ldflags \
-		tar:bzip2 xorg
-USE_XORG=	x11 xt xinerama
+USES=		cpe desktop-file-utils gmake localbase:ldflags tar:bzip2 xorg
 CPE_VENDOR=	feh_project
+USE_XORG=	x11 xinerama xt
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" verscmp=0
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}" \
+		verscmp=0
+TEST_TARGET=	test
+
+OPTIONS_DEFINE=		CURL DCRAW DOCS EXAMPLES EXIF XINERAMA
+OPTIONS_DEFAULT=	CURL EXIF XINERAMA
+OPTIONS_SUB=		yes
 
-OPTIONS_DEFINE=	CURL DCRAW DOCS EXAMPLES EXIF XINERAMA
-EXIF_DESC=	Support EXIF tags
 DCRAW_DESC=	Use dcraw to display raw file previews
-OPTIONS_DEFAULT=CURL EXIF XINERAMA
-OPTIONS_SUB=	yes
+EXIF_DESC=	Support EXIF tags
 
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_MAKE_ENV=		curl=1
+CURL_MAKE_ENV_OFF=	curl=0
+DCRAW_RUN_DEPENDS=	dcraw:graphics/dcraw
 EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 EXIF_MAKE_ENV=		exif=1
 EXIF_MAKE_ENV_OFF=	exif=0
-
 XINERAMA_MAKE_ENV=	xinerama=1
 XINERAMA_MAKE_ENV_OFF=	xinerama=0
 
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_MAKE_ENV=		curl=1
-CURL_MAKE_ENV_OFF=	curl=0
-
-DCRAW_RUN_DEPENDS=	dcraw:graphics/dcraw
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|install-doc||' \
 		${WRKSRC}/Makefile
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e 's|install-examples||' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh
 
 .include <bsd.port.mk>
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 5a8121625b0f..4141d9c9921d 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662679431
-SHA256 (feh-3.9.1.tar.bz2) = 455c92711b588af149b945edc5c145f3e9aa137ed9689dabed49d5e4acac75fa
-SIZE (feh-3.9.1.tar.bz2) = 2108873
+TIMESTAMP = 1681222749
+SHA256 (feh-3.10.tar.bz2) = 1d71d1f6dcfe9ffee5e2766969a11978f7eb4fac7d7ae556f104c11f9c57cc98
+SIZE (feh-3.10.tar.bz2) = 2109603