comms/xastir: update to 2.2.4

- Default is FESTIVAL and GPSMAN so removed FESTIVAL and GPSMAN options
- Removed python from SHEBANG since no longer any python
- patch-Makefile.am no longer needed (fixed upstream)
- Run through portlint

This version adds a number of new maps NaturalEarth, new NWS subdirectory,
a number of obsolete files removed, and docs updated.,

4 files changed, 64 insertions, 68 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index bbc1663182fc..07eb715fe589 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.2.2
+DISTVERSION=	2.2.4
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -10,9 +10,10 @@ WWW=		https://github.com/Xastir/Xastir/wiki
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
-RUN_DEPENDS=	wget:ftp/wget
+RUN_DEPENDS=	wget:ftp/wget \
+		xfontsel:x11-fonts/xfontsel
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libcjson.so:devel/libcjson \
 		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
 		liblcms2.so:graphics/lcms2 \
@@ -27,16 +28,17 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libjxl_threads.so:graphics/libjxl \
 		libproj.so:graphics/proj \
 		libGraphicsMagick.so:graphics/GraphicsMagick
+BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp \
+		festival:audio/festival
 
 USES=		autoreconf gmake gnome jpeg motif shebangfix xorg bdb:18
-
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SHEBANG_FILES=	scripts/gpx2shape
-SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
+SHEBANG_REGEX=	./scripts/.*\.(sh|pl)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
@@ -48,13 +50,11 @@ CONFIGURE_ARGS=	--with-bdb-libdir=${BDB_LIB_DIR} \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-graphicsmagick
 
-OPTIONS_DEFINE=		DOCS CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
+OPTIONS_DEFINE=		DOCS CURL DAVIS ERRORPOP GEOTIFF
 
 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
 
 OPTIONS_DEFAULT=	CURL GEOTIFF
@@ -65,12 +65,6 @@ 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_CONFIGURE_WITH=	gpsman
-
-FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
-FESTIVAL_CONFIGURE_WITH=	festival
-
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 .include <bsd.port.mk>
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index fe6cb80d88ac..4dbb583ff9a7 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769896508
-SHA256 (Xastir-Xastir-Release-2.2.2_GH0.tar.gz) = e80d1640ef2b8071984a633d45beae878c120d6012cb371405b160a06b328542
-SIZE (Xastir-Xastir-Release-2.2.2_GH0.tar.gz) = 2246995
+TIMESTAMP = 1772467670
+SHA256 (Xastir-Xastir-Release-2.2.4_GH0.tar.gz) = cc521b8590bacc8d1f1f99a6596660c46174f7c809d6ecbbbf4b8dfa57a68419
+SIZE (Xastir-Xastir-Release-2.2.4_GH0.tar.gz) = 4332053
diff --git a/comms/xastir/files/patch-Makefile.am b/comms/xastir/files/patch-Makefile.am
deleted file mode 100644
index 6b06e9b70d78..000000000000
--- a/comms/xastir/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2021-12-29 11:33:10 UTC
-+++ Makefile.am
-@@ -76,7 +76,7 @@ install-data-hook:
- 	rm -f CC_OpenStreetMap.png && \
- 	$(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
-  
--mandir=${prefix}/share/man
-+mandir=@mandir@
- man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
- 
- # Use tiles for these maps
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index 099ea115f056..e068d52b62ad 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -12,11 +12,10 @@ bin/xastir_udp_client
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.CYGWIN
-%%PORTDOCS%%%%DOCSDIR%%/README.GIT
+%%PORTDOCS%%%%DOCSDIR%%/README.GIT.md
 %%PORTDOCS%%%%DOCSDIR%%/README.MAPS
 %%PORTDOCS%%%%DOCSDIR%%/README.OSM_maps
 %%PORTDOCS%%%%DOCSDIR%%/README.sudo
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 share/man/man1/callpass.1.gz
 share/man/man1/testdbfawk.1.gz
 share/man/man1/xastir.1.gz
@@ -29,6 +28,10 @@ share/man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/config/OSM_Cloudmade_natural.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_poi.dbfawk
 %%DATADIR%%/config/OSM_Cloudmade_water_and_coastline.dbfawk
+%%DATADIR%%/config/OSM_geofabrik_2026_buildings.dbfawk
+%%DATADIR%%/config/OSM_geofabrik_2026_natural_and_water.dbfawk
+%%DATADIR%%/config/OSM_geofabrik_2026_roads.dbfawk
+%%DATADIR%%/config/OSM_geofabrik_2026_waterways.dbfawk
 %%DATADIR%%/config/OSM_geofabrik_roads.dbfawk
 %%DATADIR%%/config/OSM_geofabrik_waterways.dbfawk
 %%DATADIR%%/config/arealm.dbfawk
@@ -56,46 +59,12 @@ share/man/man1/xastir_udp_client.1.gz
 %%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/nwsfz_ddmmyy.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
@@ -122,6 +91,16 @@ share/man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/config/tl_2009_nn_county.dbfawk
 %%DATADIR%%/config/tl_2009_pointlm.dbfawk
 %%DATADIR%%/config/tl_2009_zcta5.dbfawk
+%%DATADIR%%/config/tl_2025_arealm.dbfawk
+%%DATADIR%%/config/tl_2025_areawater.dbfawk
+%%DATADIR%%/config/tl_2025_county.dbfawk
+%%DATADIR%%/config/tl_2025_cousub.dbfawk
+%%DATADIR%%/config/tl_2025_linearwater.dbfawk
+%%DATADIR%%/config/tl_2025_place.dbfawk
+%%DATADIR%%/config/tl_2025_pointlm.dbfawk
+%%DATADIR%%/config/tl_2025_rails.dbfawk
+%%DATADIR%%/config/tl_2025_roads.dbfawk
+%%DATADIR%%/config/tl_2025_uac.dbfawk
 %%DATADIR%%/config/tnc-startup.aea
 %%DATADIR%%/config/tnc-startup.d700
 %%DATADIR%%/config/tnc-startup.d72_d710
@@ -153,6 +132,43 @@ share/man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/maps/CC_OpenStreetMap_logo.png
 %%DATADIR%%/maps/CC_OpenStreetMap_txt.png
 %%DATADIR%%/maps/GPS/placeholder
+%%DATADIR%%/maps/NaturalEarth/LICENSE.md
+%%DATADIR%%/maps/NaturalEarth/README
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.README.html
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.VERSION.txt
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.cpg
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.dbf
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.dbfawk
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.prj
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.shp
+%%DATADIR%%/maps/NaturalEarth/ne_50m_admin_0_countries_lakes.shx
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.README.html
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.VERSION.txt
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.cpg
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.dbf
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.dbfawk
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.prj
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.shp
+%%DATADIR%%/maps/NaturalEarth/ne_50m_coastline.shx
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.README.html
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.VERSION.txt
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.cpg
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.dbf
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.dbfawk
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.prj
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.shp
+%%DATADIR%%/maps/NaturalEarth/ne_50m_lakes.shx
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.README.html
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.VERSION.txt
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.cpg
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.dbf
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.dbfawk
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.prj
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.shp
+%%DATADIR%%/maps/NaturalEarth/ne_50m_rivers_lake_centerlines.shx
+%%DATADIR%%/maps/Online/NWS/NWSRadar_Alaska_CompositeRef.geo
+%%DATADIR%%/maps/Online/NWS/NWSRadar_CONUS_CompositeRef.geo
+%%DATADIR%%/maps/Online/NWS/NWSRadar_Hawaii_CompositeRef.geo
 %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
 %%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
 %%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
@@ -177,7 +193,6 @@ share/man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/scripts/get-BOMdata
 %%DATADIR%%/scripts/get-NWSdata
 %%DATADIR%%/scripts/get-fcc-rac.pl
-%%DATADIR%%/scripts/get-gnis
 %%DATADIR%%/scripts/gpx2shape
 %%DATADIR%%/scripts/icontable.pl
 %%DATADIR%%/scripts/inf2geo.pl
@@ -196,8 +211,6 @@ share/man/man1/xastir_udp_client.1.gz
 %%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