diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index 8739a75faf0a..02554c584573 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -1,68 +1,68 @@ 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/ DISTNAME= lir04-02 MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio DSP utility (SDR) WWW= https://www.nitehawk.com/sm5bsz/linuxdsp/linrad.htm LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to compile: implicit declaration of function outb BROKEN_armv6= fails to configure: cannot find /nxb-bin/usr/bin/cc BROKEN_armv7= fails to configure: cannot find /nxb-bin/usr/bin/cc BROKEN_powerpc64= fails to compile: implicit declaration of function outb BROKEN_powerpc64le= fails to compile: implicit declaration of function outb BROKEN_riscv64= fails to build: gmake: No rule to make target 'Makefile' BROKEN_sparc64= fails to compile: implicit declaration of function outb LIB_DEPENDS= librtlsdr.so:comms/rtl-sdr \ libportaudio.so:audio/portaudio \ libftdi.so:devel/libftdi BUILD_DEPENDS= nasm:devel/nasm USES= gmake tar:tbz xorg WRKSRC= ${WRKDIR}/${PORTNAME}-0${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_XORG= x11 xext LINRAD_DOCFILES= z_APM.txt z_BUFFERS.txt z_CALIBRATE.txt \ z_COPYRIGHT.txt z_GIFINFO.txt \ z_MORSE_DECODING.txt z_MOUSE.txt z_NETWORK.txt \ z_PARALLEL_PORT.txt z_SETTINGS.txt \ z_USERS_EXTRA.txt z_USERS_HWARE.txt .include .if ${ARCH} == "i386" BINFILE= xlinrad .else BINFILE= xlinrad64 .endif ALL_TARGET= ${BINFILE} post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}/|' \ ${WRKSRC}/libfind1.c ${WRKSRC}/help.c do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/errors.lir ${STAGEDIR}${DATADIR}/errors.lir ${INSTALL_DATA} ${WRKSRC}/help.lir ${STAGEDIR}${DATADIR}/help.lir ${INSTALL_SCRIPT} -m0555 ${FILESDIR}/linrad ${STAGEDIR}${PREFIX}/bin/linrad ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${BINFILE} ${STAGEDIR}${PREFIX}/bin/x${PORTNAME} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${LINRAD_DOCFILES} ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}/$f .endfor .include 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,11 +1,20 @@ --- 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 0.001 ) + if ( fabs(old_hwfreq-hwfreq) > 0.001 ) { 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 @@ -1,20 +1,20 @@ --- help.c.orig 2014-11-04 10:25:00 UTC +++ help.c @@ -720,7 +720,7 @@ else printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; +msg_filename="%%PREFIX%%/share/linrad/errors.lir"; 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; -msg_filename="help.lir"; +msg_filename="%%PREFIX%%/share/linrad/help.lir"; line=0; settextcolor(15); clear_screen(); 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,12 +1,12 @@ --- 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", - "/lib32", + "%%PREFIX%%/lib", + "/lib32", "/lib64", "/usr/lib/i386-linux-gnu", "/usr/lib/x86_64-linux-gnu", 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) + {