Date: Mon, 21 Sep 2020 14:46:12 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549445 - head/comms/xastir Message-ID: <202009211446.08LEkCxO065849@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Mon Sep 21 14:46:12 2020 New Revision: 549445 URL: https://svnweb.freebsd.org/changeset/ports/549445 Log: Xastir 2.1.6 was released in April of 2020. FreeBSD's port still has 2.1.4 (over a year old), and that port was recently patched to fix the build with GCC 10 by adding "-fcommon" to the CFLAGS. Xastir 2.1.6 has had its GCC 10 compatibility fixed so that sort of hack is no longer needed in the port if it were updated to the new version. There are also numerous other improvements over 2.1.4, including removal of obsolete options, and consolidation of some options that had previously been set up as independently selectable, but were in fact completely dependent on each other. The build is simpler now, as some of these things that were previously user-selectable are automatic now -- notably, if shapelib support is requested and shapelib is found, pcre is also required *and* automatically enables dbfawk. The code that previously allowed shapelib support without dbfawk (and therefore pcre) has been removed. This means that the current Makefile, which has no option for deselecting shapelib, but does have an option for selecting or deselecting DBFAWK, needs a little changing: remove DBFAWK as an option and make pcre a required package along with shapelib (instead of dependent on the DBFAWK setting) and all should be well. Submitted by: russo@bogodyn.org Approved by: Maintainer Modified: head/comms/xastir/Makefile head/comms/xastir/distinfo (contents, props changed) head/comms/xastir/pkg-plist (contents, props changed) Modified: head/comms/xastir/Makefile ============================================================================== --- head/comms/xastir/Makefile Mon Sep 21 14:01:31 2020 (r549444) +++ head/comms/xastir/Makefile Mon Sep 21 14:46:12 2020 (r549445) @@ -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 @@ -68,9 +68,6 @@ IMAGICK_CONFIGURE_WITH= imagemagick 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 Modified: head/comms/xastir/distinfo ============================================================================== --- head/comms/xastir/distinfo Mon Sep 21 14:01:31 2020 (r549444) +++ head/comms/xastir/distinfo Mon Sep 21 14:46:12 2020 (r549445) @@ -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 Modified: head/comms/xastir/pkg-plist ============================================================================== --- head/comms/xastir/pkg-plist Mon Sep 21 14:01:31 2020 (r549444) +++ head/comms/xastir/pkg-plist Mon Sep 21 14:46:12 2020 (r549445) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009211446.08LEkCxO065849>