git: 099a25bf902f - main - comms/xastir: Update to point release 2.2.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Diane Bruce <db_at_FreeBSD.org>
Date: Thu, 05 Feb 2026 13:35:11 UTC
The branch main has been updated by db:

URL: https://cgit.FreeBSD.org/ports/commit/?id=099a25bf902f7ac4defda6b9ba5aad4d802858dc

commit 099a25bf902f7ac4defda6b9ba5aad4d802858dc
Author:     Diane Bruce <db@FreeBSD.org>
AuthorDate: 2026-02-05 13:29:04 +0000
Commit:     Diane Bruce <db@FreeBSD.org>
CommitDate: 2026-02-05 13:35:00 +0000

    comms/xastir: Update to point release 2.2.2
    
    From git repo:
    This is another point release of Xastir.
    
    It is largely a cleanup release, but a small number of improvements have been made since release 2.2.0:
    
        A bug in the formatting of "altitude in comment" packets when PHG is specified was fixed.
        the "get-NWSdata" script has been updated to download the most recent NWS shapefiles.
        Xastir can now be built against Berkeley DB version 18.1. Previously it was limited to versions in the 5.x range, which are all long past end of life.
        A higher quality PNG and SVG icon for Xastir has been added.
        Deprecated autoconf macros have been removed so that autoreconf or bootstrap don't complain so loudly.
    
    Local changes:
    - Complete removal of ImageMagick on advice of xastir developer Tom Russo <russo@bogodyn.org>
    - Addition of db18 support
    
    Reviewed by:    Tom Russo <russo@bogodyn.org>
---
 comms/xastir/Makefile             | 36 ++++++++++++------------------------
 comms/xastir/distinfo             |  6 +++---
 comms/xastir/files/pkg-message.in |  2 +-
 comms/xastir/pkg-plist            | 32 ++++++++++++++++----------------
 4 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 1b51aa879412..bbc1663182fc 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.2.0
-PORTREVISION=	10
+DISTVERSION=	2.2.2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	X Amateur Station Tracking and Information Reporting
-WWW=		http://www.xastir.org/
+WWW=		https://github.com/Xastir/Xastir/wiki
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -17,17 +16,19 @@ 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 \
+		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf \
 		libpcre2-8.so:devel/pcre2 \
 		libjxl.so:graphics/libjxl \
-		libjxl_threads.so:graphics/libjxl
+		libjxl_threads.so:graphics/libjxl \
+		libproj.so:graphics/proj \
+		libGraphicsMagick.so:graphics/GraphicsMagick
 
-USES=		autoreconf gmake gnome jpeg motif shebangfix xorg
+USES=		autoreconf gmake gnome jpeg motif shebangfix xorg bdb:18
 
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
@@ -43,11 +44,11 @@ GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS=	--without-map-cache
+CONFIGURE_ARGS=	--with-bdb-libdir=${BDB_LIB_DIR} \
+		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
+		--with-graphicsmagick
 
-OPTIONS_DEFINE=		CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
-OPTIONS_RADIO=		MGG
-OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
+OPTIONS_DEFINE=		DOCS CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 CURL_DESC=	Include CURL Internet Image support
@@ -55,34 +56,21 @@ GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 ERRORPOP_DESC=	Send error popups to stderr
-MGG_DESC=	Image library for raster map processing
-IMAGICK_DESC=	ImageMagick (Version 6)
-GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
-OPTIONS_DEFAULT=	CURL GMAGICK
+OPTIONS_DEFAULT=	CURL GEOTIFF
 
 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
 
 .include <bsd.port.mk>
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 881572f4134a..fe6cb80d88ac 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691217889
-SHA256 (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 4d1844a5c9f31407d34fa0339a2b462f8c53991d41045ad16b39ded5dcdfb2fe
-SIZE (Xastir-Xastir-Release-2.2.0_GH0.tar.gz) = 2232411
+TIMESTAMP = 1769896508
+SHA256 (Xastir-Xastir-Release-2.2.2_GH0.tar.gz) = e80d1640ef2b8071984a633d45beae878c120d6012cb371405b160a06b328542
+SIZE (Xastir-Xastir-Release-2.2.2_GH0.tar.gz) = 2246995
diff --git a/comms/xastir/files/pkg-message.in b/comms/xastir/files/pkg-message.in
index e70dec639962..a9cb7f4511af 100644
--- a/comms/xastir/files/pkg-message.in
+++ b/comms/xastir/files/pkg-message.in
@@ -3,7 +3,7 @@
   message: <<EOM
 Xastir is now installed.
 
-Hop on over to http://www.xastir.org/ for details on getting
+Hop on over to https://github.com/Xastir/Xastir/wiki for details on getting
 maps and for more information on using Xastir.
 
 Your map directory is %%PREFIX%%/share/xastir/maps
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index d694e97b688d..099ea115f056 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -2,25 +2,25 @@ bin/callpass
 bin/testdbfawk
 bin/xastir
 bin/xastir_udp_client
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB.LESSTIF
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.CYGWIN
+%%PORTDOCS%%%%DOCSDIR%%/README.GIT
+%%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
 share/man/man1/xastir_udp_client.1.gz
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/CONTRIBUTING.md
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/COPYING.LIB.LESSTIF
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/INSTALL.md
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.CYGWIN
-%%DOCSDIR%%/README.GIT
-%%DOCSDIR%%/README.MAPS
-%%DOCSDIR%%/README.OSM_maps
-%%DOCSDIR%%/README.sudo
-%%DOCSDIR%%/UPGRADE
 %%DATADIR%%/Counties/placeholder
 %%DATADIR%%/GNIS/placeholder
 %%DATADIR%%/config/24kgrid.dbfawk
@@ -178,7 +178,6 @@ share/man/man1/xastir_udp_client.1.gz
 %%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
@@ -214,6 +213,7 @@ share/man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/symbols/alert.xbm
 %%DATADIR%%/symbols/flood.xbm
 %%DATADIR%%/symbols/icon.png
+%%DATADIR%%/symbols/icon.svg
 %%DATADIR%%/symbols/red_flag.xbm
 %%DATADIR%%/symbols/snow.xbm
 %%DATADIR%%/symbols/symbols.dat