diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index 6c8abf67dafe..8b78b77f834a 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	argus-clients
 PORTVERSION=	3.0.8.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Client programs for the argus IP network transaction auditing tool
 WWW=		https://www.qosient.com/argus/
 
 LICENSE=	GPLv3
 
 USES=		bison ncurses perl5 readline shebangfix
 CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 
 OPTIONS_DEFINE=	MYSQL SASL DOCS EXAMPLES
 OPTIONS_DEFAULT=MYSQL SASL
 OPTIONS_SUB=	yes
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 MYSQL_USES=	mysql
 
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	examples/rahosts/raips.pl
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSASL}
 PKGNAMESUFFIX+=	-sasl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/radium.conf|${PREFIX}/etc/radium.conf|' ${WRKSRC}/clients/radium.c
 	@${REINPLACE_CMD} -e 's|/usr/lib/sasl2|${PREFIX}/lib/sasl2|' ${WRKSRC}/common/argus_auth.c
 	@${REINPLACE_CMD} -e 's|/etc/ra.conf|${PREFIX}/etc/ra.conf|' ${WRKSRC}/common/argus_util.c
 	@${REINPLACE_CMD} -e 's|/etc/rapolicy.conf|${PREFIX}/etc/rapolicy.conf|' \
 		${WRKSRC}/examples/rapolicy/rapolicy.c
 	@${REINPLACE_CMD} -e 's|/usr/local/bin/ra|${PREFIX}/bin/ra|' \
 		${WRKSRC}/examples/ramysql/rasql.c
 
 do-install:
 .for i in ra rabins racluster raconvert racount radium radump raevent \
 	rafilteraddr ragrep rahisto ralabel ranonymize rapath rapolicy \
 	rarpwatch raservices rasort rasplit rastream rastrip \
 	ratemplate ratimerange ratop rauserdata
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
 .for i in argusclientbug radark ragraph rahosts raips raplot raports
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
 .for i in ra.1 rabins.1 racluster.1 raconvert.1 racount.1 radump.1 raevent.1 \
 	rafilteraddr.1 ragraph.1 ragrep.1 rahisto.1 ralabel.1 ranonymize.1 \
 	rapath.1 rapolicy.1 rasort.1 rasplit.1 rastream.1 rastrip.1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/share/man/man1
 .endfor
 .for i in racluster.5 radium.conf.5 ralabel.conf.5 ranonymize.5 rarc.5
-	${INSTALL_MAN} ${WRKSRC}/man/man5/$i ${STAGEDIR}/${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/man5/$i ${STAGEDIR}/${PREFIX}/share/man/man5
 .endfor
 .for i in radium.8
-	${INSTALL_MAN} ${WRKSRC}/man/man8/$i ${STAGEDIR}/${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/man8/$i ${STAGEDIR}/${PREFIX}/share/man/man8
 .endfor
 
 do-install-MYSQL-on:
 .for i in rasql rasqlinsert rasqltimeindex
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
 .for i in rasql.1 rasqlinsert.1 rasqltimeindex.1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/share/man/man1
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}/
 .for i in AUTHORS CHANGES CREDITS ChangeLog INSTALL \
 	MANIFEST README VERSION
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}/${DOCSDIR}
 .endfor
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for i in Config Database Startup System
 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/$i
 .endfor
 .for i in delegated-ipv4-latest excel.rc iana-address-file \
 	iana-ipv4-address iana-multicast-address iana-port-numbers \
 	racluster.conf radium.conf ragetcountrycodes.sh ralabel.conf \
 	ranonymize.conf rarc rarc.print.all.conf rastream.sh std.sig \
 	wireshark.manuf.txt
 	${INSTALL_DATA} ${WRKSRC}/support/Config/$i ${STAGEDIR}/${EXAMPLESDIR}/Config/$i
 .endfor
 .for i in MySQL.Archive.sh README
 	${INSTALL_DATA} ${WRKSRC}/support/Database/$i ${STAGEDIR}/${EXAMPLESDIR}/Database/$i
 .endfor
 .for i in README com.qosient.radium.plist com.qosient.rasplit.plist \
 	radium radium.service rasplit
 	${INSTALL_DATA} ${WRKSRC}/support/Startup/$i ${STAGEDIR}/${EXAMPLESDIR}/Startup/$i
 .endfor
 .for i in magic
 	${INSTALL_DATA} ${WRKSRC}/support/System/$i ${STAGEDIR}/${EXAMPLESDIR}/System/$i
 .endfor
 .include <bsd.port.mk>
diff --git a/net-mgmt/argus3-clients/pkg-plist b/net-mgmt/argus3-clients/pkg-plist
index 97fca7e9fba5..8acb4aa57b4d 100644
--- a/net-mgmt/argus3-clients/pkg-plist
+++ b/net-mgmt/argus3-clients/pkg-plist
@@ -1,96 +1,96 @@
 bin/argusclientbug
 bin/ra
 bin/rabins
 bin/racluster
 bin/raconvert
 bin/racount
 bin/radark
 bin/radium
 bin/radump
 bin/raevent
 bin/rafilteraddr
 bin/ragraph
 bin/ragrep
 bin/rahisto
 bin/rahosts
 bin/raips
 bin/ralabel
 bin/ranonymize
 bin/rapath
 bin/raplot
 bin/rapolicy
 bin/raports
 bin/rarpwatch
 bin/raservices
 bin/rasort
 bin/rasplit
 %%MYSQL%%bin/rasql
 %%MYSQL%%bin/rasqlinsert
 %%MYSQL%%bin/rasqltimeindex
 bin/rastream
 bin/rastrip
 bin/ratemplate
 bin/ratimerange
 bin/ratop
 bin/rauserdata
-man/man1/ra.1.gz
-man/man1/rabins.1.gz
-man/man1/racluster.1.gz
-man/man1/raconvert.1.gz
-man/man1/racount.1.gz
-man/man1/radump.1.gz
-man/man1/raevent.1.gz
-man/man1/rafilteraddr.1.gz
-man/man1/ragraph.1.gz
-man/man1/ragrep.1.gz
-man/man1/rahisto.1.gz
-man/man1/ralabel.1.gz
-man/man1/ranonymize.1.gz
-man/man1/rapath.1.gz
-man/man1/rapolicy.1.gz
-man/man1/rasort.1.gz
-man/man1/rasplit.1.gz
-%%MYSQL%%man/man1/rasql.1.gz
-%%MYSQL%%man/man1/rasqlinsert.1.gz
-%%MYSQL%%man/man1/rasqltimeindex.1.gz
-man/man1/rastream.1.gz
-man/man1/rastrip.1.gz
-man/man5/racluster.5.gz
-man/man5/radium.conf.5.gz
-man/man5/ralabel.conf.5.gz
-man/man5/ranonymize.5.gz
-man/man5/rarc.5.gz
-man/man8/radium.8.gz
+share/man/man1/ra.1.gz
+share/man/man1/rabins.1.gz
+share/man/man1/racluster.1.gz
+share/man/man1/raconvert.1.gz
+share/man/man1/racount.1.gz
+share/man/man1/radump.1.gz
+share/man/man1/raevent.1.gz
+share/man/man1/rafilteraddr.1.gz
+share/man/man1/ragraph.1.gz
+share/man/man1/ragrep.1.gz
+share/man/man1/rahisto.1.gz
+share/man/man1/ralabel.1.gz
+share/man/man1/ranonymize.1.gz
+share/man/man1/rapath.1.gz
+share/man/man1/rapolicy.1.gz
+share/man/man1/rasort.1.gz
+share/man/man1/rasplit.1.gz
+%%MYSQL%%share/man/man1/rasql.1.gz
+%%MYSQL%%share/man/man1/rasqlinsert.1.gz
+%%MYSQL%%share/man/man1/rasqltimeindex.1.gz
+share/man/man1/rastream.1.gz
+share/man/man1/rastrip.1.gz
+share/man/man5/racluster.5.gz
+share/man/man5/radium.conf.5.gz
+share/man/man5/ralabel.conf.5.gz
+share/man/man5/ranonymize.5.gz
+share/man/man5/rarc.5.gz
+share/man/man8/radium.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/MANIFEST
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/VERSION
 %%EXAMPLESDIR%%/Config/delegated-ipv4-latest
 %%EXAMPLESDIR%%/Config/excel.rc
 %%EXAMPLESDIR%%/Config/iana-address-file
 %%EXAMPLESDIR%%/Config/iana-ipv4-address
 %%EXAMPLESDIR%%/Config/iana-multicast-address
 %%EXAMPLESDIR%%/Config/iana-port-numbers
 %%EXAMPLESDIR%%/Config/racluster.conf
 %%EXAMPLESDIR%%/Config/radium.conf
 %%EXAMPLESDIR%%/Config/ragetcountrycodes.sh
 %%EXAMPLESDIR%%/Config/ralabel.conf
 %%EXAMPLESDIR%%/Config/ranonymize.conf
 %%EXAMPLESDIR%%/Config/rarc
 %%EXAMPLESDIR%%/Config/rarc.print.all.conf
 %%EXAMPLESDIR%%/Config/rastream.sh
 %%EXAMPLESDIR%%/Config/std.sig
 %%EXAMPLESDIR%%/Config/wireshark.manuf.txt
 %%EXAMPLESDIR%%/Database/MySQL.Archive.sh
 %%EXAMPLESDIR%%/Database/README
 %%EXAMPLESDIR%%/Startup/README
 %%EXAMPLESDIR%%/Startup/com.qosient.radium.plist
 %%EXAMPLESDIR%%/Startup/com.qosient.rasplit.plist
 %%EXAMPLESDIR%%/Startup/radium
 %%EXAMPLESDIR%%/Startup/radium.service
 %%EXAMPLESDIR%%/Startup/rasplit
 %%EXAMPLESDIR%%/System/magic