On Tue Oct 30, 2018 at 05:37:46PM -0600, Aaron Bieber wrote:
> Hi!
>
> Here is an update to xastir.
>
> Xastir changes:
> - https://github.com/Xastir/Xastir/releases/tag/Release-2.1.0
>
> Port changes:
> - Host the github tarball on my site.
> - Compile Xastir_tigerpoly.py to make portcheck happy.
> - Start using AC stuffs.
>
> OK?
>
> diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
> index dad7c3be018..1b0d6798e95 100644
> --- a/comms/xastir/Makefile
> +++ b/comms/xastir/Makefile
> @@ -2,8 +2,7 @@
>
> COMMENT= X amateur station tracking and info reporting
>
> -DISTNAME= xastir-2.0.6
> -REVISION= 1
> +DISTNAME= xastir-2.1.0
>
> CATEGORIES= comms hamradio geo
>
> @@ -17,7 +16,9 @@ WANTLIB = GraphicsMagick ICE SM X11 Xext Xm Xpm Xt bz2 c
> curl db
> WANTLIB += freetype gdal geotiff iconv intl lcms2 ltdl lzma m pcre proj
> WANTLIB += pthread shp tiff z
>
> -MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=xastir/)
> +MASTER_SITES = https://deftly.net/dist/
> +
> +MODULES = lang/python
>
> CONFIGURE_STYLE= autoconf
> AUTOCONF_VERSION= 2.69
> @@ -27,6 +28,8 @@ MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
> MAKE_FLAGS= CFLAGS="${CFLAGS} -fno-tree-ter"
> .endif
>
> +WRKDIST= ${WRKDIR}/Xastir-Release-2.1.0
> +
> CONFIGURE_ARGS= --with-shapelib
> \
> --with-pcre \
> --with-libproj \
> @@ -50,4 +53,15 @@ LIB_DEPENDS= net/curl \
> devel/pcre \
> x11/motif
>
> +AUTO_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
> +
> +post-patch:
> + @echo "Running aclocal-${AUTOMAKE_VERSION} in ${WRKSRC}"
> + @cd ${WRKSRC}; ${AUTO_ENV} ./bootstrap.sh
> +
> +post-install:
> + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> + ${PREFIX}/share/xastir/scripts/*.py
> +
> .include <bsd.port.mk>
> diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
> index 588477eab8f..d35def0e0ca 100644
> --- a/comms/xastir/distinfo
> +++ b/comms/xastir/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (xastir-2.0.6.tar.gz) = 5G3r0/Z+pcCOL4XwPiZlOHGpzdbWksju7kNsO8io3UM=
> -SIZE (xastir-2.0.6.tar.gz) = 2662042
> +SHA256 (xastir-2.1.0.tar.gz) = pIHmpsA1lUBBkENS7Fj1IkDAaHSjDfuBAAHaSJ1A9Do=
> +SIZE (xastir-2.1.0.tar.gz) = 2996246
> diff --git a/comms/xastir/patches/patch-Makefile_in
> b/comms/xastir/patches/patch-Makefile_in
> deleted file mode 100644
> index f7b7f531b62..00000000000
> --- a/comms/xastir/patches/patch-Makefile_in
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.1 2014/04/24 18:52:58 schwarze Exp $
> ---- Makefile.in.orig Thu Apr 24 19:16:05 2014
> -+++ Makefile.in Thu Apr 24 19:22:01 2014
> -@@ -250,7 +250,7 @@ libexecdir = @libexecdir@
> - localedir = @localedir@
> - localstatedir = @localstatedir@
> - lpr = @lpr@
> --mandir = ${prefix}/share/man
> -+mandir = ${prefix}/man
> - mkdir_p = @mkdir_p@
> - mv = @mv@
> - oldincludedir = @oldincludedir@
> diff --git a/comms/xastir/patches/patch-configure_ac
> b/comms/xastir/patches/patch-configure_ac
> index 933876687c0..b0e9c4cb921 100644
> --- a/comms/xastir/patches/patch-configure_ac
> +++ b/comms/xastir/patches/patch-configure_ac
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-configure_ac,v 1.2 2014/01/29 15:22:31 abieber Exp $
> ---- configure.ac.orig Tue Dec 4 16:35:35 2012
> -+++ configure.ac Tue Jan 28 10:08:15 2014
> -@@ -352,6 +352,7 @@ AC_CHECK_FUNCS([roundf])
> +Index: configure.ac
> +--- configure.ac.orig
> ++++ configure.ac
> +@@ -367,6 +367,7 @@ AC_CHECK_FUNCS([roundf])
>
> # Check for intl library (Needed for Cygwin)
> #
> diff --git a/comms/xastir/patches/patch-src_interface_c
> b/comms/xastir/patches/patch-src_interface_c
> index 7a425a3fa8c..12f56d7cd6f 100644
> --- a/comms/xastir/patches/patch-src_interface_c
> +++ b/comms/xastir/patches/patch-src_interface_c
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-src_interface_c,v 1.2 2014/01/29 15:22:31 abieber Exp $
> ---- src/interface.c.orig Mon Oct 22 18:37:22 2012
> -+++ src/interface.c Tue Jan 28 10:19:11 2014
> -@@ -88,6 +88,15 @@
> +Index: src/interface.c
> +--- src/interface.c.orig
> ++++ src/interface.c
> +@@ -87,6 +87,15 @@
>
> #include <Xm/XmAll.h>
>
> @@ -17,7 +18,7 @@ $OpenBSD: patch-src_interface_c,v 1.2 2014/01/29 15:22:31
> abieber Exp $
> #include "xastir.h"
> #include "symbols.h"
> #include "main.h"
> -@@ -4355,7 +4364,7 @@ int serial_detach(int port) {
> +@@ -4354,7 +4363,7 @@ int serial_detach(int port) {
> }
>
> // Delete lockfile
> @@ -26,7 +27,7 @@ $OpenBSD: patch-src_interface_c,v 1.2 2014/01/29 15:22:31
> abieber Exp $
> if (debug_level & 2)
> fprintf(stderr,"Delete lock file %s\n",fn);
>
> -@@ -4455,7 +4464,7 @@ int serial_init (int port) {
> +@@ -4454,7 +4463,7 @@ int serial_init (int port) {
>
>
> // check for lockfile
> @@ -35,7 +36,7 @@ $OpenBSD: patch-src_interface_c,v 1.2 2014/01/29 15:22:31
> abieber Exp $
> get_device_name_only(port_data[port].device_name));
>
> if (filethere(fn) == 1) {
> -@@ -4632,8 +4641,20 @@ int serial_init (int port) {
> +@@ -4631,8 +4640,20 @@ int serial_init (int port) {
> return (-1);
> }
>
> diff --git a/comms/xastir/pkg/PLIST b/comms/xastir/pkg/PLIST
> index 179a728b0a3..88a0b53617e 100644
> --- a/comms/xastir/pkg/PLIST
> +++ b/comms/xastir/pkg/PLIST
> @@ -3,12 +3,9 @@
> @bin bin/testdbfawk
> @bin bin/xastir
> @bin bin/xastir_udp_client
> -@man man/man1/callpass.1
> -@man man/man1/testdbfawk.1
> -@man man/man1/xastir.1
> -@man man/man1/xastir_udp_client.1
> share/doc/xastir/
> share/doc/xastir/AUTHORS
> +share/doc/xastir/CONTRIBUTING.md
> share/doc/xastir/COPYING
> share/doc/xastir/COPYING.LIB.LESSTIF
> share/doc/xastir/ChangeLog
> @@ -16,14 +13,19 @@ share/doc/xastir/FAQ
> share/doc/xastir/INSTALL
> share/doc/xastir/LICENSE
> share/doc/xastir/README
> -share/doc/xastir/README.CVS
> share/doc/xastir/README.CYGWIN
> -share/doc/xastir/README.Contributing
> +share/doc/xastir/README.GIT
> share/doc/xastir/README.Getting-Started
> share/doc/xastir/README.MAPS
> share/doc/xastir/README.OSM_maps
> -share/doc/xastir/README.win32
> +share/doc/xastir/README.sudo
> share/doc/xastir/UPGRADE
> +@mandir share/man/
> +share/man/man1/
> +@man share/man/man1/callpass.1
> +@man share/man/man1/testdbfawk.1
> +@man share/man/man1/xastir.1
> +@man share/man/man1/xastir_udp_client.1
> share/xastir/
> share/xastir/Counties/
> share/xastir/Counties/placeholder
> @@ -36,6 +38,8 @@ share/xastir/config/OSM_Cloudmade_highway.dbfawk
> share/xastir/config/OSM_Cloudmade_natural.dbfawk
> share/xastir/config/OSM_Cloudmade_poi.dbfawk
> share/xastir/config/OSM_Cloudmade_water_and_coastline.dbfawk
> +share/xastir/config/OSM_geofabrik_roads.dbfawk
> +share/xastir/config/OSM_geofabrik_waterways.dbfawk
> share/xastir/config/arealm.dbfawk
> share/xastir/config/areawater.dbfawk
> share/xastir/config/cousub.dbfawk
> @@ -66,10 +70,13 @@ share/xastir/config/nwsc_ddmmyy_09b.dbfawk
> share/xastir/config/nwsc_ddmmyy_10.dbfawk
> share/xastir/config/nwsc_ddmmyy_10a.dbfawk
> share/xastir/config/nwsc_ddmmyy_13.dbfawk
> +share/xastir/config/nwsc_ddmmyy_15.dbfawk
> share/xastir/config/nwshzddmmyy.dbfawk
> share/xastir/config/nwsmzddmmyy.dbfawk
> share/xastir/config/nwsmzddmmyy_09.dbfawk
> share/xastir/config/nwsmzddmmyy_11.dbfawk
> +share/xastir/config/nwsmzddmmyy_16.dbfawk
> +share/xastir/config/nwsmzddmmyy_17.dbfawk
> share/xastir/config/nwsmzoddmmyy.dbfawk
> share/xastir/config/nwsozddap12.dbfawk
> share/xastir/config/nwsozddmmyy.dbfawk
> @@ -82,6 +89,7 @@ share/xastir/config/nwsw_ddmmyy_10.dbfawk
> share/xastir/config/nwsw_ddmmyy_13.dbfawk
> share/xastir/config/nwsw_ddmmyy_14.dbfawk
> share/xastir/config/nwsw_ddmmyy_14a.dbfawk
> +share/xastir/config/nwsw_ddmmyy_17.dbfawk
> share/xastir/config/nwsz1ddmmyy.dbfawk
> share/xastir/config/nwsz_ddmmyy.dbfawk
> share/xastir/config/nwsz_ddmmyy_09.dbfawk
> @@ -153,40 +161,37 @@ share/xastir/maps/CC_OpenStreetMap_txt.png
> share/xastir/maps/GPS/
> share/xastir/maps/GPS/placeholder
> share/xastir/maps/Online/
> -share/xastir/maps/Online/CanadaTopo250k.geo
> -share/xastir/maps/Online/CanadaTopo50k.geo
> -share/xastir/maps/Online/OSM_cloudmade_1.geo
> -share/xastir/maps/Online/OSM_cloudmade_2.geo
> -share/xastir/maps/Online/OSM_cloudmade_5.geo
> -share/xastir/maps/Online/OSM_cloudmade_998.geo
> -share/xastir/maps/Online/OSM_cloudmade_999.geo
> share/xastir/maps/Online/OSM_tiled_cycle.geo
> +share/xastir/maps/Online/OSM_tiled_fosm.geo
> share/xastir/maps/Online/OSM_tiled_mapnik.geo
> -share/xastir/maps/Online/OSM_tiled_osmarender.geo
> -share/xastir/maps/Online/OSM_tiled_skiing.geo
> -share/xastir/maps/Online/OSM_tiled_topOSM_0_relief.geo
> -share/xastir/maps/Online/OSM_tiled_topOSM_1_contour.geo
> -share/xastir/maps/Online/OSM_tiled_topOSM_2_features.geo
> -share/xastir/maps/Online/TXRadar.geo
> -share/xastir/maps/Online/USRadar.geo
> -share/xastir/maps/Online/WMSRadar.geo
> -share/xastir/maps/Online/terraserver-reflectivity.geo
> -share/xastir/maps/Online/terraserver-topo.geo
> -share/xastir/maps/Online/terraserver-urban.geo
> -share/xastir/maps/Online/terraserver.geo
> +share/xastir/maps/Online/geogratis.gc.ca/
> +share/xastir/maps/Online/geogratis.gc.ca/National.geo
> +share/xastir/maps/Online/geogratis.gc.ca/Regional.geo
> +share/xastir/maps/Online/geogratis.gc.ca/Sub_national.geo
> +share/xastir/maps/Online/geogratis.gc.ca/Sub_regional.geo
> +share/xastir/maps/Online/nationalmap.gov/
> +share/xastir/maps/Online/nationalmap.gov/Aerial.geo
> +share/xastir/maps/Online/nationalmap.gov/Contours.geo
> +share/xastir/maps/Online/nationalmap.gov/Hydrography.geo
> +share/xastir/maps/Online/nationalmap.gov/ShadedRelief.geo
> +share/xastir/maps/Online/nationalmap.gov/Topo1-10.geo
> +share/xastir/maps/Online/nationalmap.gov/TopoRelief1-7.geo
> +share/xastir/maps/Online/nationalmap.gov/Transportation.geo
> share/xastir/maps/worldhi.map
> share/xastir/scripts/
> share/xastir/scripts/Coordinate.pm
> share/xastir/scripts/Xastir_tigerpoly.py
> +share/xastir/scripts/Xastir_tigerpoly.pyc
> +share/xastir/scripts/ads-b.pl
> +share/xastir/scripts/ais.pl
> +share/xastir/scripts/ais_pp.pl
> share/xastir/scripts/coord-convert.pl
> share/xastir/scripts/geopdf2gtiff.pl
> share/xastir/scripts/get-BOMdata
> share/xastir/scripts/get-NWSdata
> share/xastir/scripts/get-fcc-rac.pl
> share/xastir/scripts/get-gnis
> -share/xastir/scripts/get-maptools.sh
> share/xastir/scripts/get-pop
> -share/xastir/scripts/get_shapelib.sh
> share/xastir/scripts/gpx2shape
> share/xastir/scripts/icontable.pl
> share/xastir/scripts/inf2geo.pl
> @@ -215,6 +220,8 @@ share/xastir/scripts/update_langfile.pl
> share/xastir/scripts/values
> share/xastir/scripts/values.pl
> share/xastir/scripts/waypoint-get.pl
> +share/xastir/scripts/wms.pl
> +share/xastir/scripts/wxnowsrv.pl
> share/xastir/scripts/xastir-fixcfg.sh
> share/xastir/scripts/xastir-migrate.sh
> share/xastir/sounds/
>
> --
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
>
2 warnings generated.
depbase=`echo xa_config.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; cc
-DHAVE_CONFIG_H -I. -I.. -I/usr/local/include/GraphicsMagick
-I/usr/local/include -I/usr/X11R6/include -I/usr/local/include/db4
-DXASTIR_DATA_BASE=\"/usr/local/share/xastir\" -O2 -pipe -Wall -pthread -MT
xa_config.o -MD -MP -MF $depbase.Tpo -c -o xa_config.o xa_config.c && mv -f
$depbase.Tpo $depbase.Po
rm -f compiledate.c compiledate.o
echo 'char compiledate[] = "'"Compiled: `date`"'";' > compiledate.c
echo 'char gitstring[] = "'"`../scripts/XastirGitStamp.sh ..`"'";' >>
compiledate.c
depbase=`echo compiledate.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; cc
-DHAVE_CONFIG_H -I. -I.. -I/usr/local/include/GraphicsMagick
-I/usr/local/include -I/usr/X11R6/include -I/usr/local/include/db4
-DXASTIR_DATA_BASE=\"/usr/local/share/xastir\" -O2 -pipe -Wall -pthread -MT
compiledate.o -MD -MP -MF $depbase.Tpo -c -o compiledate.o compiledate.c && mv
-f $depbase.Tpo $depbase.Po
cc -O2 -pipe -Wall -pthread -Wl,--no-keep-memory -L/usr/local/lib
-L/usr/X11R6/lib -lgdal -o xastir alert.o awk.o bulletin_gui.o color.o datum.o
db.o db_gis.o dbfawk.o draw_symbols.o fcc_data.o festival.o fetch_remote.o
forked_getaddrinfo.o geo-find.o geocoder_gui.o gps.o hashtable.o
hashtable_itr.o igate.o interface.o interface_gui.o io-common.o io-mmap.o
lang.o list_gui.o locate_gui.o location.o location_gui.o main.o maps.o
map_cache.o map_dos.o map_gdal.o map_geo.o map_gnis.o map_OSM.o map_pop.o
map_pdb.o map_shp.o map_tif.o map_tiger.o map_WMS.o messages.o messages_gui.o
objects.o popup_gui.o rac_data.o rotated.o rpl_malloc.o shp_hash.o
snprintf.o sound.o tile_mgmnt.o track_gui.o util.o view_message_gui.o wx.o
wx_gui.o x_spider.o
xa_config.o compiledate.o -Lrtree -lrtree -lXm -lXt -lX11 -lGraphicsMagick
-llcms2 -lfreetype -lXext -lSM -lICE -lX11 -llzma -lbz2 -lz -lltdl -lm
-lpthread -L/usr/local/lib/db4 -ldb -lXpm -lintl -liconv -lXm -lXt -lXext -lm
-lSM -lICE -lX11 -lcurl -lproj -lshp -lpcre -ltiff -lgeotiff -lgdal
depbase=`echo xastir_udp_client.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; cc
-DHAVE_CONFIG_H -I. -I.. -I/usr/local/include/GraphicsMagick
-I/usr/local/include -I/usr/X11R6/include -I/usr/local/include/db4
-DXASTIR_DATA_BASE=\"/usr/local/share/xastir\" -O2 -pipe -Wall -pthread -MT
xastir_udp_client.o -MD -MP -MF $depbase.Tpo -c -o xastir_udp_client.o
xastir_udp_client.c && mv -f
$depbase.Tpo $depbase.Po
xastir_udp_client.c:122:22: error: use of undeclared identifier 'AI_V4MAPPED'
hints.ai_flags = AI_DEFAULT;
^
xastir_udp_client.c:108:21: note: expanded from macro 'AI_DEFAULT'
#define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG)
^
1 error generated.
*** Error 1 in src (Makefile:528 'xastir_udp_client.o')
*** Error 1 in src (Makefile:570 'all-recursive')
*** Error 1 in . (Makefile:697 'all-recursive')
*** Error 1 in /usr/ports/pobj/xastir-2.1.0/Xastir-Release-2.1.0 (Makefile:356
'all')
