diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 08668aced2bd..f43f5c04b272 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,91 +1,89 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.1.8
-PORTREVISION=	7
+DISTVERSION=	2.2.0
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 WWW=		http://www.xastir.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf \
-		libpcre.so:devel/pcre
+		libpcre2-8.so:devel/pcre2 \
+		libjxl.so:graphics/libjxl \
+		libjxl_threads.so:graphics/libjxl
 
 USES=		autoreconf gmake gnome jpeg motif shebangfix xorg
 
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
 GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		BDB CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
 OPTIONS_RADIO=		MGG
 OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
 MGG_DESC=	Image library for raster map processing
 IMAGICK_DESC=	ImageMagick (Version 6)
 GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
 OPTIONS_DEFAULT=	BDB CURL GMAGICK
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
 IMAGICK_USES=		magick:6
 IMAGICK_CONFIGURE_WITH=	imagemagick
 
 GMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GMAGICK_CONFIGURE_WITH=	graphicsmagick
 GMAGICK_USES=		compiler:gcc-c++11-lib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
 GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
 FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=	festival
 
 #RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${BDB_LIB_DIR}
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|2>&1||g' ${WRKSRC}/acinclude.m4
-
 .include <bsd.port.mk>
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 973b4c0e855f..881572f4134a 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636154486
-SHA256 (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
-SIZE (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = 2222586
+TIMESTAMP = 1691217889
+SHA256 (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 4d1844a5c9f31407d34fa0339a2b462f8c53991d41045ad16b39ded5dcdfb2fe
+SIZE (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 2232411
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index 245d01c79a3c..16196680fb65 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -1,223 +1,223 @@
 bin/callpass
 bin/testdbfawk
 bin/xastir
 bin/xastir_udp_client
 man/man1/callpass.1.gz
 man/man1/testdbfawk.1.gz
 man/man1/xastir.1.gz
 man/man1/xastir_udp_client.1.gz
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/CONTRIBUTING.md
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/COPYING.LIB.LESSTIF
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/FAQ
-%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/INSTALL.md
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.CYGWIN
 %%DOCSDIR%%/README.GIT
-%%DOCSDIR%%/README.Getting-Started
 %%DOCSDIR%%/README.MAPS
 %%DOCSDIR%%/README.OSM_maps
 %%DOCSDIR%%/README.sudo
 %%DOCSDIR%%/UPGRADE
 %%DATADIR%%/Counties/placeholder
 %%DATADIR%%/GNIS/placeholder
 %%DATADIR%%/config/24kgrid.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_administrative.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_highway.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_natural.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_poi.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_water_and_coastline.dbfawk
 %%DATADIR%%/config/OSM_geofabrik_roads.dbfawk
 %%DATADIR%%/config/OSM_geofabrik_waterways.dbfawk
 %%DATADIR%%/config/arealm.dbfawk
 %%DATADIR%%/config/areawater.dbfawk
 %%DATADIR%%/config/cousub.dbfawk
 %%DATADIR%%/config/cousub00.dbfawk
 %%DATADIR%%/config/edge.dbfawk
 %%DATADIR%%/config/featnames.dbfawk
 %%DATADIR%%/config/gfe_coastal_waters.dbfawk
 %%DATADIR%%/config/gfe_coastal_waters_warnings.dbfawk
 %%DATADIR%%/config/gfe_fire_weather.dbfawk
 %%DATADIR%%/config/gfe_metro_areas.dbfawk
 %%DATADIR%%/config/gfe_public_weather.dbfawk
 %%DATADIR%%/config/gps_wpt.dbfawk
 %%DATADIR%%/config/language-Dutch.sys
 %%DATADIR%%/config/language-ElmerFudd.sys
 %%DATADIR%%/config/language-English.sys
 %%DATADIR%%/config/language-French.sys
 %%DATADIR%%/config/language-German.sys
 %%DATADIR%%/config/language-Italian.sys
 %%DATADIR%%/config/language-MuppetsChef.sys
 %%DATADIR%%/config/language-OldeEnglish.sys
 %%DATADIR%%/config/language-PigLatin.sys
 %%DATADIR%%/config/language-PirateEnglish.sys
 %%DATADIR%%/config/language-Portuguese.sys
 %%DATADIR%%/config/language-Spanish.sys
 %%DATADIR%%/config/nwsc_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_09b.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_10.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_10a.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_13.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_15.dbfawk
 %%DATADIR%%/config/nwsfz_ddmmyy_19.dbfawk
 %%DATADIR%%/config/nwshzddmmyy.dbfawk
 %%DATADIR%%/config/nwshzddmmyy_old14.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_16.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_17.dbfawk
 %%DATADIR%%/config/nwsmzoddmmyy.dbfawk
 %%DATADIR%%/config/nwsozddap12.dbfawk
 %%DATADIR%%/config/nwsozddmmyy.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_14.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_14b.dbfawk
 %%DATADIR%%/config/nwsw_ddjn12.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_10.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_13.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_14.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_14a.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_17.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_20.dbfawk
+%%DATADIR%%/config/nwsw_ddmmyy_22.dbfawk
 %%DATADIR%%/config/nwsz1ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_10.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_10b.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_10c.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_11.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_13.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_19.dbfawk
 %%DATADIR%%/config/nwszoddmmyy.dbfawk
 %%DATADIR%%/config/pointlm.dbfawk
 %%DATADIR%%/config/predefined_EVENT.sys
 %%DATADIR%%/config/predefined_SAR.sys
 %%DATADIR%%/config/stored_track.dbfawk
 %%DATADIR%%/config/tabblock.dbfawk
 %%DATADIR%%/config/tgr2shp.dbfawk
 %%DATADIR%%/config/tgr2shppoly.dbfawk
 %%DATADIR%%/config/tgr2shppoly_2006.dbfawk
 %%DATADIR%%/config/tgrcty.dbfawk
 %%DATADIR%%/config/tgrkgl.dbfawk
 %%DATADIR%%/config/tgrlk.dbfawk
 %%DATADIR%%/config/tgrlpt.dbfawk
 %%DATADIR%%/config/tgrlpy.dbfawk
 %%DATADIR%%/config/tgrplc00.dbfawk
 %%DATADIR%%/config/tgrwat.dbfawk
 %%DATADIR%%/config/tl_2009_aiannh.dbfawk
 %%DATADIR%%/config/tl_2009_aits.dbfawk
 %%DATADIR%%/config/tl_2009_arealm.dbfawk
 %%DATADIR%%/config/tl_2009_areawater.dbfawk
 %%DATADIR%%/config/tl_2009_county.dbfawk
 %%DATADIR%%/config/tl_2009_cousub.dbfawk
 %%DATADIR%%/config/tl_2009_edges.dbfawk
 %%DATADIR%%/config/tl_2009_mil.dbfawk
 %%DATADIR%%/config/tl_2009_nn_county.dbfawk
 %%DATADIR%%/config/tl_2009_pointlm.dbfawk
 %%DATADIR%%/config/tl_2009_zcta5.dbfawk
 %%DATADIR%%/config/tnc-startup.aea
 %%DATADIR%%/config/tnc-startup.d700
 %%DATADIR%%/config/tnc-startup.d72_d710
 %%DATADIR%%/config/tnc-startup.kam
 %%DATADIR%%/config/tnc-startup.kpc2
 %%DATADIR%%/config/tnc-startup.kpc3
 %%DATADIR%%/config/tnc-startup.null
 %%DATADIR%%/config/tnc-startup.paccomm
 %%DATADIR%%/config/tnc-startup.pico
 %%DATADIR%%/config/tnc-startup.sys
 %%DATADIR%%/config/tnc-startup.thd7
 %%DATADIR%%/config/tnc-startup.tnc2
 %%DATADIR%%/config/tnc-startup.tnc2-ui
 %%DATADIR%%/config/tnc-stop.d700
 %%DATADIR%%/config/tnc-stop.d72_d710
 %%DATADIR%%/config/tnc-stop.sys
 %%DATADIR%%/config/tnc-stop.thd7
 %%DATADIR%%/config/tnc-stop.tnc2-ui
 %%DATADIR%%/config/xastir.rgb
 %%DATADIR%%/fcc/placeholder
 %%DATADIR%%/help/help-Dutch.dat
 %%DATADIR%%/help/help-English.dat
 %%DATADIR%%/help/help-French.dat
 %%DATADIR%%/help/help-German.dat
 %%DATADIR%%/help/help-Italian.dat
 %%DATADIR%%/help/help-Portuguese.dat
 %%DATADIR%%/help/help-Spanish.dat
 %%DATADIR%%/maps/CC_OpenStreetMap.png
 %%DATADIR%%/maps/CC_OpenStreetMap_logo.png
 %%DATADIR%%/maps/CC_OpenStreetMap_txt.png
 %%DATADIR%%/maps/GPS/placeholder
 %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
 %%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
 %%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
 %%DATADIR%%/maps/Online/USTigermap.geo
 %%DATADIR%%/maps/Online/USTigermapBorders.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/National.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Regional.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_national.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_regional.geo
 %%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Hydrography.geo
 %%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryOnly.geo
 %%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryTopo.geo
 %%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ShadedReliefOnly.geo
 %%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Topo.geo
 %%DATADIR%%/maps/worldhi.map
 %%DATADIR%%/scripts/Coordinate.pm
 %%DATADIR%%/scripts/ads-b.pl
 %%DATADIR%%/scripts/ais.pl
 %%DATADIR%%/scripts/ais_pp.pl
 %%DATADIR%%/scripts/coord-convert.pl
 %%DATADIR%%/scripts/geopdf2gtiff.pl
 %%DATADIR%%/scripts/get-BOMdata
 %%DATADIR%%/scripts/get-NWSdata
 %%DATADIR%%/scripts/get-fcc-rac.pl
 %%DATADIR%%/scripts/get-gnis
 %%DATADIR%%/scripts/get-pop
 %%DATADIR%%/scripts/gpx2shape
 %%DATADIR%%/scripts/icontable.pl
 %%DATADIR%%/scripts/inf2geo.pl
 %%DATADIR%%/scripts/kiss-off.pl
 %%DATADIR%%/scripts/langElmerFudd.pl
 %%DATADIR%%/scripts/langMuppetsChef.pl
 %%DATADIR%%/scripts/langOldeEnglish.pl
 %%DATADIR%%/scripts/langPigLatin.pl
 %%DATADIR%%/scripts/langPirateEnglish.pl
 %%DATADIR%%/scripts/mapblast2geo.pl
 %%DATADIR%%/scripts/mapfgd.pl
 %%DATADIR%%/scripts/object2shp.pl
 %%DATADIR%%/scripts/overlay.pl
 %%DATADIR%%/scripts/ozi2geo.pl
 %%DATADIR%%/scripts/permutations.pl
 %%DATADIR%%/scripts/pos2shp.pl
 %%DATADIR%%/scripts/ridge_radar.pl
 %%DATADIR%%/scripts/slideshow.pl
 %%DATADIR%%/scripts/split_gnis.bash
 %%DATADIR%%/scripts/split_gnis.pl
 %%DATADIR%%/scripts/test_coord.pl
 %%DATADIR%%/scripts/toporama250k.pl
 %%DATADIR%%/scripts/toporama50k.pl
 %%DATADIR%%/scripts/track-get.pl
 %%DATADIR%%/scripts/update_langfile.pl
 %%DATADIR%%/scripts/waypoint-get.pl
 %%DATADIR%%/scripts/wms.pl
 %%DATADIR%%/scripts/wxnowsrv.pl
 %%DATADIR%%/sounds/placeholder
 %%DATADIR%%/symbols/13pct.xbm
 %%DATADIR%%/symbols/25pct.xbm
 %%DATADIR%%/symbols/2x2.xbm
 %%DATADIR%%/symbols/alert.xbm
 %%DATADIR%%/symbols/flood.xbm
 %%DATADIR%%/symbols/icon.png
 %%DATADIR%%/symbols/red_flag.xbm
 %%DATADIR%%/symbols/snow.xbm
 %%DATADIR%%/symbols/symbols.dat
 %%DATADIR%%/symbols/torndo.xbm
 %%DATADIR%%/symbols/wind.xbm
 %%DATADIR%%/symbols/winter_storm.xbm
 %%DATADIR%%/symbols/winter_weather.xbm