comms/linrad: Update to work with newer base compiler

Latest compiler is pickier about functions without prototypes remove unused variable
freebsd · Feb 22, 2023 · 370297f · 370297f
1 parent b7ff149
commit 370297f
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 5 deletions.
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	linrad
 PORTVERSION=	4.02
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://www.sm5bsz.com/linuxdsp/archive/

diff --git a/comms/linrad/files/patch-afcsub.c b/comms/linrad/files/patch-afcsub.c
@@ -0,0 +1,22 @@
+--- afcsub.c.orig	2023-02-21 23:02:52 UTC
++++ afcsub.c
+@@ -692,7 +692,7 @@ int make_afc_signoi(void)
+
+ int make_afc_signoi(void)
+ {
+-int i, k, np,j;
++int i, k, np;
+ float t1,t2;
+ // Estimate S/N for the signal we see in mix1_eval data.
+ // Last time we used ag.fit_points blocks of eval data to evaluate
+@@ -765,10 +765,8 @@ i=np;
+ if(t2 > 0.25*t1)t2=0.25*t1;
+ k=0;
+ i=np;
+-j=0;
+ while(i != fftx_na)
+   {
+-  j++;
+   if(mix1_eval_avgn[mix1p0+i]>0)
+     {
+     if(mix1_eval_sigpwr[mix1p0+i]>t2)
diff --git a/comms/linrad/files/patch-caliq.c b/comms/linrad/files/patch-caliq.c
@@ -1,6 +1,15 @@
 --- caliq.c.orig	2014-11-04 10:25:00 UTC
 +++ caliq.c
-@@ -391,7 +391,7 @@ char s[80];
+@@ -144,7 +144,7 @@ for(j=0; j<mm; j+=2)
+   }
+ }
+
+-void write_iq_foldcorr()
++void write_iq_foldcorr(void)
+ {
+ FILE *file;
+ int i;
+@@ -391,7 +391,7 @@ int i,j,k,m,n,mm,errskip;
  int seg,color;
  int ia,ib;
  int i,j,k,m,n,mm,errskip;

diff --git a/comms/linrad/files/patch-elektor.c b/comms/linrad/files/patch-elektor.c
@@ -1,6 +1,12 @@
 --- elektor.c.orig	2014-11-04 10:25:00 UTC
 +++ elektor.c
-@@ -1018,7 +1018,7 @@ void update_elektor_rx_frequency()
+@@ -1013,12 +1013,12 @@ void elektor_rx_amp_control(void)
+   }
+ }
+
+-void update_elektor_rx_frequency()
++void update_elektor_rx_frequency(void)
+ { static double old_hwfreq=0.0;
 
  //fprintf( stderr,"update-freq() cntrfreq=%f, hwfreq=%f\n",fg.passband_center,hwfreq);
    // This routine is called from the screen thread.
@@ -9,3 +15,12 @@
    { Setup_Preselector();
      old_hwfreq = hwfreq;
    show_elektor_parms();
+@@ -1441,7 +1441,7 @@ int calc_Mux(double freq)
+   return 2;             // Use the SW setting for all others.
+ }
+
+-void Setup_Preselector()
++void Setup_Preselector(void)
+ {
+ //fprintf( stderr,"Setup_Preselector: ActMux=%d\n",ActiveMux);
+   if ( ActiveMux >= 3  &&  ActiveMux <= 6 )
diff --git a/comms/linrad/files/patch-eme.c b/comms/linrad/files/patch-eme.c
@@ -0,0 +1,11 @@
+--- eme.c.orig	2023-02-21 23:04:27 UTC
++++ eme.c
+@@ -1543,7 +1543,7 @@ return (x-(int)(x))*2*PI_L;
+ }
+
+
+-void calculate_moon_data()
++void calculate_moon_data(void)
+ {
+ char s[80];
+ int k, day;
diff --git a/comms/linrad/files/patch-help.c b/comms/linrad/files/patch-help.c
@@ -9,7 +9,7 @@
  line=3;
  write_from_msg_file(&line, lir_errcod, screen_mode, ERROR_VERNR);
  }  
-@@ -730,7 +730,7 @@ void help_message(int msg_no)
+@@ -730,7 +730,7 @@ if(msg_no < 0)return;
  {
  int i, line;
  if(msg_no < 0)return;

diff --git a/comms/linrad/files/patch-libfind1.c b/comms/linrad/files/patch-libfind1.c
@@ -1,6 +1,6 @@
 --- libfind1.c.orig	2014-11-04 10:25:00 UTC
 +++ libfind1.c
-@@ -30,7 +30,8 @@
+@@ -30,7 +30,8 @@ char *dirs[]={"/lib/i386-linux-gnu",
  char *dirs[]={"/lib/i386-linux-gnu",
                "/lib/x86_64-linux-gnu",
                "/lib",

diff --git a/comms/linrad/files/patch-wide__graph.c b/comms/linrad/files/patch-wide__graph.c
@@ -0,0 +1,11 @@
+--- wide_graph.c.orig	2023-02-21 22:04:43 UTC
++++ wide_graph.c
+@@ -1591,7 +1591,7 @@ wg.ybottom=(int)(0.35F*(float)screen_height);
+ }
+
+
+-void init_wide_graph()
++void init_wide_graph(void)
+ {
+ if (read_modepar_file(GRAPHTYPE_WG) == 0)
+   {