16 files changed, 350 insertions, 26 deletions

diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index e757080d1e59..f75b6cdb91c8 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rgdal
 DISTVERSION=	1.5-18
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 7201d84747a6..0d29712fc5f1 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	3.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index a032bfa10de3..f07b0188d7f8 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgeotiff
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.osgeo.org/geotiff/libgeotiff/ \
 		LOCAL/sunpoet
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
index 0ccc28414c27..ebbe97955f8b 100644
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	librasterlite
 PORTVERSION=	1.1g
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/librasterlite-sources/
 
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index c354bee7b3f8..82423521a11a 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	librasterlite2
 PORTVERSION=	1.0.0
 DISTVERSIONSUFFIX=-rc0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index 732d2d6e75ab..a821a726009d 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libreatlas
 PORTVERSION=	1.0.0a
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 9d38d62da56d..7f46284286c0 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		7.6.1
+PORTREVISION=	1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		https://download.osgeo.org/mapserver/
 
diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 53d563b76ff1..df8babec5710 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openorienteering-mapper
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 6b0cf112df4c..8ce5bf067851 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	proj
-PORTVERSION=	6.3.1
+PORTVERSION=	7.1.1
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/proj/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DATUM_GRID_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	wen@FreeBSD.org
+MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Cartographic Projections library
 
 LICENSE=	MIT
@@ -36,8 +37,14 @@ post-extract:
 .for f in ${DATUM_GRID_FILES}
 	@${TAR} -xf ${DISTDIR}/${f} -C ${WRKSRC}/datum
 .endfor
+post-extract-DATA-on:
+	${MKDIR} ${WRKSRC}/proj_data
+	@${TAR} -xf ${DISTDIR}/${DATA_DISTFILES} -C ${WRKSRC}/proj_data
 
 post-install:
 	cd ${WRKSRC}/datum && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
 
+post-install-DATA-on:
+	cd ${WRKSRC}/proj_data && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
+
 .include <bsd.port.mk>
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 2b86a4208a0c..932e00e302d5 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1582137635
-SHA256 (proj-6.3.1.tar.gz) = 6de0112778438dcae30fcc6942dee472ce31399b9e5a2b67e8642529868c86f8
-SIZE (proj-6.3.1.tar.gz) = 2823891
+TIMESTAMP = 1604383456
+SHA256 (proj-7.1.1.tar.gz) = 324e7abb5569fb5f787dadf1d4474766915c485a188cf48cf07153b99156b5f9
+SIZE (proj-7.1.1.tar.gz) = 5509592
 SHA256 (proj-datumgrid-1.8.zip) = b9838ae7e5f27ee732fb0bfed618f85b36e8bb56d7afb287d506338e9f33861e
 SIZE (proj-datumgrid-1.8.zip) = 6601640
 SHA256 (proj-datumgrid-europe-1.3.zip) = fec755e7e80f921b985cff76213e6e65949468f4482d329f09c8cf1d8dddfe52
@@ -11,3 +11,5 @@ SHA256 (proj-datumgrid-oceania-1.0.zip) = 41c23f32712b2beaedcddb0e53542a4c15d2fd
 SIZE (proj-datumgrid-oceania-1.0.zip) = 96907052
 SHA256 (proj-datumgrid-world-1.0.zip) = cbffb31faecb16f3f7acbfe7e85e81440aa8d6eae670de7ec2d19a13c02b4681
 SIZE (proj-datumgrid-world-1.0.zip) = 134375434
+SHA256 (proj-data-1.0.tar.gz) = 2637183bb2fa6cd421085734e5212b0c12550b8d5d3ecaadbfc1044648c7a906
+SIZE (proj-data-1.0.tar.gz) = 507057179
diff --git a/graphics/proj/files/pkg-message.in b/graphics/proj/files/pkg-message.in
new file mode 100644
index 000000000000..0bcec34ffd5c
--- /dev/null
+++ b/graphics/proj/files/pkg-message.in
@@ -0,0 +1,35 @@
+[
+{ type: install
+  message: <<EOM
+Since proj 7, datum grids are available from a CDN at https://cdn.proj.org and
+should either be fetched dynamically at runtime (disabled by default, cf
+https://proj.org/usage/network.html) or be fetched locally depending on your
+work area needs, using the projsync command. 
+
+DATA option allows you to download all the data, but it requires more than 400mb!
+This option is disabled by default.
+
+It is better to use the projsync command.
+
+Use projsync --list-files to list the CDN content.
+
+They can either by installed in the user homedir (under ~/.local/share/proj)
+
+$ projsync --file fr_ign_ntf_r93.tif
+Downloading from https://cdn.proj.org into /home/user/.local/share/proj
+Total to download: 93581 bytes
+Downloading https://cdn.proj.org/fr_ign_ntf_r93.tif... (1 / 1)
+
+or systemwide in the default PROJ_LIB dir (under %%PREFIX%%/share/proj, cf
+https://proj.org/resource_files.html)
+
+# projsync --system-directory --file fr_ign_ntf_r93.tif
+Downloading from https://cdn.proj.org into %%PREFIX%%/share/proj
+Total to download: 93581 bytes
+Downloading https://cdn.proj.org/fr_ign_ntf_r93.tif... (1 / 1)
+
+If not using the default, make sure to set PROJ_LIB environment variable
+accordingly.
+EOM
+}
+]
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index e903b3f39219..48a817acfa76 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -6,8 +6,8 @@ bin/invgeod
 bin/invproj
 bin/proj
 bin/projinfo
+bin/projsync
 include/geodesic.h
-include/org_proj4_PJ.h
 include/proj.h
 include/proj/common.hpp
 include/proj/coordinateoperation.hpp
@@ -24,8 +24,8 @@ include/proj_experimental.h
 include/proj_symbol_rename.h
 lib/libproj.a
 lib/libproj.so
-lib/libproj.so.15
-lib/libproj.so.15.3.1
+lib/libproj.so.19
+lib/libproj.so.19.1.1
 libdata/pkgconfig/proj.pc
 man/man1/cct.1.gz
 man/man1/cs2cs.1.gz
@@ -33,22 +33,10 @@ man/man1/geod.1.gz
 man/man1/gie.1.gz
 man/man1/proj.1.gz
 man/man1/projinfo.1.gz
-man/man3/geodesic.3.gz
-man/man3/pj_init.3.gz
-%%DATADIR%%/CH
-%%DATADIR%%/GL27
-%%DATADIR%%/ITRF2000
-%%DATADIR%%/ITRF2008
-%%DATADIR%%/ITRF2014
-%%DATADIR%%/nad.lst
-%%DATADIR%%/nad27
-%%DATADIR%%/nad83
-%%DATADIR%%/null
-%%DATADIR%%/other.extra
-%%DATADIR%%/proj.db
-%%DATADIR%%/world
+man/man1/projsync.1.gz
 %%DATADIR%%/A66_National_13_09_01.gsb
 %%DATADIR%%/BETA2007.gsb
+%%DATADIR%%/CH
 %%DATADIR%%/DK
 %%DATADIR%%/DK_bornholm.pol
 %%DATADIR%%/DK_bridges.pol
@@ -61,6 +49,11 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/GDA94_GDA2020_conformal.gsb
 %%DATADIR%%/GDA94_GDA2020_conformal_and_distortion.gsb
 %%DATADIR%%/GL
+%%DATADIR%%/GL27
+%%DATA%%%%DATADIR%%/ISL
+%%DATADIR%%/ITRF2000
+%%DATADIR%%/ITRF2008
+%%DATADIR%%/ITRF2014
 %%DATADIR%%/MD
 %%DATADIR%%/NKG
 %%DATADIR%%/National_84_02_07_01.gsb
@@ -77,6 +70,7 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/RAMART2016.gtx
 %%DATADIR%%/RAMG2016.gtx
 %%DATADIR%%/RAR07_bl.gtx
+%%DATA%%%%DATADIR%%/README.DATA
 %%DATADIR%%/README.DATUMGRID
 %%DATADIR%%/README.EUROPE
 %%DATADIR%%/README.NORTHAMERICA
@@ -89,20 +83,145 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/alaska
 %%DATADIR%%/alhpgn.gsb
 %%DATADIR%%/arhpgn.gsb
+%%DATA%%%%DATADIR%%/at_bev_AT_GIS_GRID.tif
+%%DATA%%%%DATADIR%%/at_bev_README.txt
+%%DATA%%%%DATADIR%%/au_ga_AUSGeoid09_V1.01.tif
+%%DATA%%%%DATADIR%%/au_ga_AUSGeoid2020_20180201.tif
+%%DATA%%%%DATADIR%%/au_ga_AUSGeoid98.tif
+%%DATA%%%%DATADIR%%/au_ga_README.txt
+%%DATA%%%%DATADIR%%/au_icsm_A66_National_13_09_01.tif
+%%DATA%%%%DATADIR%%/au_icsm_GDA94_GDA2020_conformal.tif
+%%DATA%%%%DATADIR%%/au_icsm_GDA94_GDA2020_conformal_and_distortion.tif
+%%DATA%%%%DATADIR%%/au_icsm_GDA94_GDA2020_conformal_christmas_island.tif
+%%DATA%%%%DATADIR%%/au_icsm_GDA94_GDA2020_conformal_cocos_island.tif
+%%DATA%%%%DATADIR%%/au_icsm_National_84_02_07_01.tif
+%%DATA%%%%DATADIR%%/au_icsm_README.txt
 %%DATADIR%%/azhpgn.gsb
 %%DATADIR%%/bd72lb72_etrs89lb08.gsb
+%%DATA%%%%DATADIR%%/be_ign_README.txt
+%%DATA%%%%DATADIR%%/be_ign_bd72lb72_etrs89lb08.tif
 %%DATADIR%%/c1hpgn.gsb
 %%DATADIR%%/c2hpgn.gsb
+%%DATA%%%%DATADIR%%/ca_nrc_ABCSRSV4.tif
+%%DATA%%%%DATADIR%%/ca_nrc_BC_27_05.tif
+%%DATA%%%%DATADIR%%/ca_nrc_BC_93_05.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CGG2013ai08.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CGG2013an83.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CGG2013i08.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CGG2013n83.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CQ77SCRS.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CRD27_00.tif
+%%DATA%%%%DATADIR%%/ca_nrc_CRD93_00.tif
+%%DATA%%%%DATADIR%%/ca_nrc_GS7783.tif
+%%DATA%%%%DATADIR%%/ca_nrc_HT2_2010v70.tif
+%%DATA%%%%DATADIR%%/ca_nrc_MAY76V20.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NA27SCRS.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NA83SCRS.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NAD83v6VG.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NAD83v70VG.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NB2783v2.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NB7783v2.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NS778302.tif
+%%DATA%%%%DATADIR%%/ca_nrc_NVI93_05.tif
+%%DATA%%%%DATADIR%%/ca_nrc_ON27CSv1.tif
+%%DATA%%%%DATADIR%%/ca_nrc_ON76CSv1.tif
+%%DATA%%%%DATADIR%%/ca_nrc_ON83CSv1.tif
+%%DATA%%%%DATADIR%%/ca_nrc_PE7783V2.tif
+%%DATA%%%%DATADIR%%/ca_nrc_README.txt
+%%DATA%%%%DATADIR%%/ca_nrc_SK27-98.tif
+%%DATA%%%%DATADIR%%/ca_nrc_SK83-98.tif
+%%DATA%%%%DATADIR%%/ca_nrc_TO27CSv1.tif
+%%DATA%%%%DATADIR%%/ca_nrc_ntv1_can.tif
+%%DATA%%%%DATADIR%%/ca_nrc_ntv2_0.tif
+%%DATA%%%%DATADIR%%/ca_que_mern_README.txt
+%%DATA%%%%DATADIR%%/ca_que_mern_cq77na83.tif
+%%DATA%%%%DATADIR%%/ca_que_mern_na27na83.tif
+%%DATA%%%%DATADIR%%/ch_swisstopo_CHENyx06_ETRS.tif
+%%DATA%%%%DATADIR%%/ch_swisstopo_CHENyx06a.tif
+%%DATA%%%%DATADIR%%/ch_swisstopo_README.txt
 %%DATADIR%%/cnhpgn.gsb
 %%DATADIR%%/cohpgn.gsb
 %%DATADIR%%/conus
+%%DATA%%%%DATADIR%%/copyright_and_licenses.csv
+%%DATA%%%%DATADIR%%/de_adv_BETA2007.tif
+%%DATA%%%%DATADIR%%/de_adv_README.txt
+%%DATA%%%%DATADIR%%/de_geosn_NTv2_SN.tif
+%%DATA%%%%DATADIR%%/de_geosn_README.txt
+%%DATA%%%%DATADIR%%/de_lgl_bw_BWTA2017.tif
+%%DATA%%%%DATADIR%%/de_lgl_bw_README.txt
+%%DATA%%%%DATADIR%%/de_lgvl_saarland_README.txt
+%%DATA%%%%DATADIR%%/de_lgvl_saarland_SeTa2016.tif
+%%DATADIR%%/deformation_model.schema.json
+%%DATA%%%%DATADIR%%/dk_sdfe_DK_bornholm.pol
+%%DATA%%%%DATADIR%%/dk_sdfe_DK_bridges.pol
+%%DATA%%%%DATADIR%%/dk_sdfe_DK_general.pol
+%%DATA%%%%DATADIR%%/dk_sdfe_DK_jutland.pol
+%%DATA%%%%DATADIR%%/dk_sdfe_DK_zealand.pol
+%%DATA%%%%DATADIR%%/dk_sdfe_FO_fk89.pol
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_README.txt
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_dnn.tif
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_dvr90.tif
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_fvr09.tif
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_gvr2000.tif
+%%DATA%%%%DATA%%%%DATADIR%%/dk_sdfe_gvr2016.tif
 %%DATADIR%%/dnn.gtx
 %%DATADIR%%/dvr90.gtx
 %%DATADIR%%/egm08_25.gtx
 %%DATADIR%%/egm96_15.gtx
 %%DATADIR%%/emhpgn.gsb
+%%DATA%%%%DATADIR%%/es_cat_icgc_100800401.tif
+%%DATA%%%%DATADIR%%/es_cat_icgc_README.txt
 %%DATADIR%%/ethpgn.gsb
+%%DATA%%%%DATADIR%%/eur_nkg_README.txt
+%%DATA%%%%DATADIR%%/eur_nkg_nkgrf03vel_realigned.tif
 %%DATADIR%%/flhpgn.gsb
+%%DATA%%%%DATADIR%%/fr_ign_CGVD2013RGSPM06.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAC09.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAF09.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAF18.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAGTBT2016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RALD2016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RALDW842016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RALS2016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAMART2016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAMG2016.tif
+%%DATA%%%%DATADIR%%/fr_ign_RAR07_bl.tif
+%%DATA%%%%DATADIR%%/fr_ign_RASPM2018.tif
+%%DATA%%%%DATADIR%%/fr_ign_README.txt
+%%DATA%%%%DATADIR%%/fr_ign_gg10_sbv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_gg10_smv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggg00_lsv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggg00_mgv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggg00_sbv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggg00_smv2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggg00v2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggguy15.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggker08v2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggm00v2.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggm04v1.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Bora.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Huahine.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Maiao.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Maupiti.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Raiatea.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Tahaa.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf02-Tupai.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf05-HivaOa.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf05-Nuku.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Fakarava.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Gambier.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Hao.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Mataiva.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Raivavae.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Reao.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Rurutu.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Tikehau.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf08-Tubuai.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf10-Moorea.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggpf10-Tahiti.tif
+%%DATA%%%%DATADIR%%/fr_ign_ggspm06v1.tif
+%%DATA%%%%DATADIR%%/fr_ign_gr3df97a.tif
+%%DATA%%%%DATADIR%%/fr_ign_ntf_r93.tif
 %%DATADIR%%/fvr09.gtx
 %%DATADIR%%/g2012ba0.gtx
 %%DATADIR%%/g2012bg0.gtx
@@ -151,6 +270,13 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/iahpgn.gsb
 %%DATADIR%%/ilhpgn.gsb
 %%DATADIR%%/inhpgn.gsb
+%%DATA%%%%DATADIR%%/is_lmi_ISN2004_ISN2016.tif
+%%DATA%%%%DATADIR%%/is_lmi_ISN93_ISN2016.tif
+%%DATA%%%%DATADIR%%/is_lmi_ISN_vel_beta.tif
+%%DATA%%%%DATADIR%%/is_lmi_Icegeoid_ISN2004.tif
+%%DATA%%%%DATADIR%%/is_lmi_Icegeoid_ISN2016.tif
+%%DATA%%%%DATADIR%%/is_lmi_Icegeoid_ISN93.tif
+%%DATA%%%%DATADIR%%/is_lmi_README.txt
 %%DATADIR%%/kyhpgn.gsb
 %%DATADIR%%/lahpgn.gsb
 %%DATADIR%%/mdhpgn.gsb
@@ -158,6 +284,9 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/mihpgn.gsb
 %%DATADIR%%/mnhpgn.gsb
 %%DATADIR%%/mohpgn.gsb
+%%DATADIR%%/nad.lst
+%%DATADIR%%/nad27
+%%DATADIR%%/nad83
 %%DATADIR%%/nbhpgn.gsb
 %%DATADIR%%/nchpgn.gsb
 %%DATADIR%%/ndhpgn.gsb
@@ -165,25 +294,166 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/njhpgn.gsb
 %%DATADIR%%/nkgrf03vel_realigned_xy.ct2
 %%DATADIR%%/nkgrf03vel_realigned_z.gtx
+%%DATA%%%%DATADIR%%/nl_nsgi_README.txt
+%%DATA%%%%DATADIR%%/nl_nsgi_naptrans2018.tif
+%%DATA%%%%DATADIR%%/nl_nsgi_nlgeo2018.tif
+%%DATA%%%%DATADIR%%/nl_nsgi_rdcorr2018.tif
+%%DATA%%%%DATADIR%%/nl_nsgi_rdtrans2018.tif
 %%DATADIR%%/nmhpgn.gsb
 %%DATADIR%%/ntf_r93.gsb
 %%DATADIR%%/ntv1_can.dat
 %%DATADIR%%/ntv2_0.gsb
+%%DATADIR%%/null
 %%DATADIR%%/nvhpgn.gsb
 %%DATADIR%%/nyhpgn.gsb
+%%DATA%%%%DATADIR%%/nz_linz_README.txt
+%%DATA%%%%DATADIR%%/nz_linz_auckht1946-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_blufht1955-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_dublht1960-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_duneht1958-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_gisbht1926-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_lyttht1937-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_motuht1953-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_napiht1962-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_nelsht1955-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_nzgd2kgrid0005.tif
+%%DATA%%%%DATADIR%%/nz_linz_nzgeoid2009.tif
+%%DATA%%%%DATADIR%%/nz_linz_nzgeoid2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_ontpht1964-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_stisht1977-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_taraht1970-nzvd2016.tif
+%%DATA%%%%DATADIR%%/nz_linz_wellht1953-nzvd2016.tif
 %%DATADIR%%/nzgd2kgrid0005.gsb
 %%DATADIR%%/ohhpgn.gsb
 %%DATADIR%%/okhpgn.gsb
+%%DATADIR%%/other.extra
 %%DATADIR%%/pahpgn.gsb
+%%DATADIR%%/proj.db
+%%DATADIR%%/proj.ini
 %%DATADIR%%/projjson.schema.json
 %%DATADIR%%/prvi
+%%DATA%%%%DATADIR%%/pt_dgt_D73_ETRS89_geo.tif
+%%DATA%%%%DATADIR%%/pt_dgt_DLx_ETRS89_geo.tif
+%%DATA%%%%DATADIR%%/pt_dgt_README.txt
 %%DATADIR%%/pvhpgn.gsb
 %%DATADIR%%/schpgn.gsb
 %%DATADIR%%/sdhpgn.gsb
+%%DATA%%%%DATADIR%%/se_lantmateriet_README.txt
+%%DATA%%%%DATADIR%%/se_lantmateriet_SWEN17_RH2000.tif
 %%DATADIR%%/stgeorge
 %%DATADIR%%/stlrnc
 %%DATADIR%%/stpaul
 %%DATADIR%%/tnhpgn.gsb
+%%DATA%%%%DATADIR%%/uk_os_OSGM15_Belfast.tif
+%%DATA%%%%DATADIR%%/uk_os_OSGM15_Malin.tif
+%%DATA%%%%DATADIR%%/uk_os_OSTN15_NTv2_OSGBtoETRS.tif
+%%DATA%%%%DATADIR%%/uk_os_README.txt
+%%DATA%%%%DATADIR%%/us_nga_README.txt
+%%DATA%%%%DATADIR%%/us_nga_egm08_25.tif
+%%DATA%%%%DATADIR%%/us_nga_egm96_15.tif
+%%DATA%%%%DATADIR%%/us_noaa_FL.tif
+%%DATA%%%%DATADIR%%/us_noaa_MD.tif
+%%DATA%%%%DATADIR%%/us_noaa_README.txt
+%%DATA%%%%DATADIR%%/us_noaa_TN.tif
+%%DATA%%%%DATADIR%%/us_noaa_WI.tif
+%%DATA%%%%DATADIR%%/us_noaa_WO.tif
+%%DATA%%%%DATADIR%%/us_noaa_alaska.tif
+%%DATA%%%%DATADIR%%/us_noaa_alhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_arhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_azhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_c1hpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_c2hpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_cnhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_cohpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_conus.tif
+%%DATA%%%%DATADIR%%/us_noaa_cshpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_emhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_eshpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_ethpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_flhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999a01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999a02.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999a03.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999a04.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999h01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999p01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u02.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u03.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u04.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u05.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u06.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u07.tif
+%%DATA%%%%DATADIR%%/us_noaa_g1999u08.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003a01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003a02.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003a03.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003a04.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003h01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2003p01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2009g01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2009h01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2009p01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2009s01.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012ba0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012bg0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012bh0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012bp0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012bs0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2012bu0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2018p0.tif
+%%DATA%%%%DATADIR%%/us_noaa_g2018u0.tif
+%%DATA%%%%DATADIR%%/us_noaa_gahpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_geoid03_conus.tif
+%%DATA%%%%DATADIR%%/us_noaa_geoid06_ak.tif
+%%DATA%%%%DATADIR%%/us_noaa_geoid09_ak.tif
+%%DATA%%%%DATADIR%%/us_noaa_geoid09_conus.tif
+%%DATA%%%%DATADIR%%/us_noaa_guhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_hawaii.tif
+%%DATA%%%%DATADIR%%/us_noaa_hihpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_iahpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_ilhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_inhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_kshpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_kyhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_lahpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mdhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mehpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mihpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mnhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mohpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_mshpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nbhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nchpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_ndhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nehpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_njhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nmhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nvhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_nyhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_ohhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_okhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_pahpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_prvi.tif
+%%DATA%%%%DATADIR%%/us_noaa_pvhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_schpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_sdhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_stgeorge.tif
+%%DATA%%%%DATADIR%%/us_noaa_stlrnc.tif
+%%DATA%%%%DATADIR%%/us_noaa_stpaul.tif
+%%DATA%%%%DATADIR%%/us_noaa_tnhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_uthpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_vahpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_vertconc.tif
+%%DATA%%%%DATADIR%%/us_noaa_vertcone.tif
+%%DATA%%%%DATADIR%%/us_noaa_vertconw.tif
+%%DATA%%%%DATADIR%%/us_noaa_wihpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wmhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wohpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wshpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wthpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wvhpgn.tif
+%%DATA%%%%DATADIR%%/us_noaa_wyhpgn.tif
 %%DATADIR%%/uthpgn.gsb
 %%DATADIR%%/vahpgn.gsb
 %%DATADIR%%/vertconc.gtx
@@ -192,6 +462,7 @@ man/man3/pj_init.3.gz
 %%DATADIR%%/wihpgn.gsb
 %%DATADIR%%/wmhpgn.gsb
 %%DATADIR%%/wohpgn.gsb
+%%DATADIR%%/world
 %%DATADIR%%/wthpgn.gsb
 %%DATADIR%%/wvhpgn.gsb
 %%DATADIR%%/wyhpgn.gsb
diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile
index 15e506c22db2..7575780cdc88 100644
--- a/graphics/py-cartopy/Makefile
+++ b/graphics/py-cartopy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cartopy
 PORTVERSION=	0.18.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-pyproj/Makefile b/graphics/py-pyproj/Makefile
index 5e11ead1853e..1a926af06b05 100644
--- a/graphics/py-pyproj/Makefile
+++ b/graphics/py-pyproj/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyproj
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	.post1
 CATEGORIES=	graphics python geography
 MASTER_SITES=	CHEESESHOP
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index e1cd9f61def3..a915303800ea 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_10_11
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 819a3e574214..10826377b3b8 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_16_0
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@FreeBSD.org