svn commit: r546741 - in head/comms/linrad: . files

[Diane Bruce]

Author: db
Date: Fri Aug 28 15:29:30 2020
New Revision: 546741
URL: https://svnweb.freebsd.org/changeset/ports/546741

Log:
  - Fix under clang11
  - simplify patch for help.c

Added:
  head/comms/linrad/files/patch-screendef.h   (contents, props changed)
  head/comms/linrad/files/patch-xmain.c   (contents, props changed)
Modified:
  head/comms/linrad/Makefile
  head/comms/linrad/files/patch-help.c

Modified: head/comms/linrad/Makefile
==============================================================================
--- head/comms/linrad/Makefile	Fri Aug 28 14:49:12 2020	(r546740)
+++ head/comms/linrad/Makefile	Fri Aug 28 15:29:30 2020	(r546741)
@@ -2,7 +2,7 @@
 
 PORTNAME=	linrad
 PORTVERSION=	4.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://www.sm5bsz.com/linuxdsp/archive/
@@ -53,7 +53,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \
 		${WRKSRC}/help.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}/|' \
-		${WRKSRC}/libfind1.c ${WRKSRC}/help.c
+		${WRKSRC}/libfind1.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/comms/linrad/files/patch-help.c
==============================================================================
--- head/comms/linrad/files/patch-help.c	Fri Aug 28 14:49:12 2020	(r546740)
+++ head/comms/linrad/files/patch-help.c	Fri Aug 28 15:29:30 2020	(r546741)
@@ -1,14 +1,20 @@
---- help.c.orig	2014-11-04 10:25:00 UTC
-+++ help.c
-@@ -583,7 +583,10 @@ void write_from_msg_file(int *line, int msg_no, 
- char s[512];
- char chr;
- int i,j,k;
--msg_file=fopen(msg_filename, "r");
-+char *fn;
-+asprintf(&fn, "%s/%s", "%%LOCALBASE%%share/linrad/", msg_filename);
-+msg_file=fopen(fn, "r");
-+free(fn);
- if(msg_file == NULL)
-   {
-   sprintf(s,"Could not find %s",msg_filename);
+--- help.c.orig	2014-11-04 05:25:00.000000000 -0500
++++ help.c	2020-08-28 11:17:46.820070000 -0400
+@@ -720,7 +720,7 @@
+   printf("\n%s",s);
+   DEB"\n%s",s);
+   }  
+-msg_filename="errors.lir";
++msg_filename="%%DATADIR%%errors.lir";
+ line=3;
+ write_from_msg_file(&line, lir_errcod, screen_mode, ERROR_VERNR);
+ }  
+@@ -730,7 +730,7 @@
+ {
+ int i, line;
+ if(msg_no < 0)return;
+-msg_filename="help.lir";
++msg_filename="%%DATADIR%%help.lir";
+ line=0;
+ settextcolor(15);
+ clear_screen();

Added: head/comms/linrad/files/patch-screendef.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/linrad/files/patch-screendef.h	Fri Aug 28 15:29:30 2020	(r546741)
@@ -0,0 +1,15 @@
+--- screendef.h.orig	2020-08-28 12:43:47 UTC
++++ screendef.h
+@@ -334,9 +334,9 @@ extern int fft3_totmem;
+ extern int radar_totmem;
+ extern int s_meter_avg_filled_flag;
+ 
+-int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
+-int w3sz_offset_hz_old;  //w3sz 
+-int w3sz_users_flag;//w3sz
++extern int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
++extern int w3sz_offset_hz_old;  //w3sz 
++extern int w3sz_users_flag;//w3sz
+ 
+ extern ROUTINE current_mouse_activity;
+ extern int mouse_active_flag;

Added: head/comms/linrad/files/patch-xmain.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/linrad/files/patch-xmain.c	Fri Aug 28 15:29:30 2020	(r546741)
@@ -0,0 +1,13 @@
+--- xmain.c.orig	2014-11-04 10:25:00 UTC
++++ xmain.c
+@@ -52,6 +52,10 @@
+ #include "ldef.h"
+ #include "conf.h"
+ 
++int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
++int w3sz_offset_hz_old;  //w3sz
++int w3sz_users_flag;//w3sz
++
+ 
+ #if DO_NOT_USE_XKBLIB == TRUE 
+ #define USE_XKBLIB 0