- Update Xastir to the latest stable version.

- It's been 2 years since the last stable release.

Feature safe:	yes
PR:		ports/174148
Submitted by:	Maintainer

4 files changed, 79 insertions, 56 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 070eec9e6f85..95b022c85238 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	xastir
-# Date created:				17th June 2004
-# Whom:					Carl Makin <carl@stagecraft.cx>
-#
 # $FreeBSD$
-#
+# Created by:		Carl Makin <carl@stagecraft.cx>
 
 PORTNAME=	xastir
-PORTVERSION=	2.0.0
-PORTREVISION=	9
+PORTVERSION=	2.0.4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
@@ -16,7 +11,7 @@ COMMENT=	X Amateur Station Tracking and Information Reporting
 
 BUILD_DEPENDS=	xfontsel:${PORTSDIR}/x11-fonts/xfontsel
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
@@ -24,6 +19,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_GETTEXT=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		xastir.1 \
 		callpass.1 \
@@ -53,19 +49,19 @@ OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSHAPELIB}
-LIB_DEPENDS+=	shp.1:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS+=	shp:${PORTSDIR}/devel/shapelib
 .else
 CONFIGURE_ARGS+=	--without-shapelib
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	GraphicsMagickWand.7:${PORTSDIR}/graphics/GraphicsMagick13
+LIB_DEPENDS+=	GraphicsMagickWand:${PORTSDIR}/graphics/GraphicsMagick13
 .else
 CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
 .endif
 
 .if ${PORT_OPTIONS:MDBFAWK}
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--without-dbfawk
 .endif
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 67a3997ef73f..3c68264666a0 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xastir-2.0.0.tar.gz) = a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
-SIZE (xastir-2.0.0.tar.gz) = 2544827
+SHA256 (xastir-2.0.4.tar.gz) = 975f1cbe1ee32334e579588dcf2e19bcc607ad7b5f9d0848075f6d283d65af86
+SIZE (xastir-2.0.4.tar.gz) = 2655250
diff --git a/comms/xastir/files/pkg-message.in b/comms/xastir/files/pkg-message.in
index 98d87f8f1db9..97fe2c5b2f03 100644
--- a/comms/xastir/files/pkg-message.in
+++ b/comms/xastir/files/pkg-message.in
@@ -1,6 +1,13 @@
 ********************************************************************
 Xastir is now installed.
 
+**** Important ****
+If you are upgrading from v2.0.0 and using the
+"TNC with GPS on AUX port" interface then unless you have a KPC-3+ TNC
+or other TNC that requires a Control-E to be sent to receive GPS data
+you will need to deselect "Send Control-E to receive GPS data?" in
+the interface properties.  D700s and similar do NOT need this setting.
+
 Hop on over to http://www.xastir.org/ for details on getting
 maps and for more information on using Xastir.
 
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index caf5bf022085..0817ae3472a7 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -2,45 +2,6 @@ bin/callpass
 bin/testdbfawk
 bin/xastir
 bin/xastir_udp_client
-lib/xastir/Coordinate.pm
-lib/xastir/Xastir_tigerpoly.py
-lib/xastir/coord-convert.pl
-lib/xastir/get-NWSdata
-lib/xastir/get-fcc-rac.pl
-lib/xastir/get-gnis
-lib/xastir/get-maptools.sh
-lib/xastir/get-pop
-lib/xastir/get_shapelib.sh
-lib/xastir/gpx2shape
-lib/xastir/icontable.pl
-lib/xastir/inf2geo.pl
-lib/xastir/kiss-off.pl
-lib/xastir/langElmerFudd.pl
-lib/xastir/langMuppetsChef.pl
-lib/xastir/langOldeEnglish.pl
-lib/xastir/langPigLatin.pl
-lib/xastir/langPirateEnglish.pl
-lib/xastir/mapblast2geo.pl
-lib/xastir/mapfgd.pl
-lib/xastir/object2shp.pl
-lib/xastir/overlay.pl
-lib/xastir/ozi2geo.pl
-lib/xastir/permutations.pl
-lib/xastir/pos2shp.pl
-lib/xastir/ridge_radar.pl
-lib/xastir/slideshow.pl
-lib/xastir/split_gnis.bash
-lib/xastir/split_gnis.pl
-lib/xastir/test_coord.pl
-lib/xastir/toporama250k.pl
-lib/xastir/toporama50k.pl
-lib/xastir/track-get.pl
-lib/xastir/update_langfile.pl
-lib/xastir/values
-lib/xastir/values.pl
-lib/xastir/waypoint-get.pl
-lib/xastir/xastir-fixcfg.sh
-lib/xastir/xastir-migrate.sh
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/COPYING.LIB.LESSTIF
@@ -71,6 +32,11 @@ lib/xastir/xastir-migrate.sh
 %%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
@@ -87,17 +53,27 @@ lib/xastir/xastir-migrate.sh
 %%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/nwshzddmmyy.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_09.dbfawk
+%%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
 %%DATADIR%%/config/nwsmzoddmmyy.dbfawk
+%%DATADIR%%/config/nwsozddap12.dbfawk
 %%DATADIR%%/config/nwsozddmmyy.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_09.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/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/nwszoddmmyy.dbfawk
 %%DATADIR%%/config/pointlm.dbfawk
 %%DATADIR%%/config/predefined_EVENT.sys
@@ -127,6 +103,7 @@ lib/xastir/xastir-migrate.sh
 %%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
@@ -138,6 +115,7 @@ lib/xastir/xastir-migrate.sh
 %%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
@@ -176,21 +154,64 @@ lib/xastir/xastir-migrate.sh
 %%DATADIR%%/maps/Online/terraserver-urban.geo
 %%DATADIR%%/maps/Online/terraserver.geo
 %%DATADIR%%/maps/worldhi.map
+%%DATADIR%%/scripts/Coordinate.pm
+%%DATADIR%%/scripts/Xastir_tigerpoly.py
+%%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-maptools.sh
+%%DATADIR%%/scripts/get-pop
+%%DATADIR%%/scripts/get_shapelib.sh
+%%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/values
+%%DATADIR%%/scripts/values.pl
+%%DATADIR%%/scripts/waypoint-get.pl
+%%DATADIR%%/scripts/xastir-fixcfg.sh
+%%DATADIR%%/scripts/xastir-migrate.sh
 %%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/tornado.xbm
+%%DATADIR%%/symbols/torndo.xbm
 %%DATADIR%%/symbols/wind.xbm
-%%DATADIR%%/symbols/winter_wx.xbm
-%%DATADIR%%/symbols/wntr_strm.xbm
+%%DATADIR%%/symbols/winter_storm.xbm
+%%DATADIR%%/symbols/winter_weather.xbm
 @dirrm %%DATADIR%%/symbols
 @dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/maps/Online
 @dirrm %%DATADIR%%/maps/GPS
 @dirrm %%DATADIR%%/maps
@@ -201,4 +222,3 @@ lib/xastir/xastir-migrate.sh
 @dirrm %%DATADIR%%/Counties
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@dirrm lib/xastir