4 files changed, 188 insertions, 191 deletions

diff --git a/lang/mono5.10/Makefile b/lang/mono5.10/Makefile
index 85329edbba97..e8e73f458227 100644
--- a/lang/mono5.10/Makefile
+++ b/lang/mono5.10/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mono
 PORTVERSION=	5.10.1.57
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	https://download.mono-project.com/sources/mono/
 PKGNAMESUFFIX=	5.10
@@ -42,6 +42,7 @@ USES=	autoreconf bison compiler:c11 cpe elfctl gmake iconv libtool \
 	pathfix perl5 python shebangfix tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/mono-heapviz mono/mini/genmdesc.py mono/tests/test_lldb.py
 BINARY_ALIAS=	python=${PYTHON_CMD}
@@ -98,10 +99,6 @@ post-patch:
 		${WRKSRC}/man/mono.1 \
 		${WRKSRC}/man/mozroots.1
 
-post-configure:
-	${REINPLACE_CMD} -e 's|share\/man|man|g' \
-		${WRKSRC}/mcs/jay/Makefile
-
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/mono
 
diff --git a/lang/mono5.10/pkg-plist b/lang/mono5.10/pkg-plist
index a84fde31a2c4..318e1c7d6c6a 100644
--- a/lang/mono5.10/pkg-plist
+++ b/lang/mono5.10/pkg-plist
@@ -2878,68 +2878,68 @@ libdata/pkgconfig/system.web.mvc2.pc
 libdata/pkgconfig/system.web.mvc3.pc
 libdata/pkgconfig/wcf.pc
 libdata/pkgconfig/xbuild12.pc
-man/man1/al.1.gz
-man/man1/cccheck.1.gz
-man/man1/ccrewrite.1.gz
-man/man1/cert-sync.1.gz
-man/man1/cert2spc.1.gz
-man/man1/certmgr.1.gz
-man/man1/chktrust.1.gz
-man/man1/cilc.1.gz
-man/man1/crlupdate.1.gz
-man/man1/csharp.1.gz
-man/man1/disco.1.gz
-man/man1/dtd2xsd.1.gz
-man/man1/gacutil.1.gz
-man/man1/genxs.1.gz
-man/man1/httpcfg.1.gz
-man/man1/ilasm.1.gz
-man/man1/lc.1.gz
-man/man1/macpack.1.gz
-man/man1/makecert.1.gz
-man/man1/mconfig.1.gz
-man/man1/mcs.1.gz
-man/man1/mdassembler.1.gz
-man/man1/mdb2ppdb.1.gz
-man/man1/mdoc-assemble.1.gz
-man/man1/mdoc-export-html.1.gz
-man/man1/mdoc-export-msxdoc.1.gz
-man/man1/mdoc-update.1.gz
-man/man1/mdoc-validate.1.gz
-man/man1/mdoc.1.gz
-man/man1/mdvalidater.1.gz
-man/man1/mkbundle.1.gz
-man/man1/mono-api-info.1.gz
-man/man1/mono-cil-strip.1.gz
-man/man1/mono-configuration-crypto.1.gz
-man/man1/mono-profilers.1.gz
-man/man1/mono-service.1.gz
-man/man1/mono-shlib-cop.1.gz
-man/man1/mono-symbolicate.1.gz
-man/man1/mono-xmltool.1.gz
-man/man1/mono.1.gz
-man/man1/monodis.1.gz
-man/man1/monodocer.1.gz
-man/man1/monodocs2html.1.gz
-man/man1/monolinker.1.gz
-man/man1/monop.1.gz
-man/man1/mozroots.1.gz
-man/man1/mprof-report.1.gz
-man/man1/pdb2mdb.1.gz
-man/man1/permview.1.gz
-man/man1/resgen.1.gz
-man/man1/secutil.1.gz
-man/man1/setreg.1.gz
-man/man1/sgen.1.gz
-man/man1/signcode.1.gz
-man/man1/sn.1.gz
-man/man1/soapsuds.1.gz
-man/man1/sqlsharp.1.gz
-man/man1/wsdl.1.gz
-man/man1/xbuild.1.gz
-man/man1/xsd.1.gz
-man/man5/mdoc.5.gz
-man/man5/mono-config.5.gz
+share/man/man1/al.1.gz
+share/man/man1/cccheck.1.gz
+share/man/man1/ccrewrite.1.gz
+share/man/man1/cert-sync.1.gz
+share/man/man1/cert2spc.1.gz
+share/man/man1/certmgr.1.gz
+share/man/man1/chktrust.1.gz
+share/man/man1/cilc.1.gz
+share/man/man1/crlupdate.1.gz
+share/man/man1/csharp.1.gz
+share/man/man1/disco.1.gz
+share/man/man1/dtd2xsd.1.gz
+share/man/man1/gacutil.1.gz
+share/man/man1/genxs.1.gz
+share/man/man1/httpcfg.1.gz
+share/man/man1/ilasm.1.gz
+share/man/man1/lc.1.gz
+share/man/man1/macpack.1.gz
+share/man/man1/makecert.1.gz
+share/man/man1/mconfig.1.gz
+share/man/man1/mcs.1.gz
+share/man/man1/mdassembler.1.gz
+share/man/man1/mdb2ppdb.1.gz
+share/man/man1/mdoc-assemble.1.gz
+share/man/man1/mdoc-export-html.1.gz
+share/man/man1/mdoc-export-msxdoc.1.gz
+share/man/man1/mdoc-update.1.gz
+share/man/man1/mdoc-validate.1.gz
+share/man/man1/mdoc.1.gz
+share/man/man1/mdvalidater.1.gz
+share/man/man1/mkbundle.1.gz
+share/man/man1/mono-api-info.1.gz
+share/man/man1/mono-cil-strip.1.gz
+share/man/man1/mono-configuration-crypto.1.gz
+share/man/man1/mono-profilers.1.gz
+share/man/man1/mono-service.1.gz
+share/man/man1/mono-shlib-cop.1.gz
+share/man/man1/mono-symbolicate.1.gz
+share/man/man1/mono-xmltool.1.gz
+share/man/man1/mono.1.gz
+share/man/man1/monodis.1.gz
+share/man/man1/monodocer.1.gz
+share/man/man1/monodocs2html.1.gz
+share/man/man1/monolinker.1.gz
+share/man/man1/monop.1.gz
+share/man/man1/mozroots.1.gz
+share/man/man1/mprof-report.1.gz
+share/man/man1/pdb2mdb.1.gz
+share/man/man1/permview.1.gz
+share/man/man1/resgen.1.gz
+share/man/man1/secutil.1.gz
+share/man/man1/setreg.1.gz
+share/man/man1/sgen.1.gz
+share/man/man1/signcode.1.gz
+share/man/man1/sn.1.gz
+share/man/man1/soapsuds.1.gz
+share/man/man1/sqlsharp.1.gz
+share/man/man1/wsdl.1.gz
+share/man/man1/xbuild.1.gz
+share/man/man1/xsd.1.gz
+share/man/man5/mdoc.5.gz
+share/man/man5/mono-config.5.gz
 share/libgc-mono/README
 share/libgc-mono/README.DGUX386
 share/libgc-mono/README.Mac
diff --git a/lang/mono5.10/pkg-plist.aarch64 b/lang/mono5.10/pkg-plist.aarch64
index fb17a8c40831..9920632b9d8f 100644
--- a/lang/mono5.10/pkg-plist.aarch64
+++ b/lang/mono5.10/pkg-plist.aarch64
@@ -2873,68 +2873,68 @@ libdata/pkgconfig/system.web.mvc2.pc
 libdata/pkgconfig/system.web.mvc3.pc
 libdata/pkgconfig/wcf.pc
 libdata/pkgconfig/xbuild12.pc
-man/man1/al.1.gz
-man/man1/cccheck.1.gz
-man/man1/ccrewrite.1.gz
-man/man1/cert-sync.1.gz
-man/man1/cert2spc.1.gz
-man/man1/certmgr.1.gz
-man/man1/chktrust.1.gz
-man/man1/cilc.1.gz
-man/man1/crlupdate.1.gz
-man/man1/csharp.1.gz
-man/man1/disco.1.gz
-man/man1/dtd2xsd.1.gz
-man/man1/gacutil.1.gz
-man/man1/genxs.1.gz
-man/man1/httpcfg.1.gz
-man/man1/ilasm.1.gz
-man/man1/lc.1.gz
-man/man1/macpack.1.gz
-man/man1/makecert.1.gz
-man/man1/mconfig.1.gz
-man/man1/mcs.1.gz
-man/man1/mdassembler.1.gz
-man/man1/mdb2ppdb.1.gz
-man/man1/mdoc-assemble.1.gz
-man/man1/mdoc-export-html.1.gz
-man/man1/mdoc-export-msxdoc.1.gz
-man/man1/mdoc-update.1.gz
-man/man1/mdoc-validate.1.gz
-man/man1/mdoc.1.gz
-man/man1/mdvalidater.1.gz
-man/man1/mkbundle.1.gz
-man/man1/mono-api-info.1.gz
-man/man1/mono-cil-strip.1.gz
-man/man1/mono-configuration-crypto.1.gz
-man/man1/mono-profilers.1.gz
-man/man1/mono-service.1.gz
-man/man1/mono-shlib-cop.1.gz
-man/man1/mono-symbolicate.1.gz
-man/man1/mono-xmltool.1.gz
-man/man1/mono.1.gz
-man/man1/monodis.1.gz
-man/man1/monodocer.1.gz
-man/man1/monodocs2html.1.gz
-man/man1/monolinker.1.gz
-man/man1/monop.1.gz
-man/man1/mozroots.1.gz
-man/man1/mprof-report.1.gz
-man/man1/pdb2mdb.1.gz
-man/man1/permview.1.gz
-man/man1/resgen.1.gz
-man/man1/secutil.1.gz
-man/man1/setreg.1.gz
-man/man1/sgen.1.gz
-man/man1/signcode.1.gz
-man/man1/sn.1.gz
-man/man1/soapsuds.1.gz
-man/man1/sqlsharp.1.gz
-man/man1/wsdl.1.gz
-man/man1/xbuild.1.gz
-man/man1/xsd.1.gz
-man/man5/mdoc.5.gz
-man/man5/mono-config.5.gz
+share/man/man1/al.1.gz
+share/man/man1/cccheck.1.gz
+share/man/man1/ccrewrite.1.gz
+share/man/man1/cert-sync.1.gz
+share/man/man1/cert2spc.1.gz
+share/man/man1/certmgr.1.gz
+share/man/man1/chktrust.1.gz
+share/man/man1/cilc.1.gz
+share/man/man1/crlupdate.1.gz
+share/man/man1/csharp.1.gz
+share/man/man1/disco.1.gz
+share/man/man1/dtd2xsd.1.gz
+share/man/man1/gacutil.1.gz
+share/man/man1/genxs.1.gz
+share/man/man1/httpcfg.1.gz
+share/man/man1/ilasm.1.gz
+share/man/man1/lc.1.gz
+share/man/man1/macpack.1.gz
+share/man/man1/makecert.1.gz
+share/man/man1/mconfig.1.gz
+share/man/man1/mcs.1.gz
+share/man/man1/mdassembler.1.gz
+share/man/man1/mdb2ppdb.1.gz
+share/man/man1/mdoc-assemble.1.gz
+share/man/man1/mdoc-export-html.1.gz
+share/man/man1/mdoc-export-msxdoc.1.gz
+share/man/man1/mdoc-update.1.gz
+share/man/man1/mdoc-validate.1.gz
+share/man/man1/mdoc.1.gz
+share/man/man1/mdvalidater.1.gz
+share/man/man1/mkbundle.1.gz
+share/man/man1/mono-api-info.1.gz
+share/man/man1/mono-cil-strip.1.gz
+share/man/man1/mono-configuration-crypto.1.gz
+share/man/man1/mono-profilers.1.gz
+share/man/man1/mono-service.1.gz
+share/man/man1/mono-shlib-cop.1.gz
+share/man/man1/mono-symbolicate.1.gz
+share/man/man1/mono-xmltool.1.gz
+share/man/man1/mono.1.gz
+share/man/man1/monodis.1.gz
+share/man/man1/monodocer.1.gz
+share/man/man1/monodocs2html.1.gz
+share/man/man1/monolinker.1.gz
+share/man/man1/monop.1.gz
+share/man/man1/mozroots.1.gz
+share/man/man1/mprof-report.1.gz
+share/man/man1/pdb2mdb.1.gz
+share/man/man1/permview.1.gz
+share/man/man1/resgen.1.gz
+share/man/man1/secutil.1.gz
+share/man/man1/setreg.1.gz
+share/man/man1/sgen.1.gz
+share/man/man1/signcode.1.gz
+share/man/man1/sn.1.gz
+share/man/man1/soapsuds.1.gz
+share/man/man1/sqlsharp.1.gz
+share/man/man1/wsdl.1.gz
+share/man/man1/xbuild.1.gz
+share/man/man1/xsd.1.gz
+share/man/man5/mdoc.5.gz
+share/man/man5/mono-config.5.gz
 share/locale/de/LC_MESSAGES/mcs.mo
 share/locale/es/LC_MESSAGES/mcs.mo
 share/locale/ja/LC_MESSAGES/mcs.mo
diff --git a/lang/mono5.10/pkg-plist.powerpc b/lang/mono5.10/pkg-plist.powerpc
index 4f2f2cf48ba8..532710424cc7 100644
--- a/lang/mono5.10/pkg-plist.powerpc
+++ b/lang/mono5.10/pkg-plist.powerpc
@@ -2874,68 +2874,68 @@ libdata/pkgconfig/system.web.mvc2.pc
 libdata/pkgconfig/system.web.mvc3.pc
 libdata/pkgconfig/wcf.pc
 libdata/pkgconfig/xbuild12.pc
-man/man1/al.1.gz
-man/man1/cccheck.1.gz
-man/man1/ccrewrite.1.gz
-man/man1/cert-sync.1.gz
-man/man1/cert2spc.1.gz
-man/man1/certmgr.1.gz
-man/man1/chktrust.1.gz
-man/man1/cilc.1.gz
-man/man1/crlupdate.1.gz
-man/man1/csharp.1.gz
-man/man1/disco.1.gz
-man/man1/dtd2xsd.1.gz
-man/man1/gacutil.1.gz
-man/man1/genxs.1.gz
-man/man1/httpcfg.1.gz
-man/man1/ilasm.1.gz
-man/man1/lc.1.gz
-man/man1/macpack.1.gz
-man/man1/makecert.1.gz
-man/man1/mconfig.1.gz
-man/man1/mcs.1.gz
-man/man1/mdassembler.1.gz
-man/man1/mdb2ppdb.1.gz
-man/man1/mdoc-assemble.1.gz
-man/man1/mdoc-export-html.1.gz
-man/man1/mdoc-export-msxdoc.1.gz
-man/man1/mdoc-update.1.gz
-man/man1/mdoc-validate.1.gz
-man/man1/mdoc.1.gz
-man/man1/mdvalidater.1.gz
-man/man1/mkbundle.1.gz
-man/man1/mono-api-info.1.gz
-man/man1/mono-cil-strip.1.gz
-man/man1/mono-configuration-crypto.1.gz
-man/man1/mono-profilers.1.gz
-man/man1/mono-service.1.gz
-man/man1/mono-shlib-cop.1.gz
-man/man1/mono-symbolicate.1.gz
-man/man1/mono-xmltool.1.gz
-man/man1/mono.1.gz
-man/man1/monodis.1.gz
-man/man1/monodocer.1.gz
-man/man1/monodocs2html.1.gz
-man/man1/monolinker.1.gz
-man/man1/monop.1.gz
-man/man1/mozroots.1.gz
-man/man1/mprof-report.1.gz
-man/man1/pdb2mdb.1.gz
-man/man1/permview.1.gz
-man/man1/resgen.1.gz
-man/man1/secutil.1.gz
-man/man1/setreg.1.gz
-man/man1/sgen.1.gz
-man/man1/signcode.1.gz
-man/man1/sn.1.gz
-man/man1/soapsuds.1.gz
-man/man1/sqlsharp.1.gz
-man/man1/wsdl.1.gz
-man/man1/xbuild.1.gz
-man/man1/xsd.1.gz
-man/man5/mdoc.5.gz
-man/man5/mono-config.5.gz
+share/man/man1/al.1.gz
+share/man/man1/cccheck.1.gz
+share/man/man1/ccrewrite.1.gz
+share/man/man1/cert-sync.1.gz
+share/man/man1/cert2spc.1.gz
+share/man/man1/certmgr.1.gz
+share/man/man1/chktrust.1.gz
+share/man/man1/cilc.1.gz
+share/man/man1/crlupdate.1.gz
+share/man/man1/csharp.1.gz
+share/man/man1/disco.1.gz
+share/man/man1/dtd2xsd.1.gz
+share/man/man1/gacutil.1.gz
+share/man/man1/genxs.1.gz
+share/man/man1/httpcfg.1.gz
+share/man/man1/ilasm.1.gz
+share/man/man1/lc.1.gz
+share/man/man1/macpack.1.gz
+share/man/man1/makecert.1.gz
+share/man/man1/mconfig.1.gz
+share/man/man1/mcs.1.gz
+share/man/man1/mdassembler.1.gz
+share/man/man1/mdb2ppdb.1.gz
+share/man/man1/mdoc-assemble.1.gz
+share/man/man1/mdoc-export-html.1.gz
+share/man/man1/mdoc-export-msxdoc.1.gz
+share/man/man1/mdoc-update.1.gz
+share/man/man1/mdoc-validate.1.gz
+share/man/man1/mdoc.1.gz
+share/man/man1/mdvalidater.1.gz
+share/man/man1/mkbundle.1.gz
+share/man/man1/mono-api-info.1.gz
+share/man/man1/mono-cil-strip.1.gz
+share/man/man1/mono-configuration-crypto.1.gz
+share/man/man1/mono-profilers.1.gz
+share/man/man1/mono-service.1.gz
+share/man/man1/mono-shlib-cop.1.gz
+share/man/man1/mono-symbolicate.1.gz
+share/man/man1/mono-xmltool.1.gz
+share/man/man1/mono.1.gz
+share/man/man1/monodis.1.gz
+share/man/man1/monodocer.1.gz
+share/man/man1/monodocs2html.1.gz
+share/man/man1/monolinker.1.gz
+share/man/man1/monop.1.gz
+share/man/man1/mozroots.1.gz
+share/man/man1/mprof-report.1.gz
+share/man/man1/pdb2mdb.1.gz
+share/man/man1/permview.1.gz
+share/man/man1/resgen.1.gz
+share/man/man1/secutil.1.gz
+share/man/man1/setreg.1.gz
+share/man/man1/sgen.1.gz
+share/man/man1/signcode.1.gz
+share/man/man1/sn.1.gz
+share/man/man1/soapsuds.1.gz
+share/man/man1/sqlsharp.1.gz
+share/man/man1/wsdl.1.gz
+share/man/man1/xbuild.1.gz
+share/man/man1/xsd.1.gz
+share/man/man5/mdoc.5.gz
+share/man/man5/mono-config.5.gz
 share/libgc-mono/README
 share/libgc-mono/README.DGUX386
 share/libgc-mono/README.Mac