git: 72fa01913d6a - main - MAN?PREFIX: eleminate its usage and move man to share/man

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 10 Jan 2024 16:27:56 UTC 
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=72fa01913d6a670015d043dc5d92fa3d849f08ab

commit 72fa01913d6a670015d043dc5d92fa3d849f08ab
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-10 16:27:45 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-10 16:27:53 +0000

    MAN?PREFIX: eleminate its usage  and move man to share/man
---
 sysutils/xxd/Makefile            |  2 +-
 textproc/bat/Makefile            |  6 +++---
 textproc/bsd-spell/Makefile      |  6 +++---
 textproc/bsd-spell/pkg-plist     |  4 ++--
 textproc/colordiff/Makefile      |  2 +-
 textproc/colordiff/pkg-plist     |  2 +-
 textproc/diffstat/Makefile       |  5 +++--
 textproc/fldiff/Makefile         |  4 ++--
 textproc/fldiff/pkg-plist        |  2 +-
 textproc/grap/Makefile           |  3 ++-
 textproc/grap/pkg-plist          |  2 +-
 textproc/hs-pandoc/Makefile      |  4 ++--
 textproc/hs-pandoc/pkg-plist     |  2 +-
 textproc/igor/Makefile           |  5 +++--
 textproc/libsoldout/Makefile     |  5 +++--
 textproc/libsoldout/pkg-plist    | 16 ++++++++--------
 textproc/re-flex/Makefile        |  3 ++-
 textproc/re-flex/pkg-plist       |  2 +-
 textproc/reflex/pkg-plist        |  4 ++--
 textproc/ripgrep/Makefile        |  6 +++---
 textproc/sansi/Makefile          |  5 +++--
 textproc/uni2ascii/Makefile      |  7 ++++---
 textproc/urlview/Makefile        |  6 +++---
 www/angie/Makefile               |  3 ++-
 www/angie/pkg-plist              |  2 +-
 www/edbrowse/Makefile            |  6 +++---
 www/gatling/Makefile             |  9 +++++----
 www/gist/Makefile                |  5 +++--
 www/micro_httpd/Makefile         |  5 +++--
 www/nginx-devel/Makefile         |  2 +-
 www/nginx/Makefile               |  2 +-
 www/oneshot/Makefile             |  4 ++--
 www/oneshot/pkg-plist            |  2 +-
 www/privoxy/Makefile             |  3 ++-
 www/privoxy/pkg-plist            |  2 +-
 www/py-django32/Makefile         |  5 +++--
 www/py-django42/Makefile         |  5 +++--
 www/py-django50/Makefile         |  5 +++--
 www/shellinabox/Makefile         |  4 ++--
 www/shellinabox/pkg-plist        |  2 +-
 www/unit/Makefile                |  2 +-
 www/vger/Makefile                |  3 ++-
 www/vger/pkg-plist               |  2 +-
 www/webbrowser/Makefile          |  5 +++--
 www/xh/Makefile                  |  6 +++---
 x11-fm/doublecmd/Makefile        |  5 +++--
 x11-wm/aphelia/Makefile          |  5 +++--
 x11-wm/mcwm/Makefile             |  8 +++++---
 x11-wm/sdorfehs/Makefile         |  5 +++--
 x11-wm/spectrwm/Makefile         |  4 ++--
 x11-wm/spectrwm/pkg-plist        |  2 +-
 x11/j4-dmenu-desktop/Makefile    |  2 +-
 x11/srandrd/Makefile             |  2 +-
 x11/trayer/Makefile              |  6 +++---
 x11/x3270/Makefile               | 10 +++++-----
 x11/x3270/pkg-plist              | 16 ++++++++--------
 x11/xascii/Makefile              |  3 ++-
 x11/xascii/files/patch-Imakefile |  2 +-
 x11/xcut/Makefile                |  4 ++--
 x11/xcut/files/patch-Imakefile   |  4 ++--
 x11/xloadimage/Makefile          |  8 ++++----
 x11/xloadimage/pkg-plist         |  8 ++++----
 x11/xsel-conrad/Makefile         |  6 +++---
 x11/xsettingsd/Makefile          |  8 ++++----
 64 files changed, 159 insertions(+), 136 deletions(-)

diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile
index 2513448ccfca..be2f10bac197 100644
--- a/sysutils/xxd/Makefile
+++ b/sysutils/xxd/Makefile
@@ -37,6 +37,6 @@ VIM_DISTVERSION!=	${BSDMAKE} -f ${VIM_PORT}/Makefile -V DISTVERSION
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile
index cd73e7d68097..34969cb013b3 100644
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -20,7 +20,7 @@ GH_ACCOUNT=	sharkdp
 
 PLIST_FILES=	bin/bat \
 		share/zsh/site-functions/_bat \
-		man/man1/bat.1.gz
+		share/man/man1/bat.1.gz
 
 CARGO_CRATES=	adler-1.0.2 \
 		aho-corasick-0.7.19 \
@@ -190,7 +190,7 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat
 	${FIND} ${WRKDIR}/target -name "bat.1" -exec ${CP} {} ${WRKSRC}/doc/bat.1 \;
 	${FIND} ${WRKDIR}/target -name "bat.zsh" -exec ${CP} {} ${WRKSRC}/doc/bat.zsh \;
-	${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/doc/bat.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bat
 
diff --git a/textproc/bsd-spell/Makefile b/textproc/bsd-spell/Makefile
index 162fba1d8d9b..4268e1be8157 100644
--- a/textproc/bsd-spell/Makefile
+++ b/textproc/bsd-spell/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bsd-spell
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.0.1
 CATEGORIES=	textproc
@@ -26,7 +26,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.math ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/stop ${STAGEDIR}${PREFIX}/share/dict
 
-	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/bsd-spell/pkg-plist b/textproc/bsd-spell/pkg-plist
index 93d5e4177fcd..76edb9a3d79a 100644
--- a/textproc/bsd-spell/pkg-plist
+++ b/textproc/bsd-spell/pkg-plist
@@ -1,8 +1,8 @@
 libexec/spellprog
 bin/bspell
 bin/deroff
-man/man1/spell.1.gz
-man/man1/deroff.1.gz
+share/man/man1/spell.1.gz
+share/man/man1/deroff.1.gz
 share/dict/american
 share/dict/british
 share/dict/special.4bsd
diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 3ea6ea7dbdc5..6381e09cdd88 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -22,7 +22,7 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/colordiffrc ${STAGEDIR}${PREFIX}/etc/colordiffrc.sample
 
 .include <bsd.port.mk>
diff --git a/textproc/colordiff/pkg-plist b/textproc/colordiff/pkg-plist
index acb993aa94f7..5f87d7fcfd0c 100644
--- a/textproc/colordiff/pkg-plist
+++ b/textproc/colordiff/pkg-plist
@@ -1,3 +1,3 @@
 bin/colordiff
-man/man1/colordiff.1.gz
+share/man/man1/colordiff.1.gz
 @sample etc/colordiffrc.sample
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index 7cf9e7d459a4..5b3faa36077e 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	diffstat
 PORTVERSION=	1.65
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	https://invisible-mirror.net/archives/${PORTNAME}/ \
 		ftp://ftp.invisible-island.net/${PORTNAME}/
@@ -15,10 +16,10 @@ USES=		tar:tgz
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 
-PLIST_FILES=	bin/diffstat man/man1/diffstat.1.gz
+PLIST_FILES=	bin/diffstat share/man/man1/diffstat.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 22cca6ff6e05..6bdaae9110fb 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fldiff
 PORTVERSION=	1.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/ehaupt
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -32,7 +32,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fldiff ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${MAN1PREFIX}/man/man1/fldiff.1
+	${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${PREFIX}/share/man/man1/fldiff.1
 	${INSTALL_DATA} ${WRKSRC}/fldiff.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/fldiff.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/fldiff/pkg-plist b/textproc/fldiff/pkg-plist
index bf337c5e2a48..d80ea8cc9f31 100644
--- a/textproc/fldiff/pkg-plist
+++ b/textproc/fldiff/pkg-plist
@@ -1,4 +1,4 @@
 bin/fldiff
-man/man1/fldiff.1.gz
+share/man/man1/fldiff.1.gz
 share/applications/fldiff.desktop
 share/pixmaps/fldiff.png
diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile
index 6b526221abe0..0682f44e6373 100644
--- a/textproc/grap/Makefile
+++ b/textproc/grap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	grap
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	textproc graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
@@ -20,7 +21,7 @@ PORTEXAMPLES=	*
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.doc \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+		${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/grap.defines ${WRKSRC}/grap.tex.defines \
 		${STAGEDIR}${DATADIR}
diff --git a/textproc/grap/pkg-plist b/textproc/grap/pkg-plist
index b21f11fde08c..febeda0adb9e 100644
--- a/textproc/grap/pkg-plist
+++ b/textproc/grap/pkg-plist
@@ -1,4 +1,4 @@
 bin/grap
-man/man1/grap.1.gz
+share/man/man1/grap.1.gz
 %%DATADIR%%/grap.defines
 %%DATADIR%%/grap.tex.defines
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 3069334268ba..fd1ff8239ddb 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pandoc
 PORTVERSION=	3.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -266,6 +266,6 @@ BUILD_ARGS+=	--disable-optimization
 post-install-EMBED_DATA-off:
 	cd ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}
 post-install:
-	${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist
index 1c47a5014406..84d25ed43d0e 100644
--- a/textproc/hs-pandoc/pkg-plist
+++ b/textproc/hs-pandoc/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/pandoc.1.gz
+share/man/man1/pandoc.1.gz
 %%NO_EMBED_DATA%%%%DATADIR%%/data/abbreviations
 %%NO_EMBED_DATA%%%%DATADIR%%/data/bash_completion.tpl
 %%NO_EMBED_DATA%%%%DATADIR%%/data/creole.lua
diff --git a/textproc/igor/Makefile b/textproc/igor/Makefile
index ca2655b0d324..c2b64964ada9 100644
--- a/textproc/igor/Makefile
+++ b/textproc/igor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	igor
 PORTVERSION=	1.595
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://docscripts.glenbarber.us/tags/${PORTNAME}/${PORTVERSION}/
 
@@ -16,13 +17,13 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/libsoldout/Makefile b/textproc/libsoldout/Makefile
index ce33e3d342a3..5f41590a6065 100644
--- a/textproc/libsoldout/Makefile
+++ b/textproc/libsoldout/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libsoldout
 DISTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://instinctive.eu/code/
 
@@ -23,7 +24,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/soldout
 	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/soldout
 	${INSTALL_DATA} ${WRKSRC}/libsoldout.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 .include <bsd.port.mk>
diff --git a/textproc/libsoldout/pkg-plist b/textproc/libsoldout/pkg-plist
index 040c31ac04e5..5609dc0d6fe4 100644
--- a/textproc/libsoldout/pkg-plist
+++ b/textproc/libsoldout/pkg-plist
@@ -8,11 +8,11 @@ include/soldout/renderers.h
 lib/libsoldout.a
 lib/libsoldout.so
 lib/libsoldout.so.1
-man/man1/mkd2html.1.gz
-man/man1/mkd2latex.1.gz
-man/man1/mkd2man.1.gz
-man/man3/soldout.3.gz
-man/man3/soldout_array.3.gz
-man/man3/soldout_buffer.3.gz
-man/man3/soldout_markdown.3.gz
-man/man3/soldout_renderers.3.gz
+share/man/man1/mkd2html.1.gz
+share/man/man1/mkd2latex.1.gz
+share/man/man1/mkd2man.1.gz
+share/man/man3/soldout.3.gz
+share/man/man3/soldout_array.3.gz
+share/man/man3/soldout_buffer.3.gz
+share/man/man3/soldout_markdown.3.gz
+share/man/man3/soldout_renderers.3.gz
diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile
index df4870253f5e..55166e342e79 100644
--- a/textproc/re-flex/Makefile
+++ b/textproc/re-flex/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	re-flex
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
@@ -32,6 +33,6 @@ post-install:
 	 ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/include/reflex)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lex.vim ${STAGEDIR}${DATADIR}/lex.vim
-	${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/re-flex/pkg-plist b/textproc/re-flex/pkg-plist
index b1906428cf89..2cbca4ae5141 100644
--- a/textproc/re-flex/pkg-plist
+++ b/textproc/re-flex/pkg-plist
@@ -27,4 +27,4 @@ lib/cmake/reflex/ReflexConfig.cmake
 lib/cmake/reflex/ReflexTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/reflex/ReflexTargets.cmake
 %%DATADIR%%/lex.vim
-man/man1/reflex.1.gz
+share/man/man1/reflex.1.gz
diff --git a/textproc/reflex/pkg-plist b/textproc/reflex/pkg-plist
index 459f98336530..931a8a392ab9 100644
--- a/textproc/reflex/pkg-plist
+++ b/textproc/reflex/pkg-plist
@@ -2,5 +2,5 @@ bin/reflex
 bin/reflex++
 include/reFlexLexer.h
 lib/librefl.a
-man/man1/reflex++.1.gz
-man/man1/reflex.1.gz
+share/man/man1/reflex++.1.gz
+share/man/man1/reflex.1.gz
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 502b5a01dc08..d04c7dfcf912 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ripgrep
 DISTVERSION=	14.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	petteri.valkonen@iki.fi
@@ -69,7 +69,7 @@ CARGO_CRATES=	aho-corasick-1.1.2 \
 
 PLIST_FILES=	bin/rg \
 		etc/bash_completion.d/rg.bash \
-		man/man1/rg.1.gz \
+		share/man/man1/rg.1.gz \
 		share/fish/vendor_completions.d/rg.fish \
 		share/zsh/site-functions/_rg
 
@@ -93,7 +93,7 @@ SIMD_VARS_i386=	RUSTFLAGS+="-C target-feature=+sse2"
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg
 	${STAGEDIR}${PREFIX}/bin/rg --generate man > ${WRKDIR}/rg.1
-	${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${STAGEDIR}${PREFIX}/bin/rg --generate complete-bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/rg.bash
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/
diff --git a/textproc/sansi/Makefile b/textproc/sansi/Makefile
index 7034a9934f95..0edb392046a1 100644
--- a/textproc/sansi/Makefile
+++ b/textproc/sansi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sansi
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc sysutils
 MASTER_SITES=	https://BSDforge.com/projects/source/textproc/sansi/
 
@@ -20,10 +21,10 @@ NO_BUILD=	yes
 
 USES=		tar:xz
 
-PLIST_FILES=	sbin/sansi man/man1/sansi.1.gz
+PLIST_FILES=	sbin/sansi share/man/man1/sansi.1.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sansi ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 08e8315834ce..1a3b2e8bdc06 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	uni2ascii
 PORTVERSION=	4.18
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/ \
 		LOCAL/ehaupt
@@ -15,13 +16,13 @@ GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	bin/uni2ascii bin/ascii2uni man/man1/uni2ascii.1.gz \
-		man/man1/ascii2uni.1.gz
+PLIST_FILES=	bin/uni2ascii bin/ascii2uni share/man/man1/uni2ascii.1.gz \
+		share/man/man1/ascii2uni.1.gz
 
 do-install:
 .for f in ${PORTNAME} ascii2uni
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index c81839721a2c..d0cc289f49ef 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	urlview
 PORTVERSION=	0.9.20131021
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 
 MAINTAINER=	uzsolt@uzsolt.hu
@@ -17,7 +17,7 @@ GH_TAGNAME=	45443109
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/urlview \
 		etc/urlview.conf.sample \
-		man/man1/urlview.1.gz
+		share/man/man1/urlview.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
@@ -26,7 +26,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/urlview ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${MAN1PREFIX}/man/man1/urlview.1
+	${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${PREFIX}/share/man/man1/urlview.1
 	${INSTALL_DATA} ${WRKSRC}/sample.urlview \
 		${STAGEDIR}${PREFIX}/etc/urlview.conf.sample
 
diff --git a/www/angie/Makefile b/www/angie/Makefile
index f7c831f9fcb5..1f45373a10df 100644
--- a/www/angie/Makefile
+++ b/www/angie/Makefile
@@ -1,5 +1,6 @@
 PORTNAME?=		angie
 PORTVERSION=		1.3.1
+PORTREVISION=		1
 CATEGORIES+=		www
 MASTER_SITES+=		https://download.angie.software/files/:angie
 DISTNAME=		angie-${DISTVERSIONFULL}
@@ -158,7 +159,7 @@ do-install:
 
 	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
 
-	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
 .for i in CHANGES CHANGES.ru README.rst
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist
index 2c77c1a62d2e..28b3b43178bd 100644
--- a/www/angie/pkg-plist
+++ b/www/angie/pkg-plist
@@ -10,7 +10,7 @@ sbin/angie-nodebug
 sbin/angie
 %%DEBUG%%sbin/angie-debug
 
-man/man8/angie.8.gz
+share/man/man8/angie.8.gz
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/CHANGES.ru
 %%DOCSDIR%%/README.rst
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index c8274684bdb0..27e47f837327 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	edbrowse
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www editors
 
 MAINTAINER=	alfix86@gmail.com
@@ -25,14 +25,14 @@ MAKEFILE=	makefile
 GH_ACCOUNT=	CMB
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/edbrowse ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
diff --git a/www/gatling/Makefile b/www/gatling/Makefile
index 27380b88487e..1605e57a0eca 100644
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gatling
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www benchmarks ftp
 MASTER_SITES=	https://www.fefe.de/gatling/
 
@@ -28,7 +29,7 @@ LDFLAGS+=	-L${OPENSSLLIB}
 
 PLIST_FILES=	${PLIST_BIN:S,^,bin/,} \
 		${PLIST_SBIN:S,^,sbin/,} \
-		man/man8/gatling.8.gz \
+		share/man/man8/gatling.8.gz \
 		sbin/gatling_wrapper
 
 PORTDOCS=	CHANGES README README.antidos README.cgi README.ftp \
@@ -48,7 +49,7 @@ TLS_DESC=		Build and install tlsgatling
 ZLIB_DESC=		Compress outgoing data
 
 BENCHMARKS_MAKE_ENV=		BENCHMARKS=1
-BENCHMARKS_PLIST_FILES=		man/man1/bench.1.gz
+BENCHMARKS_PLIST_FILES=		share/man/man1/bench.1.gz
 BENCHMARKS_PORTDOCS=		README.bindbench README.forkbench \
 				README.httpbench README.manymapbench \
 				README.mmapbench
@@ -92,9 +93,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .if !empty(BENCH1)
-	cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${PREFIX}/share/man/man1
 .endif
-	cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8
+	cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${PREFIX}/share/man/man8
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/www/gist/Makefile b/www/gist/Makefile
index 8bbe64566520..abe441372c64 100644
--- a/www/gist/Makefile
+++ b/www/gist/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gist
 PORTVERSION=	6.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www net
 
 MAINTAINER=	changlp@cs.nctu.edu.tw
@@ -22,13 +23,13 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/gist \
-		man/man1/gist.1.gz
+		share/man/man1/gist.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build/gist
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/build/gist ${STAGEDIR}${PREFIX}/bin/gist
-	${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index 1be2b6d32a94..6e2965597098 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	micro_httpd
 PORTVERSION=	2014.08.14
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/micro_httpd/
 DISTNAME=	${PORTNAME}_14Aug2014
@@ -14,7 +15,7 @@ USES=		cpe
 CPE_VENDOR=	acme
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_FILES=	sbin/micro_httpd man/man8/micro_httpd.8.gz
+PLIST_FILES=	sbin/micro_httpd share/man/man8/micro_httpd.8.gz
 
 ALL_TARGET=	${PORTNAME}
 
@@ -23,6 +24,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/micro_httpd ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${MAN1PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 73f4a779b100..187c85c7ffc7 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -370,7 +370,7 @@ do-install-NAXSI-on:
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
-	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index e18aca01d390..a5cb24a6812a 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -390,7 +390,7 @@ do-install-NAXSI-on:
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
-	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
diff --git a/www/oneshot/Makefile b/www/oneshot/Makefile
index 73e8834fb530..36b4bf9b1003 100644
--- a/www/oneshot/Makefile
+++ b/www/oneshot/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	oneshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -51,6 +51,6 @@ post-install-DOCS-on:
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${GO_WRKSRC}/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/www/oneshot/pkg-plist b/www/oneshot/pkg-plist
index 189e15e7a6af..6443c77a65f7 100644
--- a/www/oneshot/pkg-plist
+++ b/www/oneshot/pkg-plist
@@ -1,2 +1,2 @@
 bin/oneshot
-%%MANPAGES%%man/man1/oneshot.1.gz
+%%MANPAGES%%share/man/man1/oneshot.1.gz
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 06fdbe72a227..96e72acf9b15 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	privoxy
 PORTVERSION=	3.0.34
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.privoxy.org/sf-download-mirror/Sources/${PORTVERSION}%20(stable)/ \
 		SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
@@ -107,7 +108,7 @@ do-install:
 .for examplefile in config match-all.action trust user.action
 	${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-	${INSTALL_MAN}  ${WRKSRC}/privoxy.8 ${STAGEDIR}${MAN1PREFIX}/man/man8
+	${INSTALL_MAN}  ${WRKSRC}/privoxy.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
 	${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist
index 5e6e4ad311fa..647e5210fa84 100644
--- a/www/privoxy/pkg-plist
+++ b/www/privoxy/pkg-plist
@@ -3,7 +3,7 @@
 %%PRIVOXY_TOOLS%%bin/uagen.pl
 %%PRIVOXY_TOOLS%%bin/url-pattern-translator.pl
 sbin/privoxy
-man/man8/privoxy.8.gz
+share/man/man8/privoxy.8.gz
 etc/privoxy/default.action
 etc/privoxy/default.filter
 etc/privoxy/regression-tests.action
diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile
index 0876f884a45b..d64b0fbf24c5 100644
--- a/www/py-django32/Makefile
+++ b/www/py-django32/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django
 PORTVERSION=	3.2.23
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
@@ -26,7 +27,7 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/bin/django-admin.py \
@@ -56,7 +57,7 @@ post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${GMAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
diff --git a/www/py-django42/Makefile b/www/py-django42/Makefile
index 1b9a8f13afcd..54ab78464241 100644
--- a/www/py-django42/Makefile
+++ b/www/py-django42/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django
 PORTVERSION=	4.2.9
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
@@ -25,7 +26,7 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/conf/project_template/manage.py-tpl
@@ -53,7 +54,7 @@ post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
diff --git a/www/py-django50/Makefile b/www/py-django50/Makefile
index a77c4e3eedf5..adb382f283da 100644
--- a/www/py-django50/Makefile
+++ b/www/py-django50/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
@@ -25,7 +26,7 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/conf/project_template/manage.py-tpl
@@ -59,7 +60,7 @@ post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
index cb73c3c7fcea..096275d33299 100644
--- a/www/shellinabox/Makefile
+++ b/www/shellinabox/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	shellinabox
 PORTVERSION=	2.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -46,7 +46,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/www/shellinabox/pkg-plist b/www/shellinabox/pkg-plist
index d2fac3959140..37179f388f9d 100644
--- a/www/shellinabox/pkg-plist
+++ b/www/shellinabox/pkg-plist
@@ -1,3 +1,3 @@
 bin/shellinaboxd
-man/man1/shellinaboxd.1.gz
+share/man/man1/shellinaboxd.1.gz
 @dir(shellinabox,shellinabox,700) etc/shellinabox
diff --git a/www/unit/Makefile b/www/unit/Makefile
index e28eea21323d..108c399030ab 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -135,7 +135,7 @@ post-install:
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 	${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \
-		${STAGEDIR}${MAN8PREFIX}/share/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 .endif
 
 .include "../../www/unit/version.mk"
diff --git a/www/vger/Makefile b/www/vger/Makefile
index b89983c87ec2..76593fcaf763 100644
--- a/www/vger/Makefile
+++ b/www/vger/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	vger
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://tildegit.org/solene/vger/archive/
 DISTFILES=	${PORTVERSION}.tar.gz
@@ -17,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 	${CP} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/gemini
diff --git a/www/vger/pkg-plist b/www/vger/pkg-plist
index 6b0628e90ddc..96a7ac3ca9c8 100644
--- a/www/vger/pkg-plist
+++ b/www/vger/pkg-plist
@@ -1,3 +1,3 @@
 bin/vger
-man/man8/vger.8.gz
+share/man/man8/vger.8.gz
 @dir %%ETCDIR%%/gemini
diff --git a/www/webbrowser/Makefile b/www/webbrowser/Makefile
index e91986574d7c..ef28ef54b7c9 100644
--- a/www/webbrowser/Makefile
+++ b/www/webbrowser/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	webbrowser
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 
@@ -14,8 +15,8 @@ USES=		tar:xz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/webbrowser ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
-PLIST_FILES=	bin/webbrowser man/man1/webbrowser.1.gz
+PLIST_FILES=	bin/webbrowser share/man/man1/webbrowser.1.gz
 
 .include <bsd.port.mk>
diff --git a/www/xh/Makefile b/www/xh/Makefile
index 25747d5f1a33..579e8b452043 100644
--- a/www/xh/Makefile
+++ b/www/xh/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -28,7 +28,7 @@ COMPLETIONS_DESC=		Install shell completions for bash, fish and zsh
 COMPLETIONS_PLIST_FILES=	share/bash-completion/completions/${PORTNAME} \
 				share/fish/vendor_completions.d/${PORTNAME}.fish \
 				share/zsh/site-functions/_${PORTNAME}
-MANPAGES_PLIST_FILES=		man/man1/${PORTNAME}.1.gz
+MANPAGES_PLIST_FILES=		share/man/man1/${PORTNAME}.1.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@@ -47,6 +47,6 @@ post-install-DOCS-on:
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index a17962131494..24734567f182 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	doublecmd
 PORTVERSION=	1.1.8
*** 422 LINES SKIPPED ***