diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index e63c0d0819fc..1b6edb038e24 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	diablo
 PORTVERSION=	5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	http://www.openusenet.org/diablo/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-REL
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Comprehensive newsfeeding and newsreading software package
 WWW=		https://www.openusenet.org/diablo/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	xmake:devel/xmake
 
 PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 
 OPTIONS_DEFINE=	DES DOCS
 DES_DESC=	DES encryption support
 
 USES=		tar:tgz
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 post-patch:
 	@${CP} ${FILESDIR}/diablo.in ${WRKDIR}/diablo
 	@${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\
 		s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \
 		${WRKSRC}/XMakefile.inc
 	@${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKDIR}/diablo ${WRKSRC}/XMakefile.inst
 # Fix for GCC 4.2
 	@${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
 		${WRKSRC}/dreaderd/main.c
 
 post-patch-DES-off:
 	@${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
 
 do-build:
 	(cd ${WRKSRC} && xmake all)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/dbin
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/dqueue
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/news
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/group
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq
 	(cd ${WRKSRC} && xmake install)
 	@${RM} -r ${STAGEDIR}${PREFIX}/news/man
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/*
 	${INSTALL_SCRIPT} ${WRKDIR}/diablo ${STAGEDIR}${PREFIX}/etc/rc.d
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/news/diablo/files/patch-aa b/news/diablo/files/patch-aa
index 4ac2344dc701..db2754ae5601 100644
--- a/news/diablo/files/patch-aa
+++ b/news/diablo/files/patch-aa
@@ -1,20 +1,20 @@
 --- XMakefile.inc.orig	Tue Jun 20 10:31:09 2000
 +++ XMakefile.inc	Tue Jun 20 10:43:22 2000
 @@ -20,8 +20,8 @@
  #endif
  
  .set LFLAGS	-L$(BD)obj -lfilter -ldiablo -lutil -lm
 -.set IDIR	/news
 -.set MDIR	/news/man
 +.set IDIR	%%PREFIX%%/news
-+.set MDIR	%%PREFIX%%/man
++.set MDIR	%%PREFIX%%/share/man
  .set INSTALL	install
  
  #ifdef __FreeBSD__
 @@ -41,5 +41,5 @@
  .set INSTALL	/usr/ucb/install
  #endif
  
 -.set DIST /news
 +.set DIST %%PREFIX%%/news
  
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index 4449585754e4..b830adb4bef6 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -1,137 +1,137 @@
 etc/rc.d/diablo
-man/man5/diablo-files.5.gz
-man/man5/diablo-kp.5.gz
-man/man8/dexpire.8.gz
-man/man8/dexpireover.8.gz
-man/man8/dfeedinfo.8.gz
-man/man8/dgrpctl.8.gz
-man/man8/dhisexpire.8.gz
-man/man8/diablo.8.gz
-man/man8/dicmd.8.gz
-man/man8/didump.8.gz
-man/man8/diloadfromspool.8.gz
-man/man8/dilookup.8.gz
-man/man8/dkp.8.gz
-man/man8/dnewslink.8.gz
-man/man8/doutq.8.gz
-man/man8/doverctl.8.gz
-man/man8/dpath.8.gz
-man/man8/drcmd.8.gz
-man/man8/dreadart.8.gz
-man/man8/dreaderd.8.gz
-man/man8/dreadover.8.gz
-man/man8/drequeue.8.gz
-man/man8/dspoolout.8.gz
-man/man8/dsyncgroups.8.gz
+share/man/man5/diablo-files.5.gz
+share/man/man5/diablo-kp.5.gz
+share/man/man8/dexpire.8.gz
+share/man/man8/dexpireover.8.gz
+share/man/man8/dfeedinfo.8.gz
+share/man/man8/dgrpctl.8.gz
+share/man/man8/dhisexpire.8.gz
+share/man/man8/diablo.8.gz
+share/man/man8/dicmd.8.gz
+share/man/man8/didump.8.gz
+share/man/man8/diloadfromspool.8.gz
+share/man/man8/dilookup.8.gz
+share/man/man8/dkp.8.gz
+share/man/man8/dnewslink.8.gz
+share/man/man8/doutq.8.gz
+share/man/man8/doverctl.8.gz
+share/man/man8/dpath.8.gz
+share/man/man8/drcmd.8.gz
+share/man/man8/dreadart.8.gz
+share/man/man8/dreaderd.8.gz
+share/man/man8/dreadover.8.gz
+share/man/man8/drequeue.8.gz
+share/man/man8/dspoolout.8.gz
+share/man/man8/dsyncgroups.8.gz
 @owner news
 @group news
 news/dactive.kp
 @mode 755
 news/dbin/.cvsignore
 news/dbin/.empty
 news/dbin/dcancel
 news/dbin/dclient
 news/dbin/dexpire
 news/dbin/dexpirecache
 news/dbin/dexpireover
 news/dbin/dexpirescoring
 news/dbin/dfeedinfo
 news/dbin/dfeedtest
 news/dbin/dgrpctl
 news/dbin/dhisbench
 news/dbin/dhisctl
 news/dbin/dhisexpire
 news/dbin/diablo
 news/dbin/dicmd
 news/dbin/diconvhist
 news/dbin/didate
 news/dbin/didump
 news/dbin/diload
 news/dbin/diloadfromspool
 news/dbin/dilookup
 news/dbin/dkp
 news/dbin/dlockhistory
 news/dbin/dnewslink
 news/dbin/doutq
 news/dbin/doverctl
 news/dbin/dpath
 news/dbin/dprimehostcache
 news/dbin/drcmd
 news/dbin/dreadart
 news/dbin/dreaderd
 news/dbin/dreadover
 news/dbin/drequeue
 news/dbin/dspaminfo
 news/dbin/dspoolout
 news/dbin/dstart
 news/dbin/dsyncgroups
 news/dbin/pgpverify
 news/dbin/plock
 news/dbin/showlocks
 @mode
 news/dcontrol.ctl
 news/dexpire.ctl
 news/diablo.config
 news/distrib.pats
 news/dnewsfeeds
 news/dreader.access
 news/dserver.hosts
 news/dspool.ctl
 news/moderators
 news/samples/adm/biweekly.atrim
 news/samples/adm/crontab.sample
 news/samples/adm/daily.atrim
 news/samples/adm/daily.reader
 news/samples/adm/hourly.expire
 news/samples/adm/old.biweekly.atrim.dexpire
 news/samples/adm/rc.news
 news/samples/adm/rot
 news/samples/adm/weekly.reader
 news/samples/dactive.kp
 news/samples/dcontrol.ctl
 news/samples/dexpire.ctl
 news/samples/diablo.config
 news/samples/diablo.hosts
 news/samples/distrib.pats
 news/samples/dnewsfeeds
 news/samples/dnntpspool.ctl
 news/samples/dreader.access
 news/samples/dserver.hosts
 news/samples/dspool.ctl
 news/samples/feeder+reader/README
 news/samples/feeder+reader/dactive.kp
 news/samples/feeder+reader/dcontrol.ctl
 news/samples/feeder+reader/dexpire.ctl
 news/samples/feeder+reader/diablo.config
 news/samples/feeder+reader/distrib.pats
 news/samples/feeder+reader/dnewsfeeds
 news/samples/feeder+reader/dreader.access
 news/samples/feeder+reader/dserver.hosts
 news/samples/feeder+reader/dspool.ctl
 news/samples/feeder+reader/moderators
 news/samples/feeder/diablo.config
 news/samples/feeder/dnewsfeeds
 news/samples/feeder/dspool.ctl
 news/samples/moderators
 news/samples/pgp-sample
 news/samples/reader/dactive.kp
 news/samples/reader/dcontrol.ctl
 news/samples/reader/dexpire.ctl
 news/samples/reader/diablo.config
 news/samples/reader/distrib.pats
 news/samples/reader/dreader.access
 news/samples/reader/dserver.hosts
 news/samples/reader/moderators
 @dir news/samples/feeder+reader
 @dir news/samples/feeder
 @dir news/spool/postq
 @dir news/spool/news
 @dir news/spool/group
 @dir news/spool/cache
 @dir news/spool
 @dir news/run
 @dir news/log
 @dir news/dqueue
 @dir news
 @owner
 @group