git: cb347ec6664d - main - MAN[4-8]PREFIX: eleminate its usage and move man to share/man

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Tue, 09 Jan 2024 13:27:23 UTC
The branch main has been updated by bapt:

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

commit cb347ec6664d868cc62b050f827927963f2809cf
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-09 13:27:13 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-09 13:27:13 +0000

    MAN[4-8]PREFIX: eleminate its usage  and move man to share/man
---
 comms/ser2net/Makefile               |  5 +++--
 dns/dnrd/Makefile                    |  4 ++--
 dns/dnrd/pkg-plist                   |  2 +-
 games/3dpong/Makefile                |  4 ++--
 games/3dpong/pkg-plist               |  2 +-
 games/battalion/Makefile             |  6 +++---
 games/biorythm/Makefile              |  5 +++--
 games/block/Makefile                 |  5 +++--
 games/block/pkg-plist                |  4 ++--
 games/blockrage/Makefile             |  4 ++--
 games/blockrage/pkg-plist            |  2 +-
 games/bluemoon/Makefile              |  5 +++--
 games/dungeoncrawl/Makefile          |  5 +++--
 games/ensemblist/Makefile            |  6 +++---
 games/greed/Makefile                 |  3 ++-
 games/greed/pkg-plist                |  2 +-
 games/holotz-castle/Makefile         |  4 ++--
 games/holotz-castle/pkg-plist        |  4 ++--
 games/nonsense/Makefile              |  4 ++--
 games/nonsense/pkg-plist             |  2 +-
 games/starlanes/Makefile             |  5 +++--
 games/tornado/Makefile               |  8 ++++----
 games/tornado/pkg-plist              | 14 +++++++-------
 games/vectoroids/Makefile            |  4 ++--
 games/vectoroids/pkg-plist           |  2 +-
 games/wmpuzzle/Makefile              |  5 +++--
 games/xasteroids/Makefile            |  6 +++---
 games/xblast/Makefile                |  4 ++--
 games/xblast/pkg-plist               |  2 +-
 games/xlife/Makefile                 |  5 +++--
 games/xlife/pkg-plist                |  4 ++--
 games/xvier/Makefile                 |  6 +++---
 games/ztrack/Makefile                |  5 +++--
 mail/assp/Makefile                   |  5 +++--
 mail/assp/pkg-plist                  |  4 ++--
 mail/postfix-policyd-weight/Makefile | 10 +++++-----
 mail/qmail-dk/Makefile               |  6 +++---
 mail/ssmtp/Makefile                  |  4 ++--
 misc/biblesync/Makefile              |  5 +----
 misc/biblesync/pkg-plist             |  2 +-
 misc/ftdi-eeprom/Makefile            |  8 ++++----
 misc/upclient/Makefile               |  4 ++--
 misc/upclient/pkg-plist              |  2 +-
 net-mgmt/portmon/Makefile            |  2 +-
 security/acmed/Makefile              |  8 ++++----
 security/acmed/pkg-plist             |  6 +++---
 sysutils/extipl/Makefile             |  3 ++-
 sysutils/extipl/pkg-plist            |  2 +-
 sysutils/httplog/Makefile            |  4 ++--
 sysutils/httplog/pkg-plist           |  2 +-
 sysutils/libretto-config/Makefile    |  7 +++++--
 sysutils/libretto-config/pkg-plist   |  4 ++--
 sysutils/socklog/Makefile            |  6 +++---
 sysutils/socklog/pkg-plist           | 10 +++++-----
 sysutils/tw_cli/Makefile             |  6 +++---
 55 files changed, 135 insertions(+), 123 deletions(-)

diff --git a/comms/ser2net/Makefile b/comms/ser2net/Makefile
index 0ddb26efecd2..41cc273f6f9a 100644
--- a/comms/ser2net/Makefile
+++ b/comms/ser2net/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ser2net
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	comms net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -17,7 +18,7 @@ GNU_CONFIGURE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 PLIST_FILES=	sbin/${PORTNAME} etc/${PORTNAME}.conf.sample \
-		man/man8/${PORTNAME}.8.gz
+		share/man/man8/${PORTNAME}.8.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -37,7 +38,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \
-		${STAGEDIR}${MAN8PREFIX}/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index 24d3ca40a9d0..b2fd07aeeab9 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnrd
 PORTVERSION=	2.20.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	SF
 
@@ -36,7 +36,7 @@ RANDOM_CONFIGURE_ENABLE=	random-src
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${STAGEDIR}${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${STAGEDIR}${ETCDIR}/
 
 do-install-DOCS-on:
diff --git a/dns/dnrd/pkg-plist b/dns/dnrd/pkg-plist
index 002630d9d14d..ef9ea1050200 100644
--- a/dns/dnrd/pkg-plist
+++ b/dns/dnrd/pkg-plist
@@ -1,3 +1,3 @@
 sbin/dnrd
 %%ETCDIR%%/master.sample
-man/man8/dnrd.8.gz
+share/man/man8/dnrd.8.gz
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index a7066030058c..b9554f0032d4 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	3dpong
 PORTVERSION=	0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/3dpong/src/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -39,7 +39,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6/
+		${STAGEDIR}${PREFIX}/share/man/man6/
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
diff --git a/games/3dpong/pkg-plist b/games/3dpong/pkg-plist
index b537f343c130..07b0295e74f7 100644
--- a/games/3dpong/pkg-plist
+++ b/games/3dpong/pkg-plist
@@ -1,5 +1,5 @@
 bin/3dpong
-man/man6/3dpong.6.gz
+share/man/man6/3dpong.6.gz
 %%DATADIR%%/hit.au
 %%DATADIR%%/score.au
 %%DATADIR%%/wall.au
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index fd66c3323db0..4441c59f9da4 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	battalion
 PORTVERSION=	1.4b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.evl.uic.edu/aej/BATTALION/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -26,7 +26,7 @@ CFLAGS+=	-I${LOCALBASE}/include/X11 \
 		-DLINUXVERSION -DLINUXAUDIO
 LIBS+=		-lX11 -lm
 
-PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man6/${PORTNAME}.6.gz
 PORTDATA=	*
 PORTDOCS=	*
 
@@ -47,7 +47,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \
-		${STAGEDIR}${MAN6PREFIX}/man/man6/battalion.6
+		${STAGEDIR}${PREFIX}/share/man/man6/battalion.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \
 		${STAGEDIR}${DATADIR}
diff --git a/games/biorythm/Makefile b/games/biorythm/Makefile
index 41e9d7df1068..1d64b7601c5b 100644
--- a/games/biorythm/Makefile
+++ b/games/biorythm/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	biorythm
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
@@ -13,7 +14,7 @@ LIB_DEPENDS=	libshhmsg.so:devel/libshhmsg \
 		libshhopt.so:devel/libshhopt
 
 PORTDOCS=	ChangeLog README
-PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man6/${PORTNAME}.6.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -28,7 +29,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/block/Makefile b/games/block/Makefile
index 5f3adaa0fa70..9848096893e6 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	block
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy
 
@@ -22,8 +23,8 @@ post-extract:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/block ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bed ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/block.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
-	${INSTALL_MAN} ${WRKSRC}/bed.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/block.6 ${STAGEDIR}${PREFIX}/share/man/man6
+	${INSTALL_MAN} ${WRKSRC}/bed.6 ${STAGEDIR}${PREFIX}/share/man/man6
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for file in 1 2 3 4 5 6
 	${INSTALL_DATA} ${WRKSRC}/${file}.block \
diff --git a/games/block/pkg-plist b/games/block/pkg-plist
index a7ff41dbf2af..e031b937cad2 100644
--- a/games/block/pkg-plist
+++ b/games/block/pkg-plist
@@ -1,7 +1,7 @@
 bin/block
 bin/bed
-man/man6/bed.6.gz
-man/man6/block.6.gz
+share/man/man6/bed.6.gz
+share/man/man6/block.6.gz
 %%DATADIR%%/1.block
 %%DATADIR%%/2.block
 %%DATADIR%%/3.block
diff --git a/games/blockrage/Makefile b/games/blockrage/Makefile
index 22d6efc60458..11c0793e8680 100644
--- a/games/blockrage/Makefile
+++ b/games/blockrage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	blockrage
 PORTVERSION=	0.2.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -55,7 +55,7 @@ do-install:
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/blockrage/pkg-plist b/games/blockrage/pkg-plist
index 95a9fd1cef83..a725625033b5 100644
--- a/games/blockrage/pkg-plist
+++ b/games/blockrage/pkg-plist
@@ -1,5 +1,5 @@
 bin/blockrage
-man/man6/blockrage.6.gz
+share/man/man6/blockrage.6.gz
 %%DATADIR%%/blockrage
 %%DATADIR%%/blockrage-fhs.rc
 %%DATADIR%%/blockrage.cfg
diff --git a/games/bluemoon/Makefile b/games/bluemoon/Makefile
index 38f9d1b133f2..01b4234dfbfd 100644
--- a/games/bluemoon/Makefile
+++ b/games/bluemoon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bluemoon
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.catb.org/~esr/bluemoon/
 
@@ -13,7 +14,7 @@ USES=		gmake ncurses
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man6/${PORTNAME}.6.gz \
+		share/man/man6/${PORTNAME}.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png
 
@@ -29,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/games/dungeoncrawl/Makefile b/games/dungeoncrawl/Makefile
index f371025a66c8..cb0e97e68df4 100644
--- a/games/dungeoncrawl/Makefile
+++ b/games/dungeoncrawl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dungeoncrawl
 PORTVERSION=	4.0.0.b26
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.dungeoncrawl.org/dev/4.0.x/src/ \
 		http://www.sourcefiles.org/Games/Role_Play/
@@ -17,7 +18,7 @@ CXXFLAGS+=	-fsigned-char
 MAKEFILE=	makefile.bsd
 
 PORTDOCS=	buglist.txt crawl.txt
-PLIST_FILES=	bin/dungeoncrawl man/man6/dungeoncrawl.6.gz
+PLIST_FILES=	bin/dungeoncrawl share/man/man6/dungeoncrawl.6.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -35,7 +36,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/crawl \
 		${STAGEDIR}${PREFIX}/bin/dungeoncrawl
 	${INSTALL_MAN} ${WRKSRC}/../docs/crawl.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6/dungeoncrawl.6
+		${STAGEDIR}${PREFIX}/share/man/man6/dungeoncrawl.6
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index d121dc88de93..dc307958756b 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
@@ -16,7 +16,7 @@ USE_XORG=	xmu
 USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"
 
-PLIST_FILES=	bin/ensemblist man/man6/ensemblist.6.gz
+PLIST_FILES=	bin/ensemblist share/man/man6/ensemblist.6.gz
 PORTDATA=	*
 PORTDOCS=	*
 
@@ -27,6 +27,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/datas/* ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-	${INSTALL_MAN} ${WRKSRC}/ensemblist.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/ensemblist.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/greed/Makefile b/games/greed/Makefile
index 7f6bee03ee10..98ab76f9168f 100644
--- a/games/greed/Makefile
+++ b/games/greed/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	greed
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://catb.org/~esr/greed/
 PKGNAMESUFFIX=	-game
@@ -21,7 +22,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/greed ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/greed.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/greed.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 	@${MKDIR} ${STAGEDIR}${SCOREFILE:H}
 	${TOUCH} ${STAGEDIR}${SCOREFILE}.sample
 
diff --git a/games/greed/pkg-plist b/games/greed/pkg-plist
index 43e93b7aa36e..63cc5c523d91 100644
--- a/games/greed/pkg-plist
+++ b/games/greed/pkg-plist
@@ -1,3 +1,3 @@
 @(,games,2555) bin/greed
-man/man6/greed.6.gz
+share/man/man6/greed.6.gz
 @sample(,games,664) %%SCOREFILE%%.sample
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index 86844286302d..839d228d4fcd 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	holotz-castle
 PORTVERSION=	1.3.14
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
 DISTFILES=	${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} \
@@ -54,7 +54,7 @@ post-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-	(cd ${WRKSRC}/man && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/)
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} *.6 ${STAGEDIR}${PREFIX}/share/man/man6/)
 
 post-install-SOLUTIONS-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-solutions ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/holotz-castle/pkg-plist b/games/holotz-castle/pkg-plist
index f51f44907506..6696a921f195 100644
--- a/games/holotz-castle/pkg-plist
+++ b/games/holotz-castle/pkg-plist
@@ -1,8 +1,8 @@
 bin/holotz-castle
 bin/holotz-castle-editor
 %%SOLUTIONS%%bin/holotz-castle-solutions
-man/man6/holotz-castle-editor.6.gz
-man/man6/holotz-castle.6.gz
+share/man/man6/holotz-castle-editor.6.gz
+share/man/man6/holotz-castle.6.gz
 %%SOLUTIONS%%share/applications/holotz-castle-solutions.desktop
 share/applications/holotz-castle.desktop
 share/icons/hicolor/128x128/apps/holotz-castle.png
diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile
index d13452abce9b..b04f983f8809 100644
--- a/games/nonsense/Makefile
+++ b/games/nonsense/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nonsense
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -24,6 +24,6 @@ do-install:
 		${MKDIR} ${STAGEDIR}${DATADIR}/template
 		${INSTALL_DATA} ${WRKSRC}/*.data ${STAGEDIR}${DATADIR}/data
 		${INSTALL_DATA} ${WRKSRC}/*.template ${STAGEDIR}${DATADIR}/template
-		${INSTALL_MAN} ${WRKSRC}/nonsense.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+		${INSTALL_MAN} ${WRKSRC}/nonsense.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 
 .include <bsd.port.mk>
diff --git a/games/nonsense/pkg-plist b/games/nonsense/pkg-plist
index e7b577d704b3..6736e8406a87 100644
--- a/games/nonsense/pkg-plist
+++ b/games/nonsense/pkg-plist
@@ -23,4 +23,4 @@ bin/nonsense
 %%DATADIR%%/template/slashdot.html.template
 %%DATADIR%%/template/slashdot.rdf.template
 %%DATADIR%%/template/techdirt.html.template
-man/man6/nonsense.6.gz
+share/man/man6/nonsense.6.gz
diff --git a/games/starlanes/Makefile b/games/starlanes/Makefile
index 2b55ca63dc1b..0d9b6c888e12 100644
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	starlanes
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy
 
@@ -7,7 +8,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Classic space-age stock trading game
 
 USES=		ncurses
-PLIST_FILES=	bin/starlanes man/man6/starlanes.6.gz
+PLIST_FILES=	bin/starlanes share/man/man6/starlanes.6.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -20,6 +21,6 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} starlanes ${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} starlanes.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)
+	(cd ${WRKSRC} && ${INSTALL_MAN} starlanes.6 ${STAGEDIR}${PREFIX}/share/man/man6)
 
 .include <bsd.port.mk>
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index f5e4c954afd4..11233112b045 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tornado
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	https://kiza.eu/media/software/tornado/
 
@@ -38,11 +38,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tornado \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/man/tornado.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6
+		${STAGEDIR}${PREFIX}/share/man/man6
 .for i in de fr it nl no ru
-	@${MKDIR} ${STAGEDIR}${MAN6PREFIX}/man/${i}/man6
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man/${i}/man6
 	${INSTALL_MAN} ${WRKSRC}/doc/man/${i}/tornado.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/${i}/man6
+		${STAGEDIR}${PREFIX}/share/man/${i}/man6
 .endfor
 .for i in de es fr it nl no pt ru
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
diff --git a/games/tornado/pkg-plist b/games/tornado/pkg-plist
index 93e2d010d0d9..a24559829129 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -1,11 +1,11 @@
 @(,games,2755) bin/tornado
-man/de/man6/tornado.6.gz
-man/fr/man6/tornado.6.gz
-man/it/man6/tornado.6.gz
-man/man6/tornado.6.gz
-man/nl/man6/tornado.6.gz
-man/no/man6/tornado.6.gz
-man/ru/man6/tornado.6.gz
+share/man/de/man6/tornado.6.gz
+share/man/fr/man6/tornado.6.gz
+share/man/it/man6/tornado.6.gz
+share/man/man6/tornado.6.gz
+share/man/nl/man6/tornado.6.gz
+share/man/no/man6/tornado.6.gz
+share/man/ru/man6/tornado.6.gz
 share/locale/de/LC_MESSAGES/tornado.mo
 share/locale/es/LC_MESSAGES/tornado.mo
 share/locale/fr/LC_MESSAGES/tornado.mo
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index d1b77012ca72..0a5234bed9f3 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vectoroids
 PORTVERSION=	1.1.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/
 
@@ -30,7 +30,7 @@ do-install:
 .endfor
 	${LN} -sf ${DATADIR}/images/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/games/vectoroids/pkg-plist b/games/vectoroids/pkg-plist
index 5a669c60ba5c..004de878e639 100644
--- a/games/vectoroids/pkg-plist
+++ b/games/vectoroids/pkg-plist
@@ -1,5 +1,5 @@
 bin/vectoroids
-man/man6/vectoroids.6.gz
+share/man/man6/vectoroids.6.gz
 share/pixmaps/vectoroids.png
 %%DATADIR%%/images/icon.png
 %%DATADIR%%/images/redspot-e.bmp
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index 56e8211bde0b..56ddcf8190a6 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wmpuzzle
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	http://people.debian.org/~godisch/wmpuzzle/
 
@@ -16,7 +17,7 @@ GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-PLIST_FILES=	bin/wmpuzzle man/man6/wmpuzzle.6.gz
+PLIST_FILES=	bin/wmpuzzle share/man/man6/wmpuzzle.6.gz
 
 CPPFLAGS+=	-DBSD
 # Fix build with clang 11
@@ -24,6 +25,6 @@ CFLAGS+=	-fcommon
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmpuzzle ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmpuzzle.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/wmpuzzle.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 68998655db9a..9dd55f1ca986 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xasteroids
 PORTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/../R5contrib
 DISTNAME=	${PORTNAME}
@@ -22,7 +22,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lX11 -lm
 
 PLIST_FILES=	bin/xasteroids \
-		man/man6/xasteroids.6.gz
+		share/man/man6/xasteroids.6.gz
 
 post-extract:
 	@${LN} -sf xast.man ${WRKSRC}/xasteroids.6
@@ -33,6 +33,6 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xasteroids ${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} xasteroids.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)
+	(cd ${WRKSRC} && ${INSTALL_MAN} xasteroids.6 ${STAGEDIR}${PREFIX}/share/man/man6)
 
 .include <bsd.port.mk>
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 22b0e1aae8ef..81b88e3643ef 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xblast
 PORTVERSION=	2.10.4
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION} \
 		SF/${PORTNAME}/Images/${IMAGES_DATE}:images \
@@ -65,7 +65,7 @@ post-patch:
 		's|"Vera.ttf"|"${FONTSDIR}/Vera.ttf"|g' ${WRKSRC}/sdl_text.c
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/xblast.man ${STAGEDIR}${MAN6PREFIX}/man/man6/xblast.6
+	${INSTALL_MAN} ${WRKSRC}/xblast.man ${STAGEDIR}${PREFIX}/share/man/man6/xblast.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}/image
 	@cd ${WRKDIR}/images-${IMAGES_DATE} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/image "-not -name Imakefile"
diff --git a/games/xblast/pkg-plist b/games/xblast/pkg-plist
index 6ecbccd99946..8560066ddeb7 100644
--- a/games/xblast/pkg-plist
+++ b/games/xblast/pkg-plist
@@ -1,6 +1,6 @@
 bin/xblast
 %%NO_SDL%%%%SOUND%%bin/xbsndsrv
-man/man6/xblast.6.gz
+share/man/man6/xblast.6.gz
 %%NLS%%share/locale/de/LC_MESSAGES/xblast.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xblast.mo
 %%DATADIR%%/image/block/EPFL_stop.ppm
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 7991dbbff4c9..68fca3ebb0dc 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xlife
 PORTVERSION=	6.7.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://litwr2.atspace.eu/xlife/
 
@@ -48,8 +49,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gen-multirules ${WRKSRC}/xlife ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf xlife ${STAGEDIR}${PREFIX}/bin/lifeconv
 	${INSTALL_SCRIPT} ${WRKSRC}/table2r ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
-	${LN} -sf xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/lifeconv.6
+	${INSTALL_MAN} ${WRKSRC}/xlife.6 ${STAGEDIR}${PREFIX}/share/man/man6
+	${LN} -sf xlife.6 ${STAGEDIR}${PREFIX}/share/man/man6/lifeconv.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}/patterns
 	@(cd ${WRKSRC}/patterns && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/patterns)
 
diff --git a/games/xlife/pkg-plist b/games/xlife/pkg-plist
index 221e67ff35c8..eab927d8c4ef 100644
--- a/games/xlife/pkg-plist
+++ b/games/xlife/pkg-plist
@@ -2,8 +2,8 @@ bin/gen-multirules
 bin/lifeconv
 bin/table2r
 bin/xlife
-man/man6/lifeconv.6.gz
-man/man6/xlife.6.gz
+share/man/man6/lifeconv.6.gz
+share/man/man6/xlife.6.gz
 %%DATADIR%%/patterns/boundedgrid/14-2-t.l
 %%DATADIR%%/patterns/boundedgrid/beginning-plain.l
 %%DATADIR%%/patterns/boundedgrid/beginning-torus.l
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index a3c027c304c2..84f4ddd5cdac 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xvier
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/${PORTNAME} \
 		libexec/${PORTNAME}_prog \
-		man/man6/xvier.6.gz \
+		share/man/man6/xvier.6.gz \
 		share/pixmaps/xvier.png
 
 DESKTOP_ENTRIES="Xvier" "" "${PORTNAME}" \
@@ -31,7 +31,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}_prog \
 		${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
-		${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6
+		${STAGEDIR}${PREFIX}/share/man/man6/${PORTNAME}.6
 
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
diff --git a/games/ztrack/Makefile b/games/ztrack/Makefile
index bcfb34611b3d..7954c9db2ebb 100644
--- a/games/ztrack/Makefile
+++ b/games/ztrack/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ztrack
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/arcade \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -15,7 +16,7 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_RANDOM" \
 		LIBS="${LDFLAGS} -lncurses"
 ALL_TARGET=	ztrack
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz \
+PLIST_FILES=	bin/${PORTNAME} share/man/man6/${PORTNAME}.6.gz \
 		${DESKTOPDIR}/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png
 
@@ -24,7 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6/
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 0e4a0a6f5cf0..115ed0933457 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	assp
 PORTVERSION=	1.9.9.14158
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
@@ -133,8 +134,8 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${STAGEDIR}${PREFIX}/sbin/assplog
 
-	${INSTALL_MAN} ${WRKDIR}/assp.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKDIR}/assp.8 ${STAGEDIR}${PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${STAGEDIR}${PREFIX}/etc/periodic/daily/
 	@${MKDIR} ${STAGEDIR}${ASSP_HOME}
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index e7962deb5721..4f6d1e474eeb 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -98,8 +98,8 @@ sbin/assplog
 %%DATADIR%%/stat.pl
 %%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
 %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
-man/man8/assp.8.gz
-man/man8/assplog.8.gz
+share/man/man8/assp.8.gz
+share/man/man8/assplog.8.gz
 %%ASSP_HOME%%/files
 %%ASSP_HOME%%/images
 %%ASSP_HOME%%/rebuildspamdb.pl
diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index 9acbf0746e38..914e82671833 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	policyd-weight
 PORTVERSION=	0.1.15.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.policyd-weight.org/releases/ \
 		LOCAL/ohauer
@@ -19,8 +19,8 @@ RUN_DEPENDS=	p5-Net-DNS>=0.72:dns/p5-Net-DNS \
 SUB_FILES=	pkg-message pkg-install
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample etc/${PORTNAME}.conf.sample" \
-		man/man5/policyd-weight.conf.5.gz \
-		man/man8/policyd-weight.8.gz
+		share/man/man5/policyd-weight.conf.5.gz \
+		share/man/man8/policyd-weight.8.gz
 
 USERS=		polw
 GROUPS=		polw
@@ -36,7 +36,7 @@ SHEBANG_FILES=	${WRKSRC}/policyd-weight
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/man/man5/policyd-weight.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/man/man8/policyd-weight.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/man5/policyd-weight.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/man8/policyd-weight.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-dk/Makefile b/mail/qmail-dk/Makefile
index d0b4a710b214..76ec823dc763 100644
--- a/mail/qmail-dk/Makefile
+++ b/mail/qmail-dk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dk
 PORTVERSION=	0.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	QMAIL
 PKGNAMEPREFIX=	qmail-
@@ -22,7 +22,7 @@ PREFIX?=	${QMAIL_PREFIX}
 
 WRKSRC=		${WRKDIR}/qmail-1.03
 PLIST_FILES=	"@(qmailq,,4711) bin/qmail-dk" \
-		man/man8/qmail-dk.8.gz
+		share/man/man8/qmail-dk.8.gz
 ALL_TARGET=	qmail-dk qmail-dk.8
 CFLAGS+=	-I${LOCALBASE}/include
 
@@ -56,6 +56,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qmail-dk ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/qmail-dk.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/qmail-dk.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 18144b80fdd2..8d9993e89b91 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -55,9 +55,9 @@ do-install:
 		${STAGEDIR}${ETCDIR}/revaliases.sample
 	${INSTALL_DATA} ${WRKSRC}/ssmtp.conf \
 		${STAGEDIR}${ETCDIR}/ssmtp.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/ssmtp.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ssmtp.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_MAN} ${WRKSRC}/ssmtp.conf.5 \
-		${STAGEDIR}${MAN5PREFIX}/share/man/man5
+		${STAGEDIR}${PREFIX}/share/man/man5
 
 replace:
 	@${REINPLACE_CMD} -e 's,^[^#],#&,g' ${_MAILERCONF}
diff --git a/misc/biblesync/Makefile b/misc/biblesync/Makefile
index fb48c3fcef37..ea83f0d8a342 100644
--- a/misc/biblesync/Makefile
+++ b/misc/biblesync/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	biblesync
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,8 +24,4 @@ CMAKE_ON=	BUILD_SHARED_LIBS
 post-patch:
 	${REINPLACE_CMD} s,/bibleysnc,, ${WRKSRC}/biblesync.pc.in
 
-post-install:
-	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/share/man/man7/biblesync.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
-	${RM} -R ${STAGEDIR}${PREFIX}/share/man
-
 .include <bsd.port.mk>
diff --git a/misc/biblesync/pkg-plist b/misc/biblesync/pkg-plist
index 43c2ae5c29f7..08b91959ffd3 100644
--- a/misc/biblesync/pkg-plist
+++ b/misc/biblesync/pkg-plist
@@ -3,4 +3,4 @@ include/biblesync/biblesync.hh
 lib/libbiblesync.so
 lib/libbiblesync.so.2.1.0
 libdata/pkgconfig/biblesync.pc
-man/man7/biblesync.7.gz
+share/man/man7/biblesync.7.gz
diff --git a/misc/ftdi-eeprom/Makefile b/misc/ftdi-eeprom/Makefile
index 0a5e2e90891c..a36cb4ad002c 100644
--- a/misc/ftdi-eeprom/Makefile
+++ b/misc/ftdi-eeprom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ftdi-eeprom
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.bwct.de/
 
@@ -9,12 +9,12 @@ COMMENT=	Tool to program the eeprom on FTDI usb devices
 WWW=		https://www.bwct.de/
 
 MAKE_ARGS=	BINDIR="${PREFIX}/sbin" \
-		MANDIR="${PREFIX}/man/man"
+		MANDIR="${PREFIX}/share/man/man"
 
-PLIST_FILES=	sbin/ftdi-eeprom man/man8/ftdi-eeprom.8.gz
+PLIST_FILES=	sbin/ftdi-eeprom share/man/man8/ftdi-eeprom.8.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ftdi-eeprom ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ftdi-eeprom.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ftdi-eeprom.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index c7d7f5021586..91578fbf0ab7 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	upclient
 PORTVERSION=	5.0.b8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc
 MASTER_SITES=	http://uptimes.hostingwired.com/files/ \
 		SF/${PORTNAME}/UpClient%205%20beta/5.0b8%20Security%20Update
@@ -42,7 +42,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/products/upclient \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/src/products/upclient.8 \
-		${STAGEDIR}${MAN8PREFIX}/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_DATA} -m 640 ${WRKSRC}/src/products/upclient.conf \
 		${STAGEDIR}${PREFIX}/etc/upclient.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \
diff --git a/misc/upclient/pkg-plist b/misc/upclient/pkg-plist
index c1455a15957b..d25f29bd2318 100644
--- a/misc/upclient/pkg-plist
+++ b/misc/upclient/pkg-plist
@@ -1,5 +1,5 @@
 @sample(,kmem,) etc/upclient.conf.sample
-man/man8/upclient.8.gz
+share/man/man8/upclient.8.gz
 sbin/clientchk
 sbin/upchk
 @(,kmem,2555) sbin/upclient
diff --git a/net-mgmt/portmon/Makefile b/net-mgmt/portmon/Makefile
index a2ec5226a68e..0a7031e7e73d 100644
--- a/net-mgmt/portmon/Makefile
+++ b/net-mgmt/portmon/Makefile
@@ -28,7 +28,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/extras/portmon.8 \
-		${STAGEDIR}${MAN8PREFIX}/share/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_DATA} ${WRKSRC}/extras/portmon.hosts.sample \
 		${STAGEDIR}${PREFIX}/etc
 
diff --git a/security/acmed/Makefile b/security/acmed/Makefile
index 2f801376cd9b..409b6e1ee69f 100644
--- a/security/acmed/Makefile
*** 207 LINES SKIPPED ***