Simplify port-specific manpages location after r523104

Not all of my ports are covered because:
- USES=cmake requires patching devel/cmake to undo BSD-specific defaults
  (A good example why BSD quirks should stay in ports, not to be upstreamed)
- USES=meson and GNU_CONFIGURE require dropping --mandir argument
- ponscripter-sekai requires Templates/BSD.local.dist to NOT create PREFIX/man

24 files changed, 35 insertions, 48 deletions

diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index b67cc025335c..ce6c8c864828 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -30,9 +30,9 @@ MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" \
 		VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" \
-		MANDIR="${PREFIX}/man/man"
+		MANDIR="${PREFIX}/share/man/man"
 PLIST_FILES=	bin/fastboot \
-		man/man1/fastboot.1.gz
+		share/man/man1/fastboot.1.gz
 PORTDOCS=	*
 SUB_FILES=	pkg-message
 
diff --git a/devel/libopenbsd/Makefile b/devel/libopenbsd/Makefile
index ed31ec607aeb..2d25c36ae8d1 100644
--- a/devel/libopenbsd/Makefile
+++ b/devel/libopenbsd/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ISCL
 USES=		uidfix tar:xz
 MAKE_ENV=	SHLIB_MAJOR=0 WITHOUT_PROFILE=1
 MAKE_ARGS=	INCLUDEDIR="${PREFIX}/include" LIBDIR="${PREFIX}/lib" \
-		MANDIR="${PREFIX}/man/man"
+		MANDIR="${PREFIX}/share/man/man"
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
diff --git a/devel/libopenbsd/pkg-plist b/devel/libopenbsd/pkg-plist
index 20fef14f3f9a..75ca1acdba76 100644
--- a/devel/libopenbsd/pkg-plist
+++ b/devel/libopenbsd/pkg-plist
@@ -3,6 +3,6 @@ include/ohash.h
 lib/libopenbsd.a
 lib/libopenbsd.so
 lib/libopenbsd.so.0
-man/man3/imsg_init.3.gz
-man/man3/ohash_init.3.gz
-man/man3/ohash_interval.3.gz
+share/man/man3/imsg_init.3.gz
+share/man/man3/ohash_init.3.gz
+share/man/man3/ohash_interval.3.gz
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index b6c663ff4976..b4a13f8dff94 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -72,21 +72,20 @@ SNDIO_CMAKE_BOOL=	USE_SNDIO
 SDL_CMAKE_BOOL=	ENABLE_SDL2
 SDL_PLIST_FILES=bin/${PORTNAME} \
 		bin/${PORTNAME}-room \
-		man/man6/${PORTNAME}.6.gz
+		share/man/man6/${PORTNAME}.6.gz
 
 QT5_USES=	desktop-file-utils qt:5 shared-mime-info
 QT5_USE=	QT=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets
 QT5_CMAKE_BOOL=	ENABLE_QT
 QT5_PLIST_FILES=bin/${PORTNAME}-qt \
 		"@comment bin/${PORTNAME}-room" \
-		man/man6/${PORTNAME}-qt.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/scalable/apps/${PORTNAME}.svg \
+		share/man/man6/${PORTNAME}-qt.6.gz \
 		share/mime/packages/${PORTNAME}.xml
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,share/man,man,' \
-		-e '/check_submodules_present()/d' \
+	@${REINPLACE_CMD} -e '/check_submodules_present()/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
 		-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 88e0df4a47ba..fed34a221177 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -92,7 +92,7 @@ do-install:
 	${LN} -sf ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} \
 		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
diff --git a/emulators/ppsspp/pkg-plist b/emulators/ppsspp/pkg-plist
index eddf114d5b8b..9ebe98b00697 100644
--- a/emulators/ppsspp/pkg-plist
+++ b/emulators/ppsspp/pkg-plist
@@ -1,5 +1,4 @@
 bin/ppsspp
-man/man1/ppsspp.1.gz
 share/icons/hicolor/128x128/apps/ppsspp.png
 share/icons/hicolor/16x16/apps/ppsspp.png
 share/icons/hicolor/24x24/apps/ppsspp.png
@@ -10,3 +9,4 @@ share/icons/hicolor/512x512/apps/ppsspp.png
 share/icons/hicolor/64x64/apps/ppsspp.png
 share/icons/hicolor/96x96/apps/ppsspp.png
 share/icons/hicolor/scalable/apps/ppsspp.svg
+share/man/man1/ppsspp.1.gz
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index e9e50defb07c..1d265d86ca68 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -96,8 +96,7 @@ QT5_PLIST_FILES=bin/${PORTNAME} \
 		share/mime/packages/${PORTNAME}.xml
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,share/man,man,' \
-		-e '/check_submodules_present()/d' \
+	@${REINPLACE_CMD} -e '/check_submodules_present()/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
 		-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
diff --git a/games/narcissu2/Makefile b/games/narcissu2/Makefile
index 654d730be47c..0f180f0f84dc 100644
--- a/games/narcissu2/Makefile
+++ b/games/narcissu2/Makefile
@@ -30,8 +30,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-installer
 PORTDATA=	*
 PORTDOCS=	README
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man6/${PORTNAME}.6.gz \
-		share/icons/hicolor/48x48/apps/${PORTNAME}.png
+		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		share/man/man6/${PORTNAME}.6.gz
 
 DESKTOP_ENTRIES="Narcissu & Narcissu: Side 2nd" \
 		"" \
@@ -54,7 +54,7 @@ do-install:
 	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} -p ${WRKDIR}/*.utf ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6
+		${STAGEDIR}${PREFIX}/share/man/man6/${PORTNAME}.6
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
diff --git a/games/openra/Makefile b/games/openra/Makefile
index df6700630fb2..1d9bf3fefac9 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -44,7 +44,7 @@ USE_SDL=	sdl2
 NUGET_LAYOUT=	flat
 NUGET_PACKAGEDIR=${WRKSRC}/thirdparty/download
 SHEBANG_FILES=	launch-dedicated.sh
-MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man" \
+MAKE_ENV=	prefix="${PREFIX}" \
 		gameinstalldir="${DATADIR}"
 ALL_TARGET=	all
 INSTALL_TARGET=	install install-man-page \
diff --git a/games/openra/pkg-plist b/games/openra/pkg-plist
index 4eee56c4d6a6..a27d98805ac4 100644
--- a/games/openra/pkg-plist
+++ b/games/openra/pkg-plist
@@ -4,7 +4,6 @@ bin/openra-d2k
 bin/openra-d2k-server
 bin/openra-ra
 bin/openra-ra-server
-man/man6/openra.6.gz
 share/applications/openra-cnc.desktop
 share/applications/openra-d2k.desktop
 share/applications/openra-ra.desktop
@@ -25,6 +24,7 @@ share/icons/hicolor/64x64/apps/openra-d2k.png
 share/icons/hicolor/64x64/apps/openra-ra.png
 share/icons/hicolor/scalable/apps/openra-cnc.svg
 share/icons/hicolor/scalable/apps/openra-ra.svg
+share/man/man6/openra.6.gz
 share/mime/packages/openra-cnc.xml
 share/mime/packages/openra-d2k.xml
 share/mime/packages/openra-ra.xml
diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile
index d78f7b9d6aed..12ca9582dada 100644
--- a/games/rlvm/Makefile
+++ b/games/rlvm/Makefile
@@ -80,7 +80,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6
+		${STAGEDIR}${PREFIX}/share/man/man6
 	${INSTALL_DATA} ${WRKSRC}/src/platforms/gtk/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	@(cd ${WRKSRC}/resources && for f in */${PORTNAME}.png; do \
diff --git a/games/rlvm/pkg-plist b/games/rlvm/pkg-plist
index fefcafa9bb54..9491e4879c95 100644
--- a/games/rlvm/pkg-plist
+++ b/games/rlvm/pkg-plist
@@ -1,5 +1,4 @@
 bin/rlvm
-man/man6/rlvm.6.gz
 share/applications/rlvm.desktop
 share/icons/hicolor/128x128/apps/rlvm.png
 share/icons/hicolor/16x16/apps/rlvm.png
@@ -8,3 +7,4 @@ share/icons/hicolor/256x256/apps/rlvm.png
 share/icons/hicolor/32x32/apps/rlvm.png
 share/icons/hicolor/48x48/apps/rlvm.png
 %%NLS%%share/locale/ja/LC_MESSAGES/rlvm.mo
+share/man/man6/rlvm.6.gz
diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile
index e26854aa4710..8c841e816876 100644
--- a/graphics/yacreader/Makefile
+++ b/graphics/yacreader/Makefile
@@ -30,9 +30,4 @@ OPENGL_QMAKE_OFF=	CONFIG+=no_opengl
 POPPLER_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 POPPLER_QMAKE_OFF=	CONFIG+=no_pdf
 
-post-patch:
-	@${REINPLACE_CMD} -e '/manpage.path/s/DATADIR/PREFIX/' \
-		${WRKSRC}/YACReader/YACReader.pro \
-		${WRKSRC}/YACReaderLibrary/YACReaderLibrary.pro
-
 .include <bsd.port.mk>
diff --git a/graphics/yacreader/pkg-plist b/graphics/yacreader/pkg-plist
index 55be4c1347b2..2cc998241b47 100644
--- a/graphics/yacreader/pkg-plist
+++ b/graphics/yacreader/pkg-plist
@@ -2,13 +2,13 @@ bin/YACReader
 bin/YACReaderLibrary
 bin/YACReaderLibraryServer
 lib/systemd/user/yacreaderlibraryserver.service
-man/man1/YACReader.1.gz
-man/man1/YACReaderLibrary.1.gz
 share/applications/YACReader.desktop
 share/applications/YACReaderLibrary.desktop
 %%DOCSDIR%%/CHANGELOG.md
 share/icons/hicolor/scalable/apps/YACReader.svg
 share/icons/hicolor/scalable/apps/YACReaderLibrary.svg
+share/man/man1/YACReader.1.gz
+share/man/man1/YACReaderLibrary.1.gz
 %%DATADIR%%/languages/yacreader_de.qm
 %%DATADIR%%/languages/yacreader_es.qm
 %%DATADIR%%/languages/yacreader_fr.qm
diff --git a/multimedia/baka-mplayer/Makefile b/multimedia/baka-mplayer/Makefile
index b627fdfb07fb..668688ea9cd3 100644
--- a/multimedia/baka-mplayer/Makefile
+++ b/multimedia/baka-mplayer/Makefile
@@ -35,7 +35,6 @@ post-patch:
 	${REINPLACE_CMD} '/^Comment/s,=.*,=${COMMENT},' \
 		${WRKSRC}/etc/${PORTNAME}.desktop
 	${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \
-		-e 's,share/man,man,' \
 		${WRKSRC}/src/Baka-MPlayer.pro
 
 post-install:
diff --git a/multimedia/baka-mplayer/pkg-plist b/multimedia/baka-mplayer/pkg-plist
index 7fd43cf26d13..160e45d25b84 100644
--- a/multimedia/baka-mplayer/pkg-plist
+++ b/multimedia/baka-mplayer/pkg-plist
@@ -1,5 +1,4 @@
 bin/baka-mplayer
-man/man1/baka-mplayer.1.gz
 share/applications/baka-mplayer.desktop
 %%NLS%%%%DATADIR%%/translations/baka-mplayer_de.qm
 %%NLS%%%%DATADIR%%/translations/baka-mplayer_es.qm
@@ -22,4 +21,5 @@ share/icons/hicolor/512x512/apps/baka-mplayer.png
 share/icons/hicolor/64x64/apps/baka-mplayer.png
 share/icons/hicolor/96x96/apps/baka-mplayer.png
 share/icons/hicolor/scalable/apps/baka-mplayer.svg
+share/man/man1/baka-mplayer.1.gz
 share/pixmaps/baka-mplayer.svg
diff --git a/net/openmdns/Makefile b/net/openmdns/Makefile
index e5c8deb3f076..66187a86bd70 100644
--- a/net/openmdns/Makefile
+++ b/net/openmdns/Makefile
@@ -20,15 +20,15 @@ USES=		localbase uidfix
 USE_RC_SUBR=	mdnsd
 MAKE_ENV=	LDADD="${LIBS}"
 MAKE_ARGS=	BINDIR="${PREFIX}/sbin" \
-		MANDIR="${PREFIX}/man/man"
+		MANDIR="${PREFIX}/share/man/man"
 CFLAGS+=	-D__dead=__dead2
 LDFLAGS+=	-Wl,--as-needed # -lutil
 LIBS+=		-lopenbsd
 SUB_LIST=	COMMENT="${COMMENT}"
 PLIST_FILES=	sbin/mdnsctl \
 		sbin/mdnsd \
-		man/man8/mdnsctl.8.gz \
-		man/man8/mdnsd.8.gz
+		share/man/man8/mdnsctl.8.gz \
+		share/man/man8/mdnsd.8.gz
 PORTDOCS=	*
 
 USERS=		_mdnsd
diff --git a/sysutils/rinse/Makefile b/sysutils/rinse/Makefile
index 301d7d5b49b5..e004fa2cb214 100644
--- a/sysutils/rinse/Makefile
+++ b/sysutils/rinse/Makefile
@@ -33,7 +33,6 @@ post-extract:
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr,,g' \
-		-e 's,/share/man,/man,g' \
 		-e '/cache/s/PREFIX/DESTDIR/' \
 		-e '/^include VERSION/d' \
 		-e '/scripts\.common/s/*/&.sh/' \
diff --git a/sysutils/rinse/pkg-plist b/sysutils/rinse/pkg-plist
index dd3e0c902b65..d4abb7c95ba7 100644
--- a/sysutils/rinse/pkg-plist
+++ b/sysutils/rinse/pkg-plist
@@ -74,6 +74,6 @@ etc/bash_completion.d/rinse
 %%DATADIR%%/rhel-5/post-install.sh
 %%DATADIR%%/slc-5/post-install.sh
 %%DATADIR%%/slc-6/post-install.sh
-man/man8/rinse.8.gz
 sbin/rinse
+share/man/man8/rinse.8.gz
 @dir /var/cache/rinse
diff --git a/sysutils/uhidd/Makefile b/sysutils/uhidd/Makefile
index 3699287d2e65..19523d76caca 100644
--- a/sysutils/uhidd/Makefile
+++ b/sysutils/uhidd/Makefile
@@ -28,7 +28,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	kaiwang27
 
 USES=		uidfix
-MAKE_ENV+=	BINDIR="${PREFIX}/sbin" MANDIR="${MANPREFIX}/man/man"
+MAKE_ENV+=	BINDIR="${PREFIX}/sbin" MANDIR="${PREFIX}/share/man/man"
 MAKE_ARGS=	LIBDIR="${LOCALBASE}/lib"
 USE_RC_SUBR=	uhidd
 
diff --git a/sysutils/uhidd/pkg-plist b/sysutils/uhidd/pkg-plist
index a2aa10a0988f..03103e13c7e9 100644
--- a/sysutils/uhidd/pkg-plist
+++ b/sysutils/uhidd/pkg-plist
@@ -1,4 +1,4 @@
 %%DEVD%%@sample etc/devd/uhidd-devd.conf.sample
-man/man5/uhidd.conf.5.gz
-man/man8/uhidd.8.gz
 sbin/uhidd
+share/man/man5/uhidd.conf.5.gz
+share/man/man8/uhidd.8.gz
diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile
index b39423befbe4..5a3065e3f4c0 100644
--- a/textproc/scdoc/Makefile
+++ b/textproc/scdoc/Makefile
@@ -12,13 +12,12 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
-MAKE_ENV=	MANDIR='$$(_INSTDIR)/man' \
-		PCDIR='$$(_INSTDIR)/libdata/pkgconfig'
+MAKE_ENV=	PCDIR='$$(_INSTDIR)/libdata/pkgconfig'
 TEST_TARGET=	check
 PLIST_FILES=	bin/${PORTNAME} \
 		libdata/pkgconfig/${PORTNAME}.pc \
-		man/man1/${PORTNAME}.1.gz \
-		man/man5/${PORTNAME}.5.gz
+		share/man/man1/${PORTNAME}.1.gz \
+		share/man/man5/${PORTNAME}.5.gz
 
 post-patch:
 	@${REINPLACE_CMD} '/-static/d' ${WRKSRC}/Makefile
diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile
index ea3732fe81be..2c5c8d2d9860 100644
--- a/x11-wm/picom/Makefile
+++ b/x11-wm/picom/Makefile
@@ -59,12 +59,10 @@ DBUS_MESON_TRUE=	dbus
 
 DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc
 DOCS_MESON_TRUE=	build_docs
-DOCS_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
-			man/man1/${PORTNAME}-trans.1.gz
+DOCS_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
+			share/man/man1/${PORTNAME}-trans.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e '/install_dir/s,share/man,man,' \
-		${WRKSRC}/man/meson.build
 	@${REINPLACE_CMD} -e '/config_system_dir/s,/etc,${PREFIX}&,' \
 		${WRKSRC}/src/config_libconfig.c
 # Extract (snapshot) version from the port instead of meson.build
diff --git a/x11/wev/Makefile b/x11/wev/Makefile
index d14a576e7657..519b8ba9ce25 100644
--- a/x11/wev/Makefile
+++ b/x11/wev/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gmake pkgconfig
-MAKE_ENV=	MANDIR='$$(PREFIX)/man'
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ -lrt//' ${WRKSRC}/Makefile