On Thu, Mar 04, 2021 at 12:00:49PM +0100, Landry Breuil wrote:
> On Thu, Mar 04, 2021 at 11:20:01AM +0100, Landry Breuil wrote:
> > On Thu, Mar 04, 2021 at 11:16:37AM +0100, Landry Breuil wrote:
> > > On Wed, Mar 03, 2021 at 10:48:40PM +0100, Michael wrote:
> > > > On Tue, Mar 02, 2021 at 05:06:45PM +0100, Landry Breuil wrote:
> > > > > On Tue, Mar 02, 2021 at 04:07:52PM +0100, Michael wrote:
> > > > > > On Tue, Mar 02, 2021 at 03:48:00PM +0100, Landry Breuil wrote:
> > > > > > > [...]
> > > > > > > can you check that it builds without the
> > > > > > > -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 in CFLAGS ? according to
> > > > > > > https://github.com/Xastir/Xastir/issues/47 that shouldnt be needed
> > > > > > > anymore, and a devel/proj update will remove proj_api.h.
> > > > > > >
> > > > > > > Landry
> > > > > > >
> > > > > >
> > > > > > Hello Landry,
> > > > > >
> > > > > > you are right, this is no longer needed.
> > > > > > Builds and runs fine without it, updated diff below.
> > > > >
> > > > > Thanks, that's great news ! I have zero knowledge about amateur radio,
> > > > > nor if this software works or not, but i'll definitely like the update
> > > > > so that i have one less hurdle to update proj !
> > > > >
> > > > > Landry
> > > > >
> > > >
> > > > The most basic things should work. Internet connectivity with common
> > > > servers such as aprs2.net also works well. It would be interesting to
> > > > get a report of somone using a serial connected GPS device since there
> > > > are OpenBSD specific patches for this in the port. But I don't think
> > > > this is critical. Also one could interface with gpsd too. Apart from
> > > > that I did not encounter any problems yet so I consider this program
> > > > well-functioning.
> > > >
> > > > If someone tries this port I recommend getting better map files as
> > > > discussed here: https://github.com/Xastir/Xastir/issues/152
> > >
> > > trying to build your diff with proj 8.0 installed, i get this configure
> > > output:
> > > ...
> > > checking for pj_init in -lproj... no
> > > ...
> > > *** Warning: geotiff requires libproj.
> > > ...
> > > configure: WARNING: unrecognized options: --with-pcre, --with-dbfawk,
> > > --with-rtree, --disable-gtk-doc
> > >
> > > MINIMUM OPTIONS:
> > > ShapeLib (Vector maps) .................... : yes
> > >
> > > RECOMMENDED OPTIONS:
> > > Xpm / Snapshots ........................... : yes
> > > GraphicsMagick/ImageMagick (Raster maps) .. : yes (GraphicsMagick)
> > > pcre (Shapefile customization) ............ : yes
> > > Berkeley DB map caching-Raster map speedups : yes
> > > internet map retrieval .................... : yes (libcurl)
> > >
> > > FOR THE ADVENTUROUS:
> > > AX25 (Linux Kernel I/O Drivers) ........... : no
> > > libproj (USGS Topos & Aerial Photos) ...... : no
> > > GeoTiff (USGS Topos & Aerial Photos) ...... : no
> > > Festival (Text-to-speech) ................. : no
> > > GPSMan/gpsmanshp (GPS downloads) .......... : no
> > >
> > > and port-lib-depends-check says that it didnt link against those libs:
> > > xastir-2.1.6(comms/xastir):
> > > Extra: gdal.40 geotiff.3 iconv.7 proj.16 tiff.40
> > >
> > > Can you recheck this on your install, so that i know if its local due to
> > > my testing of proj 8.0 ?
> >
> > Ah, i looked a bit more, and its been reported/fixed upstream with
> > https://github.com/Xastir/Xastir/commit/6ee6348ca9ad8556e48d26d976f5d6709e8e31cb
> > cf https://github.com/Xastir/Xastir/issues/173
> >
> > so i know where to look when i update proj, your diff should be totally
> > fine with proj 7.0.
>
> and looking again a bit closer, gdal support was removed in
> https://github.com/Xastir/Xastir/pull/48 so gdal can go away from the
> depends.
>
> xastir-2.1.6(comms/xastir):
> Extra: gdal.40 iconv.7
>
> the fact that it thinks iconv is extra is probably due to you removal of
> configure.ac patch, which was here since the import and adding
> AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv ${LIBS}")
>
> can you also recheck if intl/iconv support works fine without this
> dependency ?
>
> Landry
I hope I was able to follow you. Xastir still builds and runs fine with
iconv and gdal removed from the port. Not sure if that is relevant or
not but switching to different languages also still works and Umlauts
etc. work too. For the record: with proj-7.2.1.
Diff below.
Michael
Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/xastir/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile 18 Feb 2021 22:08:25 -0000 1.42
+++ Makefile 2 Mar 2021 15:01:15 -0000
@@ -2,21 +2,25 @@
COMMENT= X amateur station tracking and info reporting
-DISTNAME= xastir-2.0.6
-REVISION= 6
+VERSION= 2.1.6
+GH_ACCOUNT= Xastir
+GH_PROJECT= Xastir
+GH_TAGNAME= Release-${VERSION}
+DISTNAME= ${GH_PROJECT}-${VERSION}
+PKGNAME= xastir-${VERSION}
-CATEGORIES= comms hamradio geo
+CATEGORIES= comms hamradio geo
HOMEPAGE= https://xastir.org/
+MAINTAINER= Michael <michi+open...@dataswamp.org>
+
PERMIT_PACKAGE= Yes
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 += freetype gdal geotiff iconv lcms2 ltdl lzma m pcre proj
WANTLIB += pthread shp tiff z
-MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=xastir/)
-
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.11
@@ -24,8 +28,6 @@ MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -
.if ${MACHINE} == "sparc64"
CFLAGS += -fno-tree-ter
.endif
-# https://github.com/Xastir/Xastir/issues/47 proj 6
-CFLAGS += -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
CONFIGURE_ARGS= --with-shapelib
\
--with-pcre \
Index: distinfo
===================================================================
RCS file: /cvs/ports/comms/xastir/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 7 Nov 2014 14:20:11 -0000 1.4
+++ distinfo 2 Mar 2021 15:01:15 -0000
@@ -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.6.tar.gz) = WnGvKTbU0jfHebHDpRkhH4480DuYc6JgyEndyJUOGj4=
+SIZE (Xastir-2.1.6.tar.gz) = 2687180
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/comms/xastir/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 16 Jun 2019 13:41:30 -0000 1.2
+++ patches/patch-Makefile_in 2 Mar 2021 15:01:15 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2019/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -284,7 +284,7 @@ libexecdir = @libexecdir@
+@@ -352,7 +352,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lpr = @lpr@
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 16 Jun 2019 13:41:30 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.3 2019/06/16 13:41:30 ajacoutot Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -355,6 +355,7 @@ AC_CHECK_FUNCS([roundf])
-
- # Check for intl library (Needed for Cygwin)
- #
-+AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv ${LIBS}")
- AC_CHECK_LIB(intl, gettext, LIBS="-lintl ${LIBS}")
-
- # Check for libproj (need to do this before test for shapelib, because
Index: patches/patch-src_gps_c
===================================================================
RCS file: /cvs/ports/comms/xastir/patches/patch-src_gps_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_gps_c
--- patches/patch-src_gps_c 10 Sep 2019 11:21:24 -0000 1.1
+++ patches/patch-src_gps_c 2 Mar 2021 15:01:15 -0000
@@ -1,33 +1,31 @@
-$OpenBSD: patch-src_gps_c,v 1.1 2019/09/10 11:21:24 jca Exp $
-
-
+$OpenBSD$
Index: src/gps.c
--- src/gps.c.orig
+++ src/gps.c
-@@ -559,7 +559,6 @@ int gps_data_find(char *gps_line_data, int port) {
- int have_valid_string = 0;
+@@ -644,7 +644,6 @@ int gps_data_find(char *gps_line_data, int port)
+ int have_valid_string = 0;
#ifndef __CYGWIN__
- struct timeval tv;
-- struct timezone tz;
+ struct timeval tv;
+- struct timezone tz;
#endif // __CYGWIN__
-
-@@ -620,8 +619,6 @@ int gps_data_find(char *gps_line_data, int port) {
- if (devices[port].set_time) {
- tv.tv_sec=t;
- tv.tv_usec=0;
-- tz.tz_minuteswest=0;
-- tz.tz_dsttime=0;
- if (debug_level & 128) {
- fprintf(stderr,"Setting Time %ld EUID: %d, RUID: %d\n",
-@@ -631,7 +628,7 @@ int gps_data_find(char *gps_line_data, int port) {
+@@ -711,8 +710,6 @@ int gps_data_find(char *gps_line_data, int port)
+ {
+ tv.tv_sec=t;
+ tv.tv_usec=0;
+- tz.tz_minuteswest=0;
+- tz.tz_dsttime=0;
+
+ if (debug_level & 128)
+ {
+@@ -723,7 +720,7 @@ int gps_data_find(char *gps_line_data, int port)
#ifdef HAVE_SETTIMEOFDAY
- ENABLE_SETUID_PRIVILEGE;
-- settimeofday(&tv, &tz);
-+ settimeofday(&tv, NULL);
- DISABLE_SETUID_PRIVILEGE;
+ ENABLE_SETUID_PRIVILEGE;
+- settimeofday(&tv, &tz);
++ settimeofday(&tv, NULL);
+ DISABLE_SETUID_PRIVILEGE;
#endif // HAVE_SETTIMEOFDAY
Index: patches/patch-src_interface_c
===================================================================
RCS file: /cvs/ports/comms/xastir/patches/patch-src_interface_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_interface_c
--- patches/patch-src_interface_c 29 Jan 2014 15:22:31 -0000 1.2
+++ patches/patch-src_interface_c 2 Mar 2021 15:01:15 -0000
@@ -1,7 +1,9 @@
-$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 @@
+$OpenBSD$
+
+Index: src/interface.c
+--- src/interface.c.orig
++++ src/interface.c
+@@ -80,6 +80,15 @@
#include <Xm/XmAll.h>
@@ -9,51 +11,64 @@ $OpenBSD: patch-src_interface_c,v 1.2 20
+#include <paths.h>
+#endif
+#ifdef _PATH_UUCPLOCK
-+#define LOCK_DIR _PATH_UUCPLOCK
++#define LOCK_DIR _PATH_UUCPLOCK
+#else
-+#define LOCK_DIR "/var/lock"
++#define LOCK_DIR "/var/lock"
+#endif
+
#include "xastir.h"
#include "symbols.h"
#include "main.h"
-@@ -4355,7 +4364,7 @@ int serial_detach(int port) {
- }
-
- // Delete lockfile
-- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
get_device_name_only(port_data[port].device_name));
-+ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
get_device_name_only(port_data[port].device_name));
- if (debug_level & 2)
- fprintf(stderr,"Delete lock file %s\n",fn);
-
-@@ -4455,7 +4464,7 @@ int serial_init (int port) {
-
-
- // check for lockfile
-- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
-+ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
- get_device_name_only(port_data[port].device_name));
-
- if (filethere(fn) == 1) {
-@@ -4632,8 +4641,20 @@ int serial_init (int port) {
- return (-1);
+@@ -2717,7 +2726,7 @@ int serial_detach(int port)
}
-+#ifdef NMEADISC
-+ if (port_data[port].device_type == DEVICE_SERIAL_GPS) {
+ // Delete lockfile
+- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
get_device_name_only(port_data[port].device_name));
++ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
get_device_name_only(port_data[port].device_name));
+ if (debug_level & 2)
+ {
+ fprintf(stderr,"Delete lock file %s\n",fn);
+@@ -2829,7 +2838,7 @@ int serial_init (int port)
+
+
+ // check for lockfile
+- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
++ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
+ get_device_name_only(port_data[port].device_name));
+
+ if (filethere(fn) == 1)
+@@ -3022,8 +3031,19 @@ int serial_init (int port)
+ return (-1);
+ }
+
++ #ifdef NMEADISC
++ if (port_data[port].device_type == DEVICE_SERIAL_GPS) {
+ int ldisc = NMEADISC, ret;
-+
+ ENABLE_SETUID_PRIVILEGE;
+ ret = ioctl(port_data[port].channel, TIOCSETD, &ldisc);
+ DISABLE_SETUID_PRIVILEGE;
+ if (ret == -1)
-+ fprintf(stderr, "couldn't set nmea discipline on port %d", port);
-+ }
-+#endif
++ fprintf(stderr, "couldn't set nmea discipline on port %d", port);
++ }
++ #endif
+
- // Attempt to create the lockfile
-- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
get_device_name_only(port_data[port].device_name));
-+ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
get_device_name_only(port_data[port].device_name));
- if (debug_level & 2)
- fprintf(stderr,"Create lock file %s\n",fn);
+ // Attempt to create the lockfile
+- xastir_snprintf(fn, sizeof(fn), "/var/lock/LCK..%s",
get_device_name_only(port_data[port].device_name));
++ xastir_snprintf(fn, sizeof(fn), "%s/LCK..%s", LOCK_DIR,
get_device_name_only(port_data[port].device_name));
+ if (debug_level & 2)
+ {
+ fprintf(stderr,"Create lock file %s\n",fn);
+@@ -3454,11 +3474,12 @@ int net_init(int port)
+
+ ok = -1;
+
+-
++ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ hints.ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG;
++
+ xastir_snprintf(port_num, sizeof(port_num), "%d",
port_data[port].socket_port);
+ xastir_snprintf(st, sizeof(st), langcode("BBARSTA019"),
port_data[port].device_host_name);
Index: patches/patch-src_map_geo_c
===================================================================
RCS file: patches/patch-src_map_geo_c
diff -N patches/patch-src_map_geo_c
--- patches/patch-src_map_geo_c 16 Jun 2019 13:41:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_map_geo_c,v 1.1 2019/06/16 13:41:30 ajacoutot Exp $
-
-Unbreak with newer GraphicsMagick.
-
-Index: src/map_geo.c
---- src/map_geo.c.orig
-+++ src/map_geo.c
-@@ -126,19 +126,8 @@
- #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
- #undef PACKAGE_VERSION
- #ifdef HAVE_GRAPHICSMAGICK
--/*#include <GraphicsMagick/magick/api.h>*/
--/* Define MAGICK_IMPLEMENTATION to access private interfaces
-- * such as DestroyImagePixels(). This may not be a good thing,
-- * but DestroyImagePixels() has been in this code for a long
-- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
-- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
-- * OpenSuSE-11.3)
-- */
--#define MAGICK_IMPLEMENTATION
- #include <magick/api.h>
--#else // HAVE_GRAPHICSMAGICK
--#include <magick/api.h>
--#endif // HAVE_GRAPHICSMAGICK
-+#endif
- #undef PACKAGE_BUGREPORT
- #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
- #undef XASTIR_PACKAGE_BUGREPORT
Index: patches/patch-src_objects_h
===================================================================
RCS file: patches/patch-src_objects_h
diff -N patches/patch-src_objects_h
--- patches/patch-src_objects_h 18 Feb 2021 22:08:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_objects_h,v 1.1 2021/02/18 22:08:25 tb Exp $
-
-Index: src/objects.h
---- src/objects.h.orig
-+++ src/objects.h
-@@ -97,7 +97,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid
- //
- // number_of_predefined_objects holds the actual number of predefined
- // objects available to display on the Create/Move popup menu.
--int number_of_predefined_objects;
-+extern int number_of_predefined_objects;
- // File name of ~/.xastir/config file containing definitions for
- // a predefined object menu.
- extern char predefined_object_definition_filename[256];
Index: patches/patch-src_x_spider_h
===================================================================
RCS file: patches/patch-src_x_spider_h
diff -N patches/patch-src_x_spider_h
--- patches/patch-src_x_spider_h 18 Feb 2021 22:08:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_x_spider_h,v 1.1 2021/02/18 22:08:25 tb Exp $
-
-Index: src/x_spider.h
---- src/x_spider.h.orig
-+++ src/x_spider.h
-@@ -32,7 +32,7 @@
- #define SERV_UDP_PORT 2023
-
-
--char *pname;
-+extern char *pname;
- extern int pipe_xastir_to_tcp_server;
- extern int pipe_tcp_server_to_xastir;
- extern int pipe_xastir_to_udp_server;
Index: patches/patch-src_xa_config_c
===================================================================
RCS file: patches/patch-src_xa_config_c
diff -N patches/patch-src_xa_config_c
--- patches/patch-src_xa_config_c 18 Feb 2021 22:08:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_xa_config_c,v 1.1 2021/02/18 22:08:25 tb Exp $
-
-Index: src/xa_config.c
---- src/xa_config.c.orig
-+++ src/xa_config.c
-@@ -66,8 +66,7 @@
-
- #define MAX_VALUE 300
-
--//extern char xa_config_dir[];
--
-+char xa_config_dir[1000];
-
-
- void store_string(FILE * fout, char *option, char *value) {
Index: patches/patch-src_xa_config_h
===================================================================
RCS file: patches/patch-src_xa_config_h
diff -N patches/patch-src_xa_config_h
--- patches/patch-src_xa_config_h 18 Feb 2021 22:08:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_xa_config_h,v 1.1 2021/02/18 22:08:25 tb Exp $
-
-Index: src/xa_config.h
---- src/xa_config.h.orig
-+++ src/xa_config.h
-@@ -32,4 +32,4 @@ char *get_data_base_dir(char *dir);
- void save_data(void);
- void load_data_or_default(void);
-
--char xa_config_dir[1000]; /* cmdline option user config dir */
-+extern char xa_config_dir[1000]; /* cmdline option user config dir */
Index: patches/patch-src_xastir_udp_client_c
===================================================================
RCS file: patches/patch-src_xastir_udp_client_c
diff -N patches/patch-src_xastir_udp_client_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xastir_udp_client_c 2 Mar 2021 15:01:15 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/xastir_udp_client.c
+--- src/xastir_udp_client.c.orig
++++ src/xastir_udp_client.c
+@@ -111,7 +111,7 @@ int try_exchange(struct addrinfo *addr, char *buffer,
+ }
+
+ #ifndef AI_DEFAULT
+- #define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG)
++ #define AI_DEFAULT AI_ADDRCONFIG
+ #endif
+
+ // Loop through the possible addresses for hostname (probably IPv6 and IPv4)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/xastir/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 7 Nov 2014 14:20:11 -0000 1.6
+++ pkg/PLIST 2 Mar 2021 15:01:15 -0000
@@ -9,6 +9,7 @@
@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,13 +17,12 @@ 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
share/xastir/
share/xastir/Counties/
@@ -36,6 +36,8 @@ share/xastir/config/OSM_Cloudmade_highwa
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,15 +68,21 @@ share/xastir/config/nwsc_ddmmyy_09b.dbfa
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/nwsfz_ddmmyy_19.dbfawk
share/xastir/config/nwshzddmmyy.dbfawk
+share/xastir/config/nwshzddmmyy_old14.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
share/xastir/config/nwsozddmmyy_09.dbfawk
share/xastir/config/nwsozddmmyy_14.dbfawk
+share/xastir/config/nwsozddmmyy_14b.dbfawk
share/xastir/config/nwsw_ddjn12.dbfawk
share/xastir/config/nwsw_ddmmyy.dbfawk
share/xastir/config/nwsw_ddmmyy_09.dbfawk
@@ -82,6 +90,8 @@ share/xastir/config/nwsw_ddmmyy_10.dbfaw
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/nwsw_ddmmyy_20.dbfawk
share/xastir/config/nwsz1ddmmyy.dbfawk
share/xastir/config/nwsz_ddmmyy.dbfawk
share/xastir/config/nwsz_ddmmyy_09.dbfawk
@@ -90,6 +100,7 @@ share/xastir/config/nwsz_ddmmyy_10b.dbfa
share/xastir/config/nwsz_ddmmyy_10c.dbfawk
share/xastir/config/nwsz_ddmmyy_11.dbfawk
share/xastir/config/nwsz_ddmmyy_13.dbfawk
+share/xastir/config/nwsz_ddmmyy_19.dbfawk
share/xastir/config/nwszoddmmyy.dbfawk
share/xastir/config/pointlm.dbfawk
share/xastir/config/predefined_EVENT.sys
@@ -153,40 +164,35 @@ share/xastir/maps/CC_OpenStreetMap_txt.p
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/USTigermap.geo
+share/xastir/maps/Online/USTigermapBorders.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/WMS_USGS_Hydrography.geo
+share/xastir/maps/Online/nationalmap.gov/WMS_USGS_ImageryOnly.geo
+share/xastir/maps/Online/nationalmap.gov/WMS_USGS_ImageryTopo.geo
+share/xastir/maps/Online/nationalmap.gov/WMS_USGS_ShadedReliefOnly.geo
+share/xastir/maps/Online/nationalmap.gov/WMS_USGS_Topo.geo
share/xastir/maps/worldhi.map
share/xastir/scripts/
share/xastir/scripts/Coordinate.pm
-share/xastir/scripts/Xastir_tigerpoly.py
+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
@@ -212,11 +218,9 @@ share/xastir/scripts/toporama250k.pl
share/xastir/scripts/toporama50k.pl
share/xastir/scripts/track-get.pl
share/xastir/scripts/update_langfile.pl
-share/xastir/scripts/values
-share/xastir/scripts/values.pl
share/xastir/scripts/waypoint-get.pl
-share/xastir/scripts/xastir-fixcfg.sh
-share/xastir/scripts/xastir-migrate.sh
+share/xastir/scripts/wms.pl
+share/xastir/scripts/wxnowsrv.pl
share/xastir/sounds/
share/xastir/sounds/placeholder
share/xastir/symbols/
