diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index d8dcf145274d..a8ce5374e6b5 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	mpatrol
 PORTVERSION=	1.4.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic memory debugging and profiling library
 WWW=		https://mpatrol.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 BROKEN_i386=	ld: error: relocation R_386_PC32 cannot be used against symbol __mp_init
 .endif
 
 LIB_DEPENDS=	libelf.so.0:devel/libelf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/build/unix
 
 USES=		gettext gmake
 USE_LDCONFIG=	yes
 
 DOCS=		README mpatrol.dvi mpatrol.guide mpatrol.html mpatrol.info \
 		mpatrol.pdf mpatrol.ps mpatrol.texi mpatrol.txt refcard.dvi \
 		refcard.pdf refcard.ps refcard.tex source.tex \
 		texinfo.tex
 DOCSIMG=	cc1.eps cc1.jpg cc1.pdf \
 		collect2.eps collect2.jpg collect2.pdf \
 		cpp.eps cpp.jpg cpp.pdf \
 		gcc.eps gcc.jpg gcc.pdf \
 		mpatrol.eps mpatrol.jpg mpatrol.pdf mpatrol.txt \
 		test.eps test.jpg test.pdf \
 		trace.eps trace.jpg trace.pdf
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-DENVIRON=\"ENVIRON_64\" -DMP_INIT_SUPPORT=0
 .endif
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=dynamic-exception-spec
 .endif
 
 do-install:
 .for file in hexwords mpedit mpsym mupdate
 	${INSTALL_SCRIPT} ${WRKSRC}/../../bin/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for file in mpatrol mleak mptrace mprof
 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/../../man/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../../man/man3/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../../man/man1/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/../../man/man3/*.3 ${STAGEDIR}${PREFIX}/share/man/man3
 .for lib in mpalloc mpatrol mpatrolmt
 	${INSTALL_DATA} ${WRKSRC}/lib${lib}.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/lib${lib}.so.1 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf lib${lib}.so.1 ${STAGEDIR}${PREFIX}/lib/lib${lib}.so
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/libmptools.a ${STAGEDIR}${PREFIX}/lib
 .for file in mpatrol.h mpalloc.h mpdebug.h
 	${INSTALL_DATA} ${WRKSRC}/../../src/${file} ${STAGEDIR}${PREFIX}/include
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/mpatrol
 	${INSTALL_DATA} ${WRKSRC}/../../tools/*.h ${STAGEDIR}${PREFIX}/include/mpatrol
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/../../doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
 .for file in ${DOCSIMG}
 	${INSTALL_DATA} ${WRKSRC}/../../doc/images/${file} ${STAGEDIR}${DOCSDIR}/images/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/mpatrol/pkg-plist b/devel/mpatrol/pkg-plist
index d8ab669931b6..ee6cf22fdfe7 100644
--- a/devel/mpatrol/pkg-plist
+++ b/devel/mpatrol/pkg-plist
@@ -1,72 +1,72 @@
 bin/hexwords
 bin/mleak
 bin/mpatrol
 bin/mpedit
 bin/mprof
 bin/mpsym
 bin/mptrace
 bin/mupdate
 include/mpalloc.h
 include/mpatrol.h
 include/mpatrol/dbmalloc.h
 include/mpatrol/dmalloc.h
 include/mpatrol/heapdiff.h
 include/mpatrol/mgauge.h
 include/mpatrol/mtrace.h
 include/mpdebug.h
 lib/libmpalloc.a
 lib/libmpalloc.so
 lib/libmpalloc.so.1
 lib/libmpatrol.a
 lib/libmpatrol.so
 lib/libmpatrol.so.1
 lib/libmpatrolmt.a
 lib/libmpatrolmt.so
 lib/libmpatrolmt.so.1
 lib/libmptools.a
-man/man1/hexwords.1.gz
-man/man1/mleak.1.gz
-man/man1/mpatrol.1.gz
-man/man1/mprof.1.gz
-man/man1/mpsym.1.gz
-man/man1/mptrace.1.gz
-man/man1/mpedit.1.gz
-man/man3/libmpatrol.3.gz
-man/man3/libmpalloc.3.gz
+share/man/man1/hexwords.1.gz
+share/man/man1/mleak.1.gz
+share/man/man1/mpatrol.1.gz
+share/man/man1/mprof.1.gz
+share/man/man1/mpsym.1.gz
+share/man/man1/mptrace.1.gz
+share/man/man1/mpedit.1.gz
+share/man/man3/libmpatrol.3.gz
+share/man/man3/libmpalloc.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/images/cc1.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/cc1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/cc1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/collect2.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/collect2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/collect2.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/cpp.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/cpp.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/cpp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/gcc.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/gcc.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/gcc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/mpatrol.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/mpatrol.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/mpatrol.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/mpatrol.txt
 %%PORTDOCS%%%%DOCSDIR%%/images/test.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/test.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/test.pdf
 %%PORTDOCS%%%%DOCSDIR%%/images/trace.eps
 %%PORTDOCS%%%%DOCSDIR%%/images/trace.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/trace.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.dvi
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.guide
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.html
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.info
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.ps
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.texi
 %%PORTDOCS%%%%DOCSDIR%%/mpatrol.txt
 %%PORTDOCS%%%%DOCSDIR%%/refcard.dvi
 %%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/refcard.ps
 %%PORTDOCS%%%%DOCSDIR%%/refcard.tex
 %%PORTDOCS%%%%DOCSDIR%%/source.tex
 %%PORTDOCS%%%%DOCSDIR%%/texinfo.tex