Index: head/textproc/htmldoc/Makefile
===================================================================
--- head/textproc/htmldoc/Makefile	(revision 523160)
+++ head/textproc/htmldoc/Makefile	(revision 523161)
@@ -1,52 +1,51 @@
 # Created by: Glenn Trewitt <glenn@trewitt.org>
 # $FreeBSD$
 
 PORTNAME=		htmldoc
 PORTVERSION=		1.9.3
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		textproc
 
 MAINTAINER=	jose@diasfernandes.pt
 COMMENT=	Converts HTML to PDF and/or PostScript
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips=	Complains of expecting ) before png_ptr
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	michaelrsweet
 
 HAS_CONFIGURE=	yes
-MAKE_ARGS=	mandir="${MANDIRS}"
 
 OPTIONS_DEFINE=		HTMLDOCGUI GNUTLS
 OPTIONS_DEFAULT=	GNUTLS
 
 HTMLDOCGUI_DESC=	Build GUI front-end
 HTMLDOCGUI_CONFIGURE_WITH=	gui=yes
 HTMLDOCGUI_LIB_DEPENDS=		libfltk.so:x11-toolkits/fltk \
 				libfontconfig.so:x11-fonts/fontconfig
 HTMLDOCGUI_USES=		xorg
 HTMLDOCGUI_USE=			XORG=x11,xrender,xcursor,xfixes \
 				xext,xft,xinerama jpeg
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 GNUTLS_USES=			pkgconfig
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 
 .include <bsd.port.pre.mk>
 
 # Fix arm64 build
 .if ${ARCH} == "aarch64"
 pre-build:
 	${REINPLACE_CMD} -e '/PNG_FILTER_OPTIMIZATIONS(pp, bpp);/d' ${WRKSRC}/png/pngrutil.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc
 
 .include <bsd.port.post.mk>
Index: head/textproc/htmldoc/pkg-plist
===================================================================
--- head/textproc/htmldoc/pkg-plist	(revision 523160)
+++ head/textproc/htmldoc/pkg-plist	(revision 523161)
@@ -1,80 +1,80 @@
 bin/htmldoc
-man/man1/htmldoc.1.gz
+share/man/man1/htmldoc.1.gz
 %%DOCSDIR%%/help.html
 %%DOCSDIR%%/htmldoc.pdf
 %%DATADIR%%/fonts/Courier-Bold.afm
 %%DATADIR%%/fonts/Courier-Bold.pfa
 %%DATADIR%%/fonts/Courier-BoldOblique.afm
 %%DATADIR%%/fonts/Courier-BoldOblique.pfa
 %%DATADIR%%/fonts/Courier-Oblique.afm
 %%DATADIR%%/fonts/Courier-Oblique.pfa
 %%DATADIR%%/fonts/Courier.afm
 %%DATADIR%%/fonts/Courier.pfa
 %%DATADIR%%/fonts/Dingbats.afm
 %%DATADIR%%/fonts/Dingbats.pfa
 %%DATADIR%%/fonts/Helvetica-Bold.afm
 %%DATADIR%%/fonts/Helvetica-Bold.pfa
 %%DATADIR%%/fonts/Helvetica-BoldOblique.afm
 %%DATADIR%%/fonts/Helvetica-BoldOblique.pfa
 %%DATADIR%%/fonts/Helvetica-Oblique.afm
 %%DATADIR%%/fonts/Helvetica-Oblique.pfa
 %%DATADIR%%/fonts/Helvetica.afm
 %%DATADIR%%/fonts/Helvetica.pfa
 %%DATADIR%%/fonts/Monospace-Bold.afm
 %%DATADIR%%/fonts/Monospace-Bold.pfa
 %%DATADIR%%/fonts/Monospace-BoldOblique.afm
 %%DATADIR%%/fonts/Monospace-BoldOblique.pfa
 %%DATADIR%%/fonts/Monospace-Oblique.afm
 %%DATADIR%%/fonts/Monospace-Oblique.pfa
 %%DATADIR%%/fonts/Monospace.afm
 %%DATADIR%%/fonts/Monospace.pfa
 %%DATADIR%%/fonts/Sans-Bold.afm
 %%DATADIR%%/fonts/Sans-Bold.pfa
 %%DATADIR%%/fonts/Sans-BoldOblique.afm
 %%DATADIR%%/fonts/Sans-BoldOblique.pfa
 %%DATADIR%%/fonts/Sans-Oblique.afm
 %%DATADIR%%/fonts/Sans-Oblique.pfa
 %%DATADIR%%/fonts/Sans.afm
 %%DATADIR%%/fonts/Sans.pfa
 %%DATADIR%%/fonts/Serif-Bold.afm
 %%DATADIR%%/fonts/Serif-Bold.pfa
 %%DATADIR%%/fonts/Serif-BoldOblique.afm
 %%DATADIR%%/fonts/Serif-BoldOblique.pfa
 %%DATADIR%%/fonts/Serif-Oblique.afm
 %%DATADIR%%/fonts/Serif-Oblique.pfa
 %%DATADIR%%/fonts/Serif-Roman.afm
 %%DATADIR%%/fonts/Serif-Roman.pfa
 %%DATADIR%%/fonts/Symbol.afm
 %%DATADIR%%/fonts/Symbol.pfa
 %%DATADIR%%/fonts/Times-Bold.afm
 %%DATADIR%%/fonts/Times-Bold.pfa
 %%DATADIR%%/fonts/Times-BoldItalic.afm
 %%DATADIR%%/fonts/Times-BoldItalic.pfa
 %%DATADIR%%/fonts/Times-Italic.afm
 %%DATADIR%%/fonts/Times-Italic.pfa
 %%DATADIR%%/fonts/Times-Roman.afm
 %%DATADIR%%/fonts/Times-Roman.pfa
 %%DATADIR%%/data/cp-1250
 %%DATADIR%%/data/cp-874
 %%DATADIR%%/data/cp-1258
 %%DATADIR%%/data/cp-1257
 %%DATADIR%%/data/cp-1256
 %%DATADIR%%/data/cp-1255
 %%DATADIR%%/data/cp-1254
 %%DATADIR%%/data/cp-1253
 %%DATADIR%%/data/cp-1252
 %%DATADIR%%/data/cp-1251
 %%DATADIR%%/data/iso-8859-1
 %%DATADIR%%/data/iso-8859-2
 %%DATADIR%%/data/iso-8859-3
 %%DATADIR%%/data/iso-8859-4
 %%DATADIR%%/data/iso-8859-5
 %%DATADIR%%/data/iso-8859-6
 %%DATADIR%%/data/iso-8859-7
 %%DATADIR%%/data/iso-8859-8
 %%DATADIR%%/data/iso-8859-9
 %%DATADIR%%/data/iso-8859-14
 %%DATADIR%%/data/iso-8859-15
 %%DATADIR%%/data/koi8-r
 %%DATADIR%%/data/prolog.ps
 %%DATADIR%%/data/psglyphs