git: 370297f9fba7 - main - comms/linrad: Update to work with newer base compiler
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Feb 2023 15:18:08 UTC
The branch main has been updated by db:
URL: https://cgit.FreeBSD.org/ports/commit/?id=370297f9fba7a4c0f72591238b1f9fb2c8bed4a1
commit 370297f9fba7a4c0f72591238b1f9fb2c8bed4a1
Author: Diane Bruce <db@FreeBSD.org>
AuthorDate: 2023-02-22 15:16:33 +0000
Commit: Diane Bruce <db@FreeBSD.org>
CommitDate: 2023-02-22 15:16:33 +0000
comms/linrad: Update to work with newer base compiler
Latest compiler is pickier about functions without prototypes
remove unused variable
---
comms/linrad/Makefile | 2 +-
comms/linrad/files/patch-afcsub.c | 22 ++++++++++++++++++++++
comms/linrad/files/patch-caliq.c | 11 ++++++++++-
comms/linrad/files/patch-elektor.c | 17 ++++++++++++++++-
comms/linrad/files/patch-eme.c | 11 +++++++++++
comms/linrad/files/patch-help.c | 2 +-
comms/linrad/files/patch-libfind1.c | 2 +-
comms/linrad/files/patch-wide__graph.c | 11 +++++++++++
8 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 8739a75faf0a..02554c584573 100644
--- 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
new file mode 100644
index 000000000000..8c8e15d61ea5
--- /dev/null
+++ 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
index 4b5038ba85f3..8a9fc99241f4 100644
--- 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
index 7c26b19cf20f..4f3aa5077bfe 100644
--- 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
new file mode 100644
index 000000000000..795c221acfc0
--- /dev/null
+++ 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
index cff872107ebd..e28724faa8fe 100644
--- 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
index 63f7baff1885..644fa1cc8a93 100644
--- 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
new file mode 100644
index 000000000000..f1f212b97973
--- /dev/null
+++ 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)
+ {