Re: FIX: comms/xastir -fno-common

2021-02-18 Thread Theo Buehler
On Mon, Feb 15, 2021 at 05:17:41PM +0100, Michael wrote:
> I have a port for the more up to date version 2.1.6 in my own tree, 
> however this would need more testing; so for now here is just a fix for 
> version 2.0.6 with -fno-common.

Committed, thank you.



FIX: comms/xastir -fno-common

2021-02-15 Thread Michael
Hello ports,

I have a port for the more up to date version 2.1.6 in my own tree, 
however this would need more testing; so for now here is just a fix for 
version 2.0.6 with -fno-common.

Tested on amd64.


Index: Makefile
===
RCS file: /cvs/ports/comms/xastir/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile16 Jan 2021 17:26:16 -  1.41
+++ Makefile15 Feb 2021 16:04:56 -
@@ -3,7 +3,7 @@
 COMMENT=   X amateur station tracking and info reporting
 
 DISTNAME=  xastir-2.0.6
-REVISION=  5
+REVISION=  6
 
 CATEGORIES=comms hamradio geo
 
Index: patches/patch-src_objects_h
===
RCS file: patches/patch-src_objects_h
diff -N patches/patch-src_objects_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_objects_h 15 Feb 2021 16:04:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_x_spider_h15 Feb 2021 16:04:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_xa_config_c   15 Feb 2021 16:04:56 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_xa_config_h   15 Feb 2021 16:04:56 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+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 */