diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 946bd1cc81c8..253b9bac329c 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,95 +1,94 @@
 PORTNAME=	yodl
 PORTVERSION=	3.10.00
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Easy to use but powerful document formatting/preparation language
 WWW=		https://fbb-git.gitlab.io/yodl/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/bin/getopt:misc/getopt
 BUILD_DEPENDS=	icmake:devel/icmake \
 		bash:shells/bash \
 		gsed:textproc/gsed
 
 USES=		cpe perl5 shebangfix compiler:c++14-lang
 CPE_VENDOR=	${PORTNAME}_project
 USE_PERL5=	build
 USE_GITLAB=	yes
 GL_ACCOUNT=	fbb-git
 GL_TAGNAME=	5fa97b175c85581d01329013cfdb4239f019b023
 
 SHEBANG_LANG=	icmake
 icmake_OLD_CMD=	/usr/bin/icmake
 icmake_CMD=	${LOCALBASE}/bin/icmake
 
 SHEBANG_FILES=	${WRKSRC}/macros/rawmacros/create \
 		${WRKSRC}/macros/rawmacros/keepdiff \
 		${WRKSRC}/macros/rawmacros/makeyoin \
 		${WRKSRC}/macros/rawmacros/repairs \
 		${WRKSRC}/macros/rawmacros/separator \
 		${WRKSRC}/macros/rawmacros/separator.pl \
 		${WRKSRC}/macros/rawmacros/startdoc \
 		${WRKSRC}/macros/rawmacros/startdoc.pl \
 		${WRKSRC}/contrib/build.pl \
 		${WRKSRC}/src/yodl/replace \
 		${WRKSRC}/scripts/configreplacements \
 		${WRKSRC}/scripts/macroseparator.pl \
 		${WRKSRC}/scripts/stdmacros \
 		${WRKSRC}/scripts/yodl2whatever.in \
 		${WRKSRC}/build
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 DOCS_USES=	tex
 DOCS_USE=	TEX=latex:build,dvipsk:build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \
-		s|"/share/man"|"/man"| ; \
 		s|"/share/doc/yodl"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/yodl-doc"|"/share/doc/${PORTNAME}-${PORTVERSION}/doc"| ; \
 		s|"gcc"|"${CC}"| ; \
 		s|"g++"|"${CXX}"|' \
 		${WRKSRC}/INSTALL.im
 	@${REINPLACE_CMD} -e 's|yodlconverters.1|yodlconverters.1.gz| ; \
 		s|".1"|".1.gz"|' \
 		${WRKSRC}/icmake/install
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
 		s|"-O2 -Wall"|"-Wall ${CFLAGS}"|' \
 		${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|sed |${LOCALBASE}/bin/gsed | ; \
 		s|getopt |${LOCALBASE}/bin/getopt |' \
 		${WRKSRC}/scripts/configreplacements \
 		${WRKSRC}/scripts/yodl2whatever.in \
 		${WRKSRC}/scripts/yodlstriproff \
 		${WRKSRC}/macros/rawmacros/repairs
 
 do-build:
 	@cd ${WRKSRC} && ./build programs strip
 	@cd ${WRKSRC} && ./build macros
 	@cd ${WRKSRC} && ./build man
 
 do-build-DOCS-on:
 	@cd ${WRKSRC} && ./build manual
 
 do-install:
 	@cd ${WRKSRC} && ./build install programs ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install macros ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install man ${STAGEDIR}
 
 do-install-DOCS-on:
 	@cd ${WRKSRC} && ./build install manual ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install docs ${STAGEDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/yodl/pkg-plist b/textproc/yodl/pkg-plist
index e952d81df49a..f918fd088e79 100644
--- a/textproc/yodl/pkg-plist
+++ b/textproc/yodl/pkg-plist
@@ -1,62 +1,62 @@
 bin/yodl
 bin/yodl2html
 bin/yodl2latex
 bin/yodl2man
 bin/yodl2txt
 bin/yodl2whatever
 bin/yodl2xml
 bin/yodlpost
 bin/yodlstriproff
 bin/yodlverbinsert
-man/man1/yodl.1.gz
-man/man1/yodlconverters.1.gz
-man/man1/yodlpost.1.gz
-man/man1/yodlstriproff.1.gz
-man/man1/yodlverbinsert.1.gz
-man/man1/yodl2html.1.gz
-man/man1/yodl2latex.1.gz
-man/man1/yodl2man.1.gz
-man/man1/yodl2txt.1.gz
-man/man1/yodl2whatever.1.gz
-man/man1/yodl2xml.1.gz
-man/man7/yodlbuiltins.7.gz
-man/man7/yodlletter.7.gz
-man/man7/yodlmacros.7.gz
-man/man7/yodlmanpage.7.gz
+share/man/man1/yodl.1.gz
+share/man/man1/yodlconverters.1.gz
+share/man/man1/yodlpost.1.gz
+share/man/man1/yodlstriproff.1.gz
+share/man/man1/yodlverbinsert.1.gz
+share/man/man1/yodl2html.1.gz
+share/man/man1/yodl2latex.1.gz
+share/man/man1/yodl2man.1.gz
+share/man/man1/yodl2txt.1.gz
+share/man/man1/yodl2whatever.1.gz
+share/man/man1/yodl2xml.1.gz
+share/man/man7/yodlbuiltins.7.gz
+share/man/man7/yodlletter.7.gz
+share/man/man7/yodlmacros.7.gz
+share/man/man7/yodlmanpage.7.gz
 share/yodl-%%PORTVERSION%%/chartables/html.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/latex.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/latex2.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/man.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/sgml.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/shell.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/texinfo.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/txt.tables.yo
 share/yodl-%%PORTVERSION%%/chartables/xml.tables.yo
 share/yodl-%%PORTVERSION%%/xml/rug-articlebegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-articleendtitle.xml
 share/yodl-%%PORTVERSION%%/xml/rug-articlesummary.xml
 share/yodl-%%PORTVERSION%%/xml/rug-menubegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-menuend.xml
 share/yodl-%%PORTVERSION%%/xml/rug-menuendtitle.xml
 share/yodl-%%PORTVERSION%%/xml/rug-xhtmlbegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-xhtmlend.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-articlebegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-articleendtitle.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-articlesummary.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-menubegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-menuend.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-menuendtitle.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-xhtmlbegin.xml
 share/yodl-%%PORTVERSION%%/xml/rug-nl-xhtmlend.xml
 share/yodl-%%PORTVERSION%%/html.yo
 share/yodl-%%PORTVERSION%%/latex.yo
 share/yodl-%%PORTVERSION%%/man.yo
 share/yodl-%%PORTVERSION%%/std.html.yo
 share/yodl-%%PORTVERSION%%/std.latex.yo
 share/yodl-%%PORTVERSION%%/std.man.yo
 share/yodl-%%PORTVERSION%%/std.txt.yo
 share/yodl-%%PORTVERSION%%/std.xml.yo
 share/yodl-%%PORTVERSION%%/txt.yo
 share/yodl-%%PORTVERSION%%/xlatin1.tex
 share/yodl-%%PORTVERSION%%/xml.yo
 share/yodl-%%PORTVERSION%%/yodlversion.yo