diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index f9230fa1bc30..2a1ffaf13358 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -1,71 +1,67 @@
 PORTNAME=	linrad
 PORTVERSION=	4.02
 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
 
 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 <bsd.port.pre.mk>
 .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
+	@${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
-# 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 <bsd.port.post.mk>
diff --git a/comms/linrad/files/patch-help.c b/comms/linrad/files/patch-help.c
index a1a678a9c3c4..cff872107ebd 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 05:25:00.000000000 -0500
-+++ help.c	2020-08-28 11:17:46.820070000 -0400
-@@ -720,7 +720,7 @@
+--- 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="%%DATADIR%%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 @@
+@@ -730,7 +730,7 @@ void help_message(int msg_no)
  {
  int i, line;
  if(msg_no < 0)return;
 -msg_filename="help.lir";
-+msg_filename="%%DATADIR%%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 b5e59f52940f..63f7baff1885 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
-@@ -38,7 +38,8 @@ char *dirs[]={"/lib/i386-linux-gnu",
-               "/usr/lib64/lib",
-               "/usr/lib32",
-               "/usr/lib64",
--              "/usr/local/lib",
-+              "%%LOCALBASE%%lib",
-+              "%%LOCALBASE%%lib32",
-               "/usr/local/lib64",
-               "/usr/local32/lib",
-               "/usr/lib",
+@@ -30,7 +30,8 @@
+ 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",