diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 0d3a2e1c4064..5bd0594d36fd 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	proj
 DISTVERSION=	9.7.0
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/OSGeo/PROJ/releases/download/${DISTVERSION}/ \
 		https://download.osgeo.org/proj/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Cartographic Projections library
 WWW=		https://github.com/OSGeo/PROJ
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
 TEST_DEPENDS=	googletest>0:devel/googletest
 #RUN_DEPENDS=	proj-data>=0:graphics/proj-data
 
 USES=		compiler:c++17-lang cmake:testing cpe pathfix pkgconfig sqlite
 CPE_VENDOR=	proj_project
 USE_LDCONFIG=	yes
 
+CMAKE_OFF=	BUILD_TESTING
+CMAKE_TESTING_OFF=	TESTING_USE_NETWORK
 CMAKE_TESTING_ON=	BUILD_TESTING \
 			USE_EXTERNAL_GTEST
-CMAKE_TESTING_OFF=	TESTING_USE_NETWORK
 
-CMAKE_OFF=	BUILD_TESTING
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index 4eb6dd032543..6876e9cb4a42 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -1,64 +1,64 @@
 bin/cct
 bin/cs2cs
 bin/geod
 bin/gie
 bin/invgeod
 bin/invproj
 bin/proj
 bin/projinfo
 bin/projsync
 include/geodesic.h
 include/proj.h
 include/proj/common.hpp
-include/proj/coordinates.hpp
 include/proj/coordinateoperation.hpp
+include/proj/coordinates.hpp
 include/proj/coordinatesystem.hpp
 include/proj/crs.hpp
 include/proj/datum.hpp
 include/proj/io.hpp
 include/proj/metadata.hpp
 include/proj/nn.hpp
 include/proj/util.hpp
 include/proj_constants.h
 include/proj_experimental.h
 include/proj_symbol_rename.h
 lib/cmake/proj/proj-config-version.cmake
 lib/cmake/proj/proj-config.cmake
 lib/cmake/proj/proj-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj/proj-targets.cmake
 lib/cmake/proj/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj/proj4-targets.cmake
 lib/cmake/proj4/proj-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj4/proj-targets.cmake
 lib/cmake/proj4/proj4-config-version.cmake
 lib/cmake/proj4/proj4-config.cmake
 lib/cmake/proj4/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.7.0
+lib/libproj.so.25.%%DISTVERSION%%
 libdata/pkgconfig/proj.pc
 share/bash-completion/completions/projinfo
 share/man/man1/cct.1.gz
 share/man/man1/cs2cs.1.gz
 share/man/man1/geod.1.gz
 share/man/man1/gie.1.gz
 share/man/man1/proj.1.gz
 share/man/man1/projinfo.1.gz
 share/man/man1/projsync.1.gz
 %%DATADIR%%/CH
 %%DATADIR%%/GL27
 %%DATADIR%%/ITRF2000
 %%DATADIR%%/ITRF2008
 %%DATADIR%%/ITRF2014
 %%DATADIR%%/ITRF2020
 %%DATADIR%%/deformation_model.schema.json
 %%DATADIR%%/nad.lst
 %%DATADIR%%/nad27
 %%DATADIR%%/nad83
 %%DATADIR%%/other.extra
 %%DATADIR%%/proj.db
 %%DATADIR%%/proj.ini
 %%DATADIR%%/projjson.schema.json
 %%DATADIR%%/triangulation.schema.json
 %%DATADIR%%/world