diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 2d048bcc4bd6..83ead2d1c5cc 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,40 +1,54 @@
 PORTNAME=	lensfun
 PORTVERSION=	0.3.95
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Library for fixing lens geometry distortions
 WWW=		https://lensfun.github.io/
 
 LICENSE=	GPLv3 LGPL3 CC-BY-SA-3.0 PD
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=		${WRKSRC}/docs/gpl-3.0.txt
 LICENSE_FILE_LGPL3=		${WRKSRC}/docs/lgpl-3.0.txt
 LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/docs/cc-by-sa-3.0.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake compiler:c++11-lang gettext-runtime gnome pathfix \
 		pkgconfig shebangfix
 SHEBANG_FILES=	apps/lensfun-add-adapter apps/lensfun-convert-lcp \
 		apps/lensfun-update-data
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON
+CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON -DBUILD_LENSTOOL:BOOL=ON \
+		-DBUILD_TESTS:BOOL=ON
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE=
-PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 OPTIONS_DEFINE=	SIMD PYHELPERS
 OPTIONS_DEFAULT=	SIMD PYHELPERS
 OPTIONS_SUB=	yes
-PYHELPERS_DESC=	Install database helper scripts (need Python 3)
+PYHELPERS_DESC=	Install database helper Python scripts
 
 SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
 
+PYHELPERS_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/setuptools/_distutils/core.py:devel/py-setuptools@${PY_FLAVOR}
 PYHELPERS_CMAKE_ON=	-DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD}
 PYHELPERS_CMAKE_OFF=	-DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE
 PYHELPERS_USES=		python:3.4+
 
+post-patch:
+	@${REINPLACE_CMD} -e '/#include <cmath>/ { x; s/^/#include <clocale>/; G; }' \
+		${WRKSRC}/tests/test_modifier_coord_centering_old.cpp \
+		${WRKSRC}/tests/test_modifier_coord_perspective_correction.cpp \
+		${WRKSRC}/tests/test_modifier_coord_perspective_correction_old.cpp \
+		${WRKSRC}/tests/test_modifier_coord_tiny_image_old.cpp \
+		${WRKSRC}/tests/test_modifier_performance.cpp \
+		${WRKSRC}/tests/test_modifier_regression.cpp \
+		${WRKSRC}/tests/test_modifier_regression_old.cpp
+
+do-test:
+	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
+
 .include <bsd.port.mk>
diff --git a/graphics/lensfun/pkg-plist b/graphics/lensfun/pkg-plist
index eed26801d239..e2a3a9712842 100644
--- a/graphics/lensfun/pkg-plist
+++ b/graphics/lensfun/pkg-plist
@@ -1,68 +1,72 @@
 %%PYHELPERS%%bin/g-lensfun-update-data
 %%PYHELPERS%%bin/lensfun-add-adapter
 %%PYHELPERS%%bin/lensfun-convert-lcp
 %%PYHELPERS%%bin/lensfun-update-data
+bin/lenstool
 include/lensfun/lensfun.h
 lib/liblensfun.so
 lib/liblensfun.so.2
 lib/liblensfun.so.0.3.95
 libdata/pkgconfig/lensfun.pc
 %%DATADIR%%/version_2/6x6.xml
 %%DATADIR%%/version_2/actioncams.xml
 %%DATADIR%%/version_2/compact-canon.xml
 %%DATADIR%%/version_2/compact-casio.xml
 %%DATADIR%%/version_2/compact-fujifilm.xml
 %%DATADIR%%/version_2/compact-kodak.xml
 %%DATADIR%%/version_2/compact-konica-minolta.xml
 %%DATADIR%%/version_2/compact-leica.xml
 %%DATADIR%%/version_2/compact-nikon.xml
 %%DATADIR%%/version_2/compact-olympus.xml
 %%DATADIR%%/version_2/compact-panasonic.xml
 %%DATADIR%%/version_2/compact-pentax.xml
 %%DATADIR%%/version_2/compact-ricoh.xml
 %%DATADIR%%/version_2/compact-samsung.xml
 %%DATADIR%%/version_2/compact-sigma.xml
 %%DATADIR%%/version_2/compact-sony.xml
 %%DATADIR%%/version_2/contax.xml
 %%DATADIR%%/version_2/generic.xml
 %%DATADIR%%/version_2/lensfun-database.dtd
 %%DATADIR%%/version_2/lensfun-database.xsd
 %%DATADIR%%/version_2/mil-canon.xml
 %%DATADIR%%/version_2/mil-fujifilm.xml
 %%DATADIR%%/version_2/mil-nikon.xml
 %%DATADIR%%/version_2/mil-olympus.xml
 %%DATADIR%%/version_2/mil-panasonic.xml
 %%DATADIR%%/version_2/mil-pentax.xml
 %%DATADIR%%/version_2/mil-samsung.xml
 %%DATADIR%%/version_2/mil-samyang.xml
 %%DATADIR%%/version_2/mil-sigma.xml
 %%DATADIR%%/version_2/mil-sony.xml
 %%DATADIR%%/version_2/mil-tamron.xml
 %%DATADIR%%/version_2/mil-tokina.xml
 %%DATADIR%%/version_2/mil-zeiss.xml
 %%DATADIR%%/version_2/misc.xml
 %%DATADIR%%/version_2/rf-leica.xml
 %%DATADIR%%/version_2/slr-canon.xml
 %%DATADIR%%/version_2/slr-hasselblad.xml
 %%DATADIR%%/version_2/slr-konica-minolta.xml
 %%DATADIR%%/version_2/slr-leica.xml
 %%DATADIR%%/version_2/slr-nikon.xml
 %%DATADIR%%/version_2/slr-olympus.xml
 %%DATADIR%%/version_2/slr-panasonic.xml
 %%DATADIR%%/version_2/slr-pentax.xml
 %%DATADIR%%/version_2/slr-ricoh.xml
 %%DATADIR%%/version_2/slr-samsung.xml
 %%DATADIR%%/version_2/slr-samyang.xml
 %%DATADIR%%/version_2/slr-schneider.xml
 %%DATADIR%%/version_2/slr-sigma.xml
 %%DATADIR%%/version_2/slr-soligor.xml
 %%DATADIR%%/version_2/slr-sony.xml
 %%DATADIR%%/version_2/slr-tamron.xml
 %%DATADIR%%/version_2/slr-tokina.xml
 %%DATADIR%%/version_2/slr-ussr.xml
 %%DATADIR%%/version_2/slr-vivitar.xml
 %%DATADIR%%/version_2/slr-zeiss.xml
 %%DATADIR%%/version_2/timestamp.txt
-%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info
+%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__init__.py
 %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc