git: d4329229fbe8 - main - MANPREFIX: eliminate its usage

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Fri, 12 Jan 2024 15:11:33 UTC
The branch main has been updated by bapt:

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

commit d4329229fbe8ad0a96a1b9ec796d17cf512455d1
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-12 15:09:46 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-12 15:11:29 +0000

    MANPREFIX: eliminate its usage
    
    While here move manpages to share/man
---
 archivers/amigadepacker/Makefile         |   5 +-
 archivers/lbrate/Makefile                |   6 +-
 archivers/lha-ac/Makefile                |  11 +-
 archivers/lziprecover/Makefile           |   5 +-
 archivers/opkg-openwrt/Makefile          |   4 +-
 archivers/opkg-openwrt/pkg-plist         |   4 +-
 archivers/packddir/Makefile              |   5 +-
 archivers/pixz/Makefile                  |   5 +-
 archivers/ppmd/Makefile                  |   5 +-
 archivers/tardy/Makefile                 |   6 +-
 archivers/unarchiver/Makefile            |   6 +-
 archivers/zip/Makefile                   |   8 +-
 astro/astrometry/Makefile                |   1 -
 astro/xearth/Makefile                    |   5 +-
 audio/abcde/Makefile                     |   4 +-
 audio/abcde/pkg-plist                    |   4 +-
 audio/aubio/Makefile                     |   4 +-
 audio/aubio/pkg-plist                    |  16 +--
 audio/bambootracker/Makefile             |   9 +-
 audio/cheesecutter/Makefile              |   8 +-
 audio/cmus/Makefile                      |   4 +-
 audio/cmus/pkg-plist                     |   6 +-
 audio/ecasound/Makefile                  |   2 +-
 audio/gmusicbrowser/Makefile             |   4 +-
 audio/gmusicbrowser/pkg-plist            |   2 +-
 audio/gnormalize/Makefile                |   4 +-
 audio/gnormalize/pkg-plist               |   2 +-
 audio/id3mtag/Makefile                   |   5 +-
 audio/klystrack/Makefile                 |   2 +-
 audio/mpdas/Makefile                     |   6 +-
 audio/mpdscribble/Makefile               |   4 +-
 audio/mpdscribble/pkg-plist              |   2 +-
 audio/musicpc/Makefile                   |   3 +-
 audio/musicpc/pkg-plist                  |   2 +-
 audio/playumidi/Makefile                 |   5 +-
 audio/pt2-clone/Makefile                 |   7 +-
 audio/py-pyradio/Makefile                |  12 +-
 audio/snd/Makefile                       |   4 +-
 audio/snd/pkg-plist                      |   2 +-
 audio/spc2it/Makefile                    |   5 +-
 audio/squeezelite/Makefile               |   6 +-
 audio/streamripper/Makefile              |   6 +-
 audio/stymulator/Makefile                |   8 +-
 audio/timidity++/Makefile                |   4 +-
 audio/uade/Makefile                      |   3 +-
 audio/uade/pkg-plist                     |   2 +-
 audio/vgmplay/Makefile                   |   2 +-
 benchmarks/cpipe/Makefile                |   5 +-
 benchmarks/interbench/Makefile           |   6 +-
 biology/ncbi-toolkit/Makefile            |   4 +-
 biology/ncbi-toolkit/pkg-plist           |  86 +++++++-------
 biology/pear-merger/Makefile             |   5 +-
 biology/seaview/Makefile                 |   4 +-
 biology/seaview/pkg-plist                |   2 +-
 cad/cascade/Makefile                     |   5 +-
 cad/gspiceui/Makefile                    |   6 +-
 comms/bluegps/Makefile                   |   3 +-
 comms/bluegps/files/patch-Makefile       |   2 +-
 comms/gqrx/Makefile                      |   5 +-
 comms/ibp/Makefile                       |   4 +-
 comms/ibp/pkg-plist                      |   2 +-
 comms/kermit/Makefile                    |   5 +-
 comms/klog/Makefile                      |   5 +-
 comms/wwl/Makefile                       |   3 +-
 comms/wwl/pkg-plist                      |   2 +-
 comms/xcwcp/Makefile                     |   6 +-
 comms/xnecview/Makefile                  |   6 +-
 comms/yfklog/Makefile                    |   4 +-
 comms/yfklog/pkg-plist                   |   2 +-
 converters/showkey/Makefile              |   5 +-
 converters/unix2dos/Makefile             |   8 +-
 databases/couchdb3/Makefile              |   3 +-
 databases/couchdb3/pkg-plist             |   2 +-
 databases/influxdb/Makefile              |   4 +-
 databases/influxdb/pkg-plist             |  18 +--
 databases/mdcached/Makefile              |   4 +-
 databases/mdcached/pkg-plist             |   2 +-
 databases/sqlcached/Makefile             |   6 +-
 databases/sqsh/Makefile                  |   6 +-
 databases/twemproxy/Makefile             |   5 +-
 deskutils/aspostit/Makefile              |   6 +-
 deskutils/cal/Makefile                   |   3 +-
 deskutils/fet/Makefile                   |   3 +-
 deskutils/fet/pkg-plist                  |   4 +-
 deskutils/freebsd-update-notify/Makefile |   6 +-
 deskutils/noti/Makefile                  |   8 +-
 deskutils/pal/Makefile                   |   4 +-
 deskutils/pal/pkg-plist                  |   2 +-
 deskutils/py-khard/Makefile              |   9 +-
 deskutils/py-paperless/Makefile          |   4 +-
 deskutils/py-paperless/pkg-plist         |   2 +-
 deskutils/qmediamanager/Makefile         |   5 +-
 deskutils/semantik/Makefile              |   3 +-
 deskutils/semantik/pkg-plist             |   2 +-
 deskutils/vym/Makefile                   |   3 +-
 deskutils/vym/pkg-plist                  |   2 +-
 devel/avrdude/Makefile                   |   3 +-
 devel/avrdude/pkg-plist                  |   2 +-
 devel/cons/Makefile                      |   4 +-
 devel/cons/pkg-plist                     |   2 +-
 devel/critcl/Makefile                    |   5 +-
 devel/critcl/pkg-plist                   |  40 +++----
 devel/cweb/Makefile                      |   3 +-
 devel/cweb/pkg-plist                     |   2 +-
 devel/dia2code+/Makefile                 |   6 +-
 devel/dwarfdump/Makefile                 |   5 +-
 devel/evemu/Makefile                     |   2 +-
 devel/fhist/Makefile                     |   8 +-
 devel/fossil/Makefile                    |   6 +-
 devel/git-review/Makefile                |   3 +-
 devel/git-subrepo/Makefile               |   3 +-
 devel/git-subrepo/pkg-plist              |   2 +-
 devel/hs-git-annex/Makefile              |   3 +-
 devel/hs-git-annex/pkg-plist             | 198 +++++++++++++++----------------
 devel/ice37/Makefile                     |   2 +-
 devel/ice37/files/Make.rules.FreeBSD     |   2 +-
 devel/ice37/pkg-plist                    |  48 ++++----
 devel/libgamepad/Makefile                |   3 +-
 devel/libgamepad/pkg-plist               |   2 +-
 devel/libixp/Makefile                    |   4 +-
 devel/libixp/pkg-plist                   |   2 +-
 devel/libjodycode/Makefile               |   5 +-
 122 files changed, 470 insertions(+), 431 deletions(-)

diff --git a/archivers/amigadepacker/Makefile b/archivers/amigadepacker/Makefile
index 2a2e6ffc1992..977b39b22899 100644
--- a/archivers/amigadepacker/Makefile
+++ b/archivers/amigadepacker/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	amigadepacker
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://zakalwe.fi/~shd/foss/amigadepacker/ \
 		LOCAL/ehaupt
@@ -17,10 +18,10 @@ USE_CSTD=	gnu89
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 ALL_TARGET=	${PORTNAME}
 
-PLIST_FILES=	bin/amigadepacker man/man1/amigadepacker.1.gz
+PLIST_FILES=	bin/amigadepacker share/man/man1/amigadepacker.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index d74fbd0db988..6dfef5220624 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lbrate
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SUNSITE/utils/compress
 
@@ -15,13 +15,13 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 
 PORTDOCS=	ChangeLog README TODO
 PLIST_FILES=	bin/lbrate \
-		man/man1/lbrate.1.gz
+		share/man/man1/lbrate.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lbrate ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/lbrate.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/lbrate.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/lha-ac/Makefile b/archivers/lha-ac/Makefile
index 912614e452bf..dc70c35958fd 100644
--- a/archivers/lha-ac/Makefile
+++ b/archivers/lha-ac/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lha
 PORTVERSION=	1.14i.20211125
+PORTREVISION=	1
 CATEGORIES=	archivers
 PKGNAMESUFFIX=	-ac
 
@@ -25,17 +26,17 @@ GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/lha-ac \
-		man/ja/man1/lha-ac.1.gz \
-		man/man1/lha-ac.1.gz
+		share/man/ja/man1/lha-ac.1.gz \
+		share/man/man1/lha-ac.1.gz
 
 OPTIONS_DEFINE=		NLS
 NLS_CONFIGURE_ON=	--enable-multibyte-filename=auto
 NLS_CONFIGURE_OFF=	--disable-multibyte-filename
 
 do-install:
-	-${MKDIR} ${STAGEDIR}${MANPREFIX}/man/ja/man1
+	-${MKDIR} ${STAGEDIR}${PREFIX}/share/man/ja/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${STAGEDIR}${PREFIX}/bin/lha-ac
-	${INSTALL_MAN} ${WRKSRC}/man/lha.1 ${STAGEDIR}${MANPREFIX}/man/man1/lha-ac.1
-	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${STAGEDIR}${MANPREFIX}/man/ja/man1/lha-ac.1
+	${INSTALL_MAN} ${WRKSRC}/man/lha.1 ${STAGEDIR}${PREFIX}/share/man/man1/lha-ac.1
+	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${STAGEDIR}${PREFIX}/share/man/ja/man1/lha-ac.1
 
 .include <bsd.port.mk>
diff --git a/archivers/lziprecover/Makefile b/archivers/lziprecover/Makefile
index 016548653dc4..8e0711f80c04 100644
--- a/archivers/lziprecover/Makefile
+++ b/archivers/lziprecover/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lziprecover
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH/lzip/${PORTNAME}
 
@@ -12,11 +13,11 @@ LICENSE=	GPLv2+
 USES=		tar:lz
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} \
-		--mandir=${MANPREFIX}/man CXXFLAGS="${CXXFLAGS}"
+		--mandir=${PREFIX}/share/man CXXFLAGS="${CXXFLAGS}"
 TEST_TARGET=	check
 
 INFO=		${PORTNAME}
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS
diff --git a/archivers/opkg-openwrt/Makefile b/archivers/opkg-openwrt/Makefile
index 5e2e88531ed5..f7182a39bc79 100644
--- a/archivers/opkg-openwrt/Makefile
+++ b/archivers/opkg-openwrt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opkg
 DISTVERSION=	20180803
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers sysutils
 PKGNAMESUFFIX=	-openwrt
 
@@ -46,7 +46,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/opkg-key ${STAGEDIR}${PREFIX}/bin
 .for file in opkg-cl.1 opkg-key.1
 	${INSTALL_MAN} ${WRKSRC}/man/${file}.in \
-		${STAGEDIR}${MANPREFIX}/man/man1/${file}
+		${STAGEDIR}${PREFIX}/share/man/man1/${file}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/archivers/opkg-openwrt/pkg-plist b/archivers/opkg-openwrt/pkg-plist
index edb4707c1daa..4ee61effa01d 100644
--- a/archivers/opkg-openwrt/pkg-plist
+++ b/archivers/opkg-openwrt/pkg-plist
@@ -1,4 +1,4 @@
 bin/opkg-cl
 bin/opkg-key
-man/man1/opkg-cl.1.gz
-man/man1/opkg-key.1.gz
+share/man/man1/opkg-cl.1.gz
+share/man/man1/opkg-key.1.gz
diff --git a/archivers/packddir/Makefile b/archivers/packddir/Makefile
index 95fa649fc8bf..2b9be5999164 100644
--- a/archivers/packddir/Makefile
+++ b/archivers/packddir/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	packddir
 PORTVERSION=	0.0.6
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH
 DISTNAME=	upackddir_${PORTVERSION}-1
@@ -14,14 +15,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 WRKSRC=		${WRKDIR}/src
 
 PLIST_FILES=	bin/upackddir \
-		man/man1/upackddir.1.gz
+		share/man/man1/upackddir.1.gz
 MAKE_ARGS=	CC="${CC}"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|$$(DESTDIR)/usr|$$(DESTDIR)${PREFIX}|' ${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/upackddir.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/upackddir.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upackddir
 
 .include <bsd.port.mk>
diff --git a/archivers/pixz/Makefile b/archivers/pixz/Makefile
index 9ce95ae48bcf..f47386a85ea6 100644
--- a/archivers/pixz/Makefile
+++ b/archivers/pixz/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pixz
 DISTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/vasi/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -14,9 +15,9 @@ USES=		libarchive pkgconfig tar:xz
 
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/pixz.1.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/pixz.1.gz
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/src/pixz.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/pixz.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
index cabc28fccc21..80fc1b735d43 100644
--- a/archivers/ppmd/Makefile
+++ b/archivers/ppmd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ppmd
 PORTVERSION=	20050811
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	LOCAL/ehaupt
 
@@ -14,13 +15,13 @@ USES=		cpe
 CPE_VENDOR=	ppmd_project
 
 PORTDOCS=	read_me.txt
-PLIST_FILES=	bin/ppmd man/man1/ppmd.1.gz
+PLIST_FILES=	bin/ppmd share/man/man1/ppmd.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index 56044b067747..311abe848371 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tardy
 PORTVERSION=	1.28
 DISTVERSIONSUFFIX=	.D001.orig
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	archivers
 MASTER_SITES=	SF/tardy/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
@@ -24,7 +24,7 @@ MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/tardy man/man1/tardy.1.gz
+PLIST_FILES=	bin/tardy share/man/man1/tardy.1.gz
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -38,6 +38,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 6d2a76ca3a2a..a2a1b639ac4f 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	unar
 PORTVERSION=	1.10.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
@@ -23,7 +23,7 @@ MAKEFILE=	Makefile.freebsd
 WRKSRC=		${WRKDIR}/The\ Unarchiver
 BUILD_WRKSRC=	${WRKSRC}/XADMaster
 
-PLIST_FILES=	bin/lsar bin/unar man/man1/lsar.1.gz man/man1/unar.1.gz
+PLIST_FILES=	bin/lsar bin/unar share/man/man1/lsar.1.gz share/man/man1/unar.1.gz
 PORTDOCS=	README.md
 PORTEXAMPLES=	lsar.bash_completion unar.bash_completion
 
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 98f1a3bc9147..dcdc37d4787b 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zip
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -23,14 +23,14 @@ MAKEFILE=	unix/Makefile
 ALL_TARGET=	generic
 
 PLIST_FILES=	bin/zip bin/zipcloak bin/zipnote bin/zipsplit \
-		man/man1/zip.1.gz man/man1/zipcloak.1.gz \
-		man/man1/zipnote.1.gz man/man1/zipsplit.1.gz
+		share/man/man1/zip.1.gz share/man/man1/zipcloak.1.gz \
+		share/man/man1/zipnote.1.gz share/man/man1/zipsplit.1.gz
 PORTDOCS=	*
 
 do-install:
 .for p in ${PLIST_FILES:Mbin*:T}
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 do-install-DOCS-on:
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 222312d6c194..fb5919ed36df 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -44,7 +44,6 @@ LDFLAGS+=	-lz
 
 CONFLICTS_INSTALL=	afni p5-Text-RecordParser # bin/imstat bin/tabmerge
 
-MANDIRS=	${MANPREFIX}/man/man1
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index b91744ad849b..9226fddd1f2c 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xearth
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	LOCAL/madpilot/xearth
 
@@ -16,14 +17,14 @@ USES=		tar:xz xorg
 USE_XORG=	x11 xext sm ice xt
 
 PLIST_FILES=	bin/xearth \
-		man/man1/xearth.1.gz \
+		share/man/man1/xearth.1.gz \
 		lib/X11/xearth/freebsd.committers.markers \
 		lib/X11/xearth/freebsd.ftp.markers
 PLIST_DIRS=	lib/X11/xearth
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xearth ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xearth.man ${STAGEDIR}${MANPREFIX}/man/man1/xearth.1
+	${INSTALL_MAN} ${WRKSRC}/xearth.man ${STAGEDIR}${PREFIX}/share/man/man1/xearth.1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xearth
 # Copy the list of FreeBSD sites & committers locations
 .for marker in freebsd.committers.markers freebsd.ftp.markers
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 63dad5da6202..d834f4d033b7 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	abcde
 DISTVERSION=	2.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
@@ -65,7 +65,7 @@ do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf \
 		${STAGEDIR}${PREFIX}/etc/abcde.conf.sample)
 	(cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1)
+		${STAGEDIR}${PREFIX}/share/man/man1)
 post-install-MUSICBRAINZ-on:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde-musicbrainz-tool \
 		${STAGEDIR}${PREFIX}/bin)
diff --git a/audio/abcde/pkg-plist b/audio/abcde/pkg-plist
index 5217ceda40fd..df94c45f2f69 100644
--- a/audio/abcde/pkg-plist
+++ b/audio/abcde/pkg-plist
@@ -2,5 +2,5 @@ bin/abcde
 bin/abcde-musicbrainz-tool
 bin/cddb-tool
 @sample etc/abcde.conf.sample
-man/man1/abcde.1.gz
-man/man1/cddb-tool.1.gz
+share/man/man1/abcde.1.gz
+share/man/man1/cddb-tool.1.gz
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index a311edff0c40..c43fac6ce148 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aubio
 PORTVERSION=	0.4.9
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	audio
 MASTER_SITES=	https://aubio.org/pub/
 
@@ -56,7 +56,7 @@ FFTW_LIB_DEPENDS=		libfftw3f.so:math/fftw3-float
 
 MANPAGES_BUILD_DEPENDS=		txt2man:textproc/txt2man
 MANPAGES_CONFIGURE_ENABLE=	manpages
-MANPAGES_CONFIGURE_ON=		--mandir=${MANPREFIX}/man
+MANPAGES_CONFIGURE_ON=		--mandir=${PREFIX}/share/man
 
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_ENABLE=	sndfile
diff --git a/audio/aubio/pkg-plist b/audio/aubio/pkg-plist
index 085685a6fa9a..33dc0b99d2a9 100644
--- a/audio/aubio/pkg-plist
+++ b/audio/aubio/pkg-plist
@@ -62,11 +62,11 @@ lib/libaubio.so
 lib/libaubio.so.5
 lib/libaubio.so.5.4.8
 libdata/pkgconfig/aubio.pc
-%%MANPAGES%%man/man1/aubio.1.gz
-%%MANPAGES%%man/man1/aubiocut.1.gz
-%%MANPAGES%%man/man1/aubiomfcc.1.gz
-%%MANPAGES%%man/man1/aubionotes.1.gz
-%%MANPAGES%%man/man1/aubioonset.1.gz
-%%MANPAGES%%man/man1/aubiopitch.1.gz
-%%MANPAGES%%man/man1/aubioquiet.1.gz
-%%MANPAGES%%man/man1/aubiotrack.1.gz
+%%MANPAGES%%share/man/man1/aubio.1.gz
+%%MANPAGES%%share/man/man1/aubiocut.1.gz
+%%MANPAGES%%share/man/man1/aubiomfcc.1.gz
+%%MANPAGES%%share/man/man1/aubionotes.1.gz
+%%MANPAGES%%share/man/man1/aubioonset.1.gz
+%%MANPAGES%%share/man/man1/aubiopitch.1.gz
+%%MANPAGES%%share/man/man1/aubioquiet.1.gz
+%%MANPAGES%%share/man/man1/aubiotrack.1.gz
diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile
index da11fa6f435b..85dfb3d22231 100644
--- a/audio/bambootracker/Makefile
+++ b/audio/bambootracker/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/BambooTracker/BambooTracker/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION}
@@ -54,12 +55,12 @@ QMAKE_ARGS+=	CONFIG+="use_pulse"
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${MANPREFIX}/share/man/man1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/share/man/man1
 	${MV} ${STAGEDIR}${PREFIX}/share/BambooTracker/demos/* ${STAGEDIR}${EXAMPLESDIR}/
-	${MV} ${STAGEDIR}${MANPREFIX}/share/man/en/man1/BambooTracker.1 ${STAGEDIR}${MANPREFIX}/share/man/man1/
+	${MV} ${STAGEDIR}${PREFIX}/share/man/en/man1/BambooTracker.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/BambooTracker/demos
-	${RMDIR} ${STAGEDIR}${MANPREFIX}/share/man/en/man1
-	${RMDIR} ${STAGEDIR}${MANPREFIX}/share/man/en
+	${RMDIR} ${STAGEDIR}${PREFIX}/share/man/en/man1
+	${RMDIR} ${STAGEDIR}${PREFIX}/share/man/en
 
 # maintainer targets
 try-latest: clean extract
diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile
index add12ff50145..79ec9488cb6a 100644
--- a/audio/cheesecutter/Makefile
+++ b/audio/cheesecutter/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	cheesecutter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9-beta-3-25
 DISTVERSIONSUFFIX=	-gdbe9a9d
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -28,12 +28,12 @@ MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
-	${MKDIR} ${STAGEDIR}${MANPREFIX}/share/man/fr/man1 ${STAGEDIR}${DESKTOPDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/fr/man1 ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/arch/fd/ccutter.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/cc96.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 .for f in ccutter ct2util
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${MANPREFIX}/share/man/fr/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${PREFIX}/share/man/fr/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index ec2bbbe72551..e1dfe5ca9ed3 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cmus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.10.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -19,7 +19,7 @@ USES=		compiler:c11 cpe gmake iconv ncurses pkgconfig
 USE_GITHUB=	yes
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	prefix=${PREFIX} mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS=	prefix=${PREFIX} mandir=${PREFIX}/share/man \
 		exampledir=${EXAMPLESDIR}
 # So the build does not use gcc for compiling ttman
 CONFIGURE_ARGS+=	HOSTCC=${CC}
diff --git a/audio/cmus/pkg-plist b/audio/cmus/pkg-plist
index b365ea498908..87d8de1d3222 100644
--- a/audio/cmus/pkg-plist
+++ b/audio/cmus/pkg-plist
@@ -41,7 +41,7 @@
 bin/cmus
 bin/cmus-remote
 etc/bash_completion.d/_cmus.bash
-man/man1/cmus-remote.1.gz
-man/man1/cmus.1.gz
-man/man7/cmus-tutorial.7.gz
+share/man/man1/cmus-remote.1.gz
+share/man/man1/cmus.1.gz
+share/man/man7/cmus-tutorial.7.gz
 share/zsh/site-functions/_cmus
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 56f9556d59b4..8858195fe01f 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -59,6 +59,6 @@ post-patch:
 
 post-install-PYTHON-off:
 	${RM} -R ${STAGEDIR}${PREFIX}/bin/ecamonitor
-	${RM} -R ${STAGEDIR}${MANPREFIX}/man/man1/ecamonitor.1.gz
+	${RM} -R ${STAGEDIR}${PREFIX}/man/man1/ecamonitor.1.gz
 
 .include <bsd.port.mk>
diff --git a/audio/gmusicbrowser/Makefile b/audio/gmusicbrowser/Makefile
index 9a5372fd88f9..3a92c7d61ca1 100644
--- a/audio/gmusicbrowser/Makefile
+++ b/audio/gmusicbrowser/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gmusicbrowser
 PORTVERSION=	1.1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://gmusicbrowser.org/download/
 
@@ -34,7 +34,7 @@ NLS_RUN_DEPENDS=	p5-Locale-gettext>=1.0:devel/p5-Locale-gettext
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MANPREFIX}/man/man1/${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${PREFIX}/share/man/man1/${MAN1}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && (for d in layouts pix plugins; do \
diff --git a/audio/gmusicbrowser/pkg-plist b/audio/gmusicbrowser/pkg-plist
index 3ffa36200bdf..ca45aadfb100 100644
--- a/audio/gmusicbrowser/pkg-plist
+++ b/audio/gmusicbrowser/pkg-plist
@@ -1,6 +1,6 @@
 bin/gmusicbrowser
 share/applications/gmusicbrowser.desktop
-man/man1/gmusicbrowser.man.gz
+share/man/man1/gmusicbrowser.man.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/gmusicbrowser.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gmusicbrowser.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gmusicbrowser.mo
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index d5268ab664f9..589c9bf13669 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnormalize
 PORTVERSION=	0.63
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -45,7 +45,7 @@ RUN_DEPENDS+=	cdparanoia:audio/cdparanoia
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^PREFIX=.*,PREFIX=${PREFIX},; \
-		s,^MANDIR=.*,MANDIR=${MANPREFIX}/man,; \
+		s,^MANDIR=.*,MANDIR=${PREFIX}/share/man,; \
 		s,^BASE=.*,BASE=${DATADIR},' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/share/gnormalize,${DATADIR},' \
diff --git a/audio/gnormalize/pkg-plist b/audio/gnormalize/pkg-plist
index 17f6c37ad246..0a6316d891b2 100644
--- a/audio/gnormalize/pkg-plist
+++ b/audio/gnormalize/pkg-plist
@@ -1,5 +1,5 @@
 bin/gnormalize
-man/man1/gnormalize.1.gz
+share/man/man1/gnormalize.1.gz
 %%DATADIR%%/animations/dancing_penguin.gif
 %%DATADIR%%/animations/penguin_cold.gif
 %%DATADIR%%/animations/penguin_ice.gif
diff --git a/audio/id3mtag/Makefile b/audio/id3mtag/Makefile
index b80e1e309401..72e2b9f7a87f 100644
--- a/audio/id3mtag/Makefile
+++ b/audio/id3mtag/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	id3mtag
 DISTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/squell/id3/releases/download/${PORTVERSION}/
 DISTNAME=	id3-${PORTVERSION}
@@ -21,14 +22,14 @@ LDFLAGS+=	-L${ICONV_PREFIX}/lib ${ICONV_LIB}
 
 PLIST_FILES=	bin/id3 \
 		etc/bash_completion.d/id3mtag-completion.bash \
-		man/man1/id3.1.gz
+		share/man/man1/id3.1.gz
 PORTDOCS=	CHANGES README
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/id3 ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/id3.man ${STAGEDIR}${MANPREFIX}/man/man1/id3.1
+	${INSTALL_MAN} ${WRKSRC}/id3.man ${STAGEDIR}${PREFIX}/share/man/man1/id3.1
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/bash/complete ${STAGEDIR}${PREFIX}/etc/bash_completion.d/id3mtag-completion.bash
 
diff --git a/audio/klystrack/Makefile b/audio/klystrack/Makefile
index 391e2c715eab..c7c2b490a769 100644
--- a/audio/klystrack/Makefile
+++ b/audio/klystrack/Makefile
@@ -50,7 +50,7 @@ do-install:
 		${COPYTREE_SHARE} \* ${STAGEDIR}/${PREFIX}/lib/klystrack/key/
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/klystrack.1 \
-		${STAGEDIR}${MANPREFIX}/share/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/Default.kt \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/linux/klystrack.desktop \
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 18b903536840..9a8dc24023f8 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mpdas
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://50hz.ws/mpdas/
 
@@ -21,10 +21,10 @@ USE_RC_SUBR=	mpdas
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/mpdas \
-		man/man1/mpdas.1.gz
+		share/man/man1/mpdas.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpdas ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mpdas.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mpdas.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index a15ced50e02c..ca5426f2e3a0 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mpdscribble
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.musicpd.org/download/${PORTNAME}/${PORTVERSION}/
 
@@ -27,7 +27,7 @@ SOUP_CONFIGURE_OFF=	--with-http-client=curl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${STAGEDIR}${PREFIX}/bin/mpdscribble
-	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mpdscribble.1
+	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${PREFIX}/share/man/man1/mpdscribble.1
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${STAGEDIR}${PREFIX}/etc/mpdscribble.conf.sample
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/mpdscribble/pkg-plist b/audio/mpdscribble/pkg-plist
index 85a41e7a16ad..b60e15ff2e05 100644
--- a/audio/mpdscribble/pkg-plist
+++ b/audio/mpdscribble/pkg-plist
@@ -1,6 +1,6 @@
 bin/mpdscribble
 @sample etc/mpdscribble.conf.sample
-man/man1/mpdscribble.1.gz
+share/man/man1/mpdscribble.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index 49baee3c292e..fc03592e0b28 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	musicpc
 DISTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.musicpd.org/download/mpc/0/
 DISTNAME=	mpc-${PORTVERSION}
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
 USES=		meson pkgconfig tar:xz
 
-MESON_ARGS=	--mandir=${MANPREFIX}
+MESON_ARGS=	--mandir=${PREFIX}/share/
 
 PORTDOCS=	*
 
diff --git a/audio/musicpc/pkg-plist b/audio/musicpc/pkg-plist
index c1992ce4a394..8d3375436d58 100644
--- a/audio/musicpc/pkg-plist
+++ b/audio/musicpc/pkg-plist
@@ -1,2 +1,2 @@
 bin/mpc
-%%PORTDOCS%%man/man1/mpc.1.gz
+%%PORTDOCS%%share/man/man1/mpc.1.gz
diff --git a/audio/playumidi/Makefile b/audio/playumidi/Makefile
index cd4cf660a013..e2641212e783 100644
--- a/audio/playumidi/Makefile
+++ b/audio/playumidi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=		playumidi
 PORTVERSION=		0.8.3
+PORTREVISION=	1
 CATEGORIES=		audio
 MASTER_SITES=		OSDN/${PORTNAME}
 
@@ -10,7 +11,7 @@ WWW=			https://ja.osdn.net/projects/playumidi/
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-PLIST_FILES=		bin/playumidi man/man1/playumidi.1.gz
+PLIST_FILES=		bin/playumidi share/man/man1/playumidi.1.gz
 
 OPTIONS_DEFINE=		LIBICONV DEBUG
 OPTIONS_DEFAULT=	LIBICONV
@@ -24,6 +25,6 @@ LIBICONV_MAKE_ARGS=	-DWITH_ICONV
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/playumidi ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/playumidi.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/playumidi.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/pt2-clone/Makefile b/audio/pt2-clone/Makefile
index 392d0122e82a..14eafc621baa 100644
--- a/audio/pt2-clone/Makefile
+++ b/audio/pt2-clone/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pt2-clone
 PORTVERSION=	1.65.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt:extras
@@ -22,7 +23,7 @@ USE_SDL=	sdl2
 CFLAGS_i386+=	-msse2
 
 PLIST_FILES=	bin/pt2-clone \
-		man/man1/pt2-clone.1.gz \
+		share/man/man1/pt2-clone.1.gz \
 		share/applications/pt2-clone.desktop \
 		share/pixmaps/pt2-clone.png
 
@@ -33,12 +34,12 @@ post-patch:
 		${WRKSRC}/release/other/Freedesktop.org*/*.desktop
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${MANPREFIX}/man/man1 \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/share/man/man1 \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/other/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}-extras-${EXTRASVERSION}/${PORTNAME}.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/release/other/Freedesktop.org*/*.desktop \
 		${STAGEDIR}${DESKTOPDIR}/${PORTNAME}.desktop
 	${INSTALL_DATA} ${WRKSRC}/release/other/Freedesktop.org*/*.png \
diff --git a/audio/py-pyradio/Makefile b/audio/py-pyradio/Makefile
index 3f6ecd348162..2fe42ecdb5fb 100644
--- a/audio/py-pyradio/Makefile
+++ b/audio/py-pyradio/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pyradio
 DISTVERSION=	0.9.2.22
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -48,10 +48,10 @@ METADATA_DESC=	Insert tags, chapters and cover into recordings
 MPV_DESC=	Mpv media player support
 VLC_DESC=	VLC media player support
 
-DOCS_PLIST_FILES=	man/man1/pyradio.1.gz \
-			man/man1/pyradio_rb.1.gz \
-			man/man1/pyradio_rec.1.gz \
-			man/man1/pyradio_server.1.gz
+DOCS_PLIST_FILES=	share/man/man1/pyradio.1.gz \
+			share/man/man1/pyradio_rb.1.gz \
+			share/man/man1/pyradio_rec.1.gz \
+			share/man/man1/pyradio_server.1.gz
 METADATA_RUN_DEPENDS+=	mkvinfo:multimedia/mkvtoolnix
 MPLAYER_RUN_DEPENDS+=	mplayer:multimedia/mplayer
 MPV_RUN_DEPENDS+=	mpv:multimedia/mpv
@@ -70,7 +70,7 @@ post-install:
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/docs/pyradio*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/pyradio*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 9b4b1e1ae638..269cdc5d1253 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	snd
 PORTVERSION=	22.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://ccrma.stanford.edu/software/snd/ \
 		SF
@@ -60,7 +60,7 @@ do-install:
 .for i in snd snd-info sndplay
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/snd.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/snd.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 do-install-S7-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/audio/snd/pkg-plist b/audio/snd/pkg-plist
*** 2063 LINES SKIPPED ***