Index: head/comms/linrad/Makefile =================================================================== --- head/comms/linrad/Makefile (revision 546740) +++ head/comms/linrad/Makefile (revision 546741) @@ -1,71 +1,71 @@ # $FreeBSD$ 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/ DISTNAME= lir04-02 MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio DSP utility (SDR) LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE 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 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_sparc64= fails to compile: implicit declaration of function outb .include .if ${ARCH} == "i386" BINFILE= xlinrad .else BINFILE= xlinrad64 .endif ALL_TARGET= ${BINFILE} 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} ${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 # Some day we may want the svga version as well. # ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga ${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 Index: head/comms/linrad/files/patch-help.c =================================================================== --- head/comms/linrad/files/patch-help.c (revision 546740) +++ head/comms/linrad/files/patch-help.c (revision 546741) @@ -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(); Index: head/comms/linrad/files/patch-screendef.h =================================================================== --- head/comms/linrad/files/patch-screendef.h (nonexistent) +++ head/comms/linrad/files/patch-screendef.h (revision 546741) @@ -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; Property changes on: head/comms/linrad/files/patch-screendef.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/linrad/files/patch-xmain.c =================================================================== --- head/comms/linrad/files/patch-xmain.c (nonexistent) +++ head/comms/linrad/files/patch-xmain.c (revision 546741) @@ -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 Property changes on: head/comms/linrad/files/patch-xmain.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property