summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comms/xastir/Makefile13
-rw-r--r--comms/xastir/distinfo6
-rw-r--r--comms/xastir/pkg-plist4
3 files changed, 11 insertions, 12 deletions
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index dbf76ad4dde1..544d795c143d 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -3,8 +3,7 @@
PORTNAME= xastir
DISTVERSIONPREFIX= Release-
-DISTVERSION= 2.1.4
-PORTREVISION= 3
+DISTVERSION= 2.1.6
CATEGORIES= comms hamradio
MAINTAINER= carl@stagecraft.cx
@@ -24,7 +23,8 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp \
libwebpmux.so:graphics/webp \
- libwmflite.so:graphics/libwmf
+ libwmflite.so:graphics/libwmf \
+ libpcre.so:devel/pcre
USES= gettext gmake gnome jpeg motif python:run shebangfix xorg
@@ -38,11 +38,11 @@ SHEBANG_REGEX= ./scripts/.*\.(sh|pl|py)
USE_GITHUB= yes
GH_ACCOUNT= Xastir
GH_PROJECT= Xastir
-CFLAGS+= -fcommon
+#CFLAGS+= -fcommon
SUB_FILES= pkg-message
-OPTIONS_DEFINE= BDB CURL DAVIS DBFAWK ERRORPOP FESTIVAL GEOTIFF GPSMAN
+OPTIONS_DEFINE= BDB CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
OPTIONS_RADIO= MGG
OPTIONS_RADIO_MGG= GMAGICK IMAGICK
@@ -69,9 +69,6 @@ GMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick
GMAGICK_CONFIGURE_WITH= graphicsmagick
GMAGICK_USES= compiler:gcc-c++11-lib
-DBFAWK_LIB_DEPENDS= libpcre.so:devel/pcre
-DBFAWK_CONFIGURE_WITH= dbfawk
-
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
GEOTIFF_LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 540fa2e1f652..ba86a2720b84 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563174412
-SHA256 (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
-SIZE (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 2694124
+TIMESTAMP = 1600663254
+SHA256 (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e
+SIZE (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 2687180
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index b022fc7d9225..245d01c79a3c 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -63,6 +63,7 @@ man/man1/xastir_udp_client.1.gz
%%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
@@ -84,6 +85,7 @@ man/man1/xastir_udp_client.1.gz
%%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/nwsz1ddmmyy.dbfawk
%%DATADIR%%/config/nwsz_ddmmyy.dbfawk
%%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk
@@ -92,6 +94,7 @@ man/man1/xastir_udp_client.1.gz
%%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
@@ -166,7 +169,6 @@ man/man1/xastir_udp_client.1.gz
%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Topo.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