4 files changed, 61 insertions, 41 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 82899dbbb5c0..ce43416627a9 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -2,30 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	xastir
-PORTVERSION=	2.0.6
-PORTREVISION=	5
+DISTVERSIONPREFIX=	Release-
+DISTVERSION=	2.1.0
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png
-
+		libpng.so:graphics/png \
+		libjbig.so:graphics/jbigkit \
+		libwebp.so:graphics/webp \
+		libwebpmux.so:graphics/webp \
+		liblcms2.so:graphics/lcms2 \
+		libfreetype.so:print/freetype2 \
+		libjasper.so:graphics/jasper \
+		libwmflite.so:graphics/libwmf
 GNU_CONFIGURE=	yes
 USES=		gettext gmake jpeg motif python:run shebangfix
-SHEBANG_FILES=	scripts/*.pl scripts/get-maptools.sh \
-		scripts/gpx2shape scripts/values.pl.in \
-		scripts/Xastir_tigerpoly.py
+USE_GCC=	yes
+USE_XORG=	x11 xt xext sm ice
+USE_GNOME+=	libxml2
+SHEBANG_FILES=	scripts/gpx2shape scripts/values.pl.in
+SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py) 
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	Xastir
+GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
-		RTREE ERRORPOP BDB
+OPTIONS_DEFINE=	DAVIS SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
+		RTREE ERRORPOP BDB 
 
+DAVIS_DESC=	Include Davis Weatherstation Support
 SHAPELIB_DESC=	Include Shapelib support
 DBFAWK_DESC=	Include DBFAWK Support
 MAGICK_DESC=	Include GraphicsMagick Support
@@ -40,6 +55,8 @@ BDB_DESC=	Tiger Map Caching using Berkeley DB
 
 OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 
+DAVIS_CONFIGURE_ON=	--enable-davis
+
 SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
 SHAPELIB_CONFIGURE_WITH=	shapelib
 
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 2be70e4a1e05..5c23d8960cac 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xastir-2.0.6.tar.gz) = e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8eeee436c3bc8a8dd43
-SIZE (xastir-2.0.6.tar.gz) = 2662042
+TIMESTAMP = 1519518726
+SHA256 (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = a481e6a6c035954041904352ec58f52240c06874a30dfb810001da489d40f43a
+SIZE (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = 2996246
diff --git a/comms/xastir/files/patch-Makefile.in b/comms/xastir/files/patch-Makefile.in
index 0931331e5b64..3254ccec7886 100644
--- a/comms/xastir/files/patch-Makefile.in
+++ b/comms/xastir/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2007-12-21 16:43:24.000000000 -0500
-+++ Makefile.in	2007-12-21 16:43:30.000000000 -0500
-@@ -205,7 +205,7 @@
- libexecdir = @libexecdir@
+--- Makefile.in.orig	2016-07-01 18:52:47 UTC
++++ Makefile.in
+@@ -284,7 +284,7 @@ libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  lpr = @lpr@
 -mandir = ${prefix}/share/man
 +mandir = @mandir@
  mkdir_p = @mkdir_p@
+ mv = @mv@
  oldincludedir = @oldincludedir@
- prefix = @prefix@
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index 6f020cecf8c2..61800d9bb681 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -7,6 +7,7 @@ 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
@@ -14,13 +15,12 @@ man/man1/xastir_udp_client.1.gz
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/README
-%%DOCSDIR%%/README.CVS
 %%DOCSDIR%%/README.CYGWIN
-%%DOCSDIR%%/README.Contributing
+%%DOCSDIR%%/README.GIT
 %%DOCSDIR%%/README.Getting-Started
 %%DOCSDIR%%/README.MAPS
 %%DOCSDIR%%/README.OSM_maps
-%%DOCSDIR%%/README.win32
+%%DOCSDIR%%/README.sudo
 %%DOCSDIR%%/UPGRADE
 %%DATADIR%%/Counties/placeholder
 %%DATADIR%%/GNIS/placeholder
@@ -30,6 +30,8 @@ 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_roads.dbfawk
+%%DATADIR%%/config/OSM_geofabrik_waterways.dbfawk
 %%DATADIR%%/config/arealm.dbfawk
 %%DATADIR%%/config/areawater.dbfawk
 %%DATADIR%%/config/cousub.dbfawk
@@ -60,10 +62,13 @@ man/man1/xastir_udp_client.1.gz
 %%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/nwshzddmmyy.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
@@ -76,6 +81,7 @@ man/man1/xastir_udp_client.1.gz
 %%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/nwsz1ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk
@@ -142,39 +148,33 @@ 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/Online/CanadaTopo250k.geo
-%%DATADIR%%/maps/Online/CanadaTopo50k.geo
-%%DATADIR%%/maps/Online/OSM_cloudmade_1.geo
-%%DATADIR%%/maps/Online/OSM_cloudmade_2.geo
-%%DATADIR%%/maps/Online/OSM_cloudmade_5.geo
-%%DATADIR%%/maps/Online/OSM_cloudmade_998.geo
-%%DATADIR%%/maps/Online/OSM_cloudmade_999.geo
 %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
+%%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
 %%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
-%%DATADIR%%/maps/Online/OSM_tiled_osmarender.geo
-%%DATADIR%%/maps/Online/OSM_tiled_skiing.geo
-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_0_relief.geo
-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_1_contour.geo
-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_2_features.geo
-%%DATADIR%%/maps/Online/TXRadar.geo
-%%DATADIR%%/maps/Online/USRadar.geo
-%%DATADIR%%/maps/Online/WMSRadar.geo
-%%DATADIR%%/maps/Online/terraserver-reflectivity.geo
-%%DATADIR%%/maps/Online/terraserver-topo.geo
-%%DATADIR%%/maps/Online/terraserver-urban.geo
-%%DATADIR%%/maps/Online/terraserver.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/Aerial.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/Contours.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/Hydrography.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/ShadedRelief.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/Topo1-10.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/TopoRelief1-7.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/Transportation.geo
 %%DATADIR%%/maps/worldhi.map
 %%DATADIR%%/scripts/Coordinate.pm
 %%DATADIR%%/scripts/Xastir_tigerpoly.py
+%%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-maptools.sh
 %%DATADIR%%/scripts/get-pop
-%%DATADIR%%/scripts/get_shapelib.sh
 %%DATADIR%%/scripts/gpx2shape
 %%DATADIR%%/scripts/icontable.pl
 %%DATADIR%%/scripts/inf2geo.pl
@@ -203,6 +203,8 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/scripts/values
 %%DATADIR%%/scripts/values.pl
 %%DATADIR%%/scripts/waypoint-get.pl
+%%DATADIR%%/scripts/wms.pl
+%%DATADIR%%/scripts/wxnowsrv.pl
 %%DATADIR%%/scripts/xastir-fixcfg.sh
 %%DATADIR%%/scripts/xastir-migrate.sh
 %%DATADIR%%/sounds/placeholder