*: Autotools manpages fix

Approved by:	portmgr (blanket)

46 files changed, 269 insertions, 235 deletions

diff --git a/archivers/unadf/Makefile b/archivers/unadf/Makefile
index 4830b6f437c8..79e9ca6885e5 100644
--- a/archivers/unadf/Makefile
+++ b/archivers/unadf/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	unadf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -19,6 +20,7 @@ GH_PROJECT=	ADFlib
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/adflib
diff --git a/archivers/unadf/pkg-plist b/archivers/unadf/pkg-plist
index 234de43304dd..45b546d03ffd 100644
--- a/archivers/unadf/pkg-plist
+++ b/archivers/unadf/pkg-plist
@@ -34,10 +34,10 @@ lib/libadf.so
 lib/libadf.so.1
 lib/libadf.so.1.0.0
 libdata/pkgconfig/adflib.pc
-man/man1/adf_floppy_create.1.gz
-man/man1/adf_floppy_format.1.gz
-man/man1/adf_show_metadata.1.gz
-man/man1/unadf.1.gz
+share/man/man1/adf_floppy_create.1.gz
+share/man/man1/adf_floppy_format.1.gz
+share/man/man1/adf_show_metadata.1.gz
+share/man/man1/unadf.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/API.txt
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 50e4524be091..d17a8e940542 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xarchiver
 DISTVERSION=	0.5.4.22
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -26,6 +27,7 @@ GH_ACCOUNT=	ib
 USE_GNOME=	cairo gdkpixbuf2 glib20 intltool
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PORTSCOUT=	limit:^\d\.\d\.\d\.\d+$ # avoid tags like identical_to_xfce_git_content
 
diff --git a/archivers/xarchiver/pkg-plist b/archivers/xarchiver/pkg-plist
index cb38ac95413a..01f335c4ed07 100644
--- a/archivers/xarchiver/pkg-plist
+++ b/archivers/xarchiver/pkg-plist
@@ -1,6 +1,6 @@
 bin/xarchiver
 libexec/thunar-archive-plugin/xarchiver.tap
-man/man1/xarchiver.1.gz
+share/man/man1/xarchiver.1.gz
 share/applications/xarchiver.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 51a334b0c999..d3b4e15b5342 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gtkwave
 DISTVERSION=	3.3.117
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	${PORTNAME}-gtk3-${DISTVERSION}
@@ -19,6 +19,7 @@ USES=		compiler:c++11-lang desktop-file-utils gettext gmake gnome \
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-mime-update \
 		--enable-gtk3 \
 		--without-gconf
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index a71bdf0bd9e1..e75f026a19fd 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -14,23 +14,23 @@ bin/vcd2vzt
 bin/vzt2vcd
 bin/vztminer
 bin/xml2stems
-man/man1/evcd2vcd.1.gz
-man/man1/fst2vcd.1.gz
-man/man1/fstminer.1.gz
-man/man1/gtkwave.1.gz
-man/man1/lxt2miner.1.gz
-man/man1/lxt2vcd.1.gz
-man/man1/rtlbrowse.1.gz
-man/man1/shmidcat.1.gz
-man/man1/twinwave.1.gz
-man/man1/vcd2fst.1.gz
-man/man1/vcd2lxt.1.gz
-man/man1/vcd2lxt2.1.gz
-man/man1/vcd2vzt.1.gz
-man/man1/vzt2vcd.1.gz
-man/man1/vztminer.1.gz
-man/man1/xml2stems.1.gz
-man/man5/gtkwaverc.5.gz
+share/man/man1/evcd2vcd.1.gz
+share/man/man1/fst2vcd.1.gz
+share/man/man1/fstminer.1.gz
+share/man/man1/gtkwave.1.gz
+share/man/man1/lxt2miner.1.gz
+share/man/man1/lxt2vcd.1.gz
+share/man/man1/rtlbrowse.1.gz
+share/man/man1/shmidcat.1.gz
+share/man/man1/twinwave.1.gz
+share/man/man1/vcd2fst.1.gz
+share/man/man1/vcd2lxt.1.gz
+share/man/man1/vcd2lxt2.1.gz
+share/man/man1/vcd2vzt.1.gz
+share/man/man1/vzt2vcd.1.gz
+share/man/man1/vztminer.1.gz
+share/man/man1/xml2stems.1.gz
+share/man/man5/gtkwaverc.5.gz
 share/applications/gtkwave.desktop
 share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index c19ef7c103b3..9d4763d60ff1 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	conserver
 DISTVERSION=	8.2.7
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	https://github.com/bstansell/conserver/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-com
@@ -15,6 +16,7 @@ USES=		autoreconf:2.69 ssl
 USE_RC_SUBR=	conserver
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-libwrap \
 		--with-master=${DEFAULTHOST} \
 		--with-openssl \
diff --git a/comms/conserver-com/pkg-plist b/comms/conserver-com/pkg-plist
index c37b5cab9591..5aa4c13e968f 100644
--- a/comms/conserver-com/pkg-plist
+++ b/comms/conserver-com/pkg-plist
@@ -4,7 +4,7 @@ bin/console
 %%EXAMPLESDIR%%/conserver.rc
 sbin/conserver
 sbin/conserver-convert
-man/man1/console.1.gz
-man/man5/conserver.cf.5.gz
-man/man5/conserver.passwd.5.gz
-man/man8/conserver.8.gz
+share/man/man1/console.1.gz
+share/man/man5/conserver.cf.5.gz
+share/man/man5/conserver.passwd.5.gz
+share/man/man8/conserver.8.gz
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 048243ba52ae..9e5bd51bfea7 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rrdtool
 DISTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases graphics
 MASTER_SITES=	https://github.com/oetiker/rrdtool-1.x/releases/download/v${DISTVERSION}/
 
@@ -18,6 +18,7 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	rrdcached
 SHEBANG_FILES=	examples/rrdcached/rrdcached-size.pl examples/stripes.py
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-tcl
 CONFIGURE_ENV=	RRDDOCDIR=${DOCSDIR:Q}
 INSTALL_TARGET=	install-strip
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 00d9480eae2b..56c95bb299ee 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -23,38 +23,38 @@ lib/librrd.so.8.3.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool%%PYTHON_EXT_SUFFIX%%.so
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
 libdata/pkgconfig/librrd.pc
-%%PORTDOCS%%man/man1/bin_dec_hex.1.gz
-%%PORTDOCS%%man/man1/cdeftutorial.1.gz
-%%PORTDOCS%%man/man1/rpntutorial.1.gz
-%%PORTDOCS%%man/man1/rrd-beginners.1.gz
-%%PORTDOCS%%man/man1/rrd_pdpcalc.1.gz
-%%PORTDOCS%%man/man1/rrdbuild.1.gz
-%%PORTDOCS%%man/man1/rrdcached.1.gz
-%%PORTDOCS%%man/man1/rrdcgi.1.gz
-%%PORTDOCS%%man/man1/rrdcreate.1.gz
-%%PORTDOCS%%man/man1/rrddump.1.gz
-%%PORTDOCS%%man/man1/rrdfetch.1.gz
-%%PORTDOCS%%man/man1/rrdfirst.1.gz
-%%PORTDOCS%%man/man1/rrdflushcached.1.gz
-%%PORTDOCS%%man/man1/rrdgraph.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_data.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_examples.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_graph.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_rpn.1.gz
-%%PORTDOCS%%man/man1/rrdinfo.1.gz
-%%PORTDOCS%%man/man1/rrdlast.1.gz
-%%PORTDOCS%%man/man1/rrdlastupdate.1.gz
-%%PORTDOCS%%man/man1/rrdlist.1.gz
-%%PORTDOCS%%%%PYTHON%%man/man1/rrdpython.1.gz
-%%PORTDOCS%%man/man1/rrdresize.1.gz
-%%PORTDOCS%%man/man1/rrdrestore.1.gz
-%%PORTDOCS%%%%RUBY%%man/man1/rrdruby.1.gz
-%%PORTDOCS%%man/man1/rrdthreads.1.gz
-%%PORTDOCS%%man/man1/rrdtool.1.gz
-%%PORTDOCS%%man/man1/rrdtune.1.gz
-%%PORTDOCS%%man/man1/rrdtutorial.1.gz
-%%PORTDOCS%%man/man1/rrdupdate.1.gz
-%%PORTDOCS%%man/man1/rrdxport.1.gz
-%%PORTDOCS%%man/man3/librrd.3.gz
+%%PORTDOCS%%share/man/man1/bin_dec_hex.1.gz
+%%PORTDOCS%%share/man/man1/cdeftutorial.1.gz
+%%PORTDOCS%%share/man/man1/rpntutorial.1.gz
+%%PORTDOCS%%share/man/man1/rrd-beginners.1.gz
+%%PORTDOCS%%share/man/man1/rrd_pdpcalc.1.gz
+%%PORTDOCS%%share/man/man1/rrdbuild.1.gz
+%%PORTDOCS%%share/man/man1/rrdcached.1.gz
+%%PORTDOCS%%share/man/man1/rrdcgi.1.gz
+%%PORTDOCS%%share/man/man1/rrdcreate.1.gz
+%%PORTDOCS%%share/man/man1/rrddump.1.gz
+%%PORTDOCS%%share/man/man1/rrdfetch.1.gz
+%%PORTDOCS%%share/man/man1/rrdfirst.1.gz
+%%PORTDOCS%%share/man/man1/rrdflushcached.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_data.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_examples.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_graph.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_rpn.1.gz
+%%PORTDOCS%%share/man/man1/rrdinfo.1.gz
+%%PORTDOCS%%share/man/man1/rrdlast.1.gz
+%%PORTDOCS%%share/man/man1/rrdlastupdate.1.gz
+%%PORTDOCS%%share/man/man1/rrdlist.1.gz
+%%PORTDOCS%%%%PYTHON%%share/man/man1/rrdpython.1.gz
+%%PORTDOCS%%share/man/man1/rrdresize.1.gz
+%%PORTDOCS%%share/man/man1/rrdrestore.1.gz
+%%PORTDOCS%%%%RUBY%%share/man/man1/rrdruby.1.gz
+%%PORTDOCS%%share/man/man1/rrdthreads.1.gz
+%%PORTDOCS%%share/man/man1/rrdtool.1.gz
+%%PORTDOCS%%share/man/man1/rrdtune.1.gz
+%%PORTDOCS%%share/man/man1/rrdtutorial.1.gz
+%%PORTDOCS%%share/man/man1/rrdupdate.1.gz
+%%PORTDOCS%%share/man/man1/rrdxport.1.gz
+%%PORTDOCS%%share/man/man3/librrd.3.gz
 %%NLS%%share/locale/fr/LC_MESSAGES/rrdtool.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/rrdtool.mo
diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index b803d51ed742..9601b9518b7e 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	calcurse
 DISTVERSION=	4.8.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://calcurse.org/files/ \
 		https://fossies.org/linux/privat/
@@ -17,6 +18,7 @@ SHEBANG_FILES=	contrib/caldav/calcurse-caldav \
 		contrib/vdir/calcurse-vdir \
 		contrib/vdir/calcurse-vdir.py
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--without-asciidoc
 
 OPTIONS_DEFINE=		CALDAV DOCS NLS
diff --git a/deskutils/calcurse/pkg-plist b/deskutils/calcurse/pkg-plist
index 8194e564545f..954c1075e3ae 100644
--- a/deskutils/calcurse/pkg-plist
+++ b/deskutils/calcurse/pkg-plist
@@ -2,7 +2,7 @@ bin/calcurse
 bin/calcurse-caldav
 bin/calcurse-upgrade
 bin/calcurse-vdir
-man/man1/calcurse.1.gz
+share/man/man1/calcurse.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/add.txt
 %%PORTDOCS%%%%DOCSDIR%%/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/copy-paste.txt
diff --git a/deskutils/gsimplecal/Makefile b/deskutils/gsimplecal/Makefile
index e22bd5983627..430af2cdf6f4 100644
--- a/deskutils/gsimplecal/Makefile
+++ b/deskutils/gsimplecal/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gsimplecal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -17,8 +17,9 @@ GH_ACCOUNT=	dmedvinsky
 USE_GNOME=	glib20 gtk30
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PLIST_FILES=	bin/gsimplecal \
-		man/man1/gsimplecal.1.gz
+		share/man/man1/gsimplecal.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 1054604318db..72f7e040d079 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rsvndump
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 
@@ -18,6 +19,7 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 USES=		bdb:18 gmake
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-svn=${LOCALBASE}
 
 PLIST_FILES=	bin/rsvndump
@@ -27,7 +29,7 @@ OPTIONS_DEFINE=	DOCS NLS
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			xmlto:textproc/xmlto
 DOCS_CONFIGURE_ENABLE=	man
-DOCS_PLIST_FILES=	man/man1/rsvndump.1.gz
+DOCS_PLIST_FILES=	share/man/man1/rsvndump.1.gz
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 95658fa7f1de..d499cafeb384 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cooledit
 DISTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SUNSITE/apps/editors/X/cooledit
 
@@ -22,6 +23,7 @@ USES=		gettext-runtime libtool:build pkgconfig python xorg
 USE_XORG=	x11 xt
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		CJK
diff --git a/editors/cooledit/pkg-plist b/editors/cooledit/pkg-plist
index c6dc28de0242..2bfa039fdcb0 100644
--- a/editors/cooledit/pkg-plist
+++ b/editors/cooledit/pkg-plist
@@ -5,8 +5,8 @@ bin/coolproject
 bin/remotefs
 bin/smalledit
 lib/libCw.a
-man/man1/cooledit.1.gz
-man/man1/remotefs.1.gz
+share/man/man1/cooledit.1.gz
+share/man/man1/remotefs.1.gz
 %%DATADIR%%/c_utils.py
 %%DATADIR%%/global.py
 %%DATADIR%%/sh_utils.py
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 964aa9755980..7a8b7936ff6f 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmlcopyeditor
 DISTVERSION=	1.3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${DISTVERSION}
 
@@ -27,6 +27,7 @@ USE_WX=		3.0 # fails to build with 3.2
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/editors/xmlcopyeditor/pkg-plist b/editors/xmlcopyeditor/pkg-plist
index bf365438a089..e097c1c5c535 100644
--- a/editors/xmlcopyeditor/pkg-plist
+++ b/editors/xmlcopyeditor/pkg-plist
@@ -1,5 +1,5 @@
 bin/xmlcopyeditor
-man/man1/xmlcopyeditor.1.gz
+share/man/man1/xmlcopyeditor.1.gz
 share/applications/xmlcopyeditor.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/xmlcopyeditor.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xmlcopyeditor.mo
diff --git a/ftp/tnftp/Makefile b/ftp/tnftp/Makefile
index 2c98edbc1c7d..158f8d957d74 100644
--- a/ftp/tnftp/Makefile
+++ b/ftp/tnftp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tnftp
 DISTVERSION=	20230507
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	https://cdn.netbsd.org/pub/NetBSD/misc/tnftp/ \
 		https://ftp.uni-erlangen.de/netbsd/misc/tnftp/ \
@@ -16,8 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libedit ncurses ssl
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PLIST_FILES=	bin/tnftp \
-		man/man1/tnftp.1.gz
+		share/man/man1/tnftp.1.gz
 
 .include <bsd.port.mk>
diff --git a/games/exult-devel/Makefile b/games/exult-devel/Makefile
index 340a921bde5a..f53f5eee49cb 100644
--- a/games/exult-devel/Makefile
+++ b/games/exult-devel/Makefile
@@ -1,6 +1,6 @@
 DISTVERSIONPREFIX=	snapshot-v
 DISTVERSION=	1.9.0.20240105
-PORTREVISION=	0 # Always set PORTREVISION explicitly as otherwise it is inherited from games/exult
+PORTREVISION=	1 # Always set PORTREVISION explicitly as otherwise it is inherited from games/exult
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	exult
diff --git a/games/exult-devel/pkg-plist b/games/exult-devel/pkg-plist
index 4cf5c65f4f02..747732d349cc 100644
--- a/games/exult-devel/pkg-plist
+++ b/games/exult-devel/pkg-plist
@@ -12,14 +12,14 @@ bin/u7voice2syx
 bin/ucxt
 bin/wuc
 %%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
-man/man1/expack.1.gz
-man/man1/exult_studio.1.gz
-man/man1/ipack.1.gz
-man/man1/shp2pcx.1.gz
-man/man1/splitshp.1.gz
-man/man1/textpack.1.gz
-man/man1/ucc.1.gz
-man/man6/exult.6.gz
+share/man/man1/expack.1.gz
+share/man/man1/exult_studio.1.gz
+share/man/man1/ipack.1.gz
+share/man/man1/shp2pcx.1.gz
+share/man/man1/splitshp.1.gz
+share/man/man1/textpack.1.gz
+share/man/man1/ucc.1.gz
+share/man/man6/exult.6.gz
 share/applications/exult.desktop
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 52d9425d344a..265b79adf5eb 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	exult
 DISTVERSION?=	1.8
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH=	1
 CATEGORIES=	games
 
@@ -22,6 +22,7 @@ USE_SDL=	sdl2
 USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-static \
 		--enable-shared \
 		--with-icondir=${PREFIX}/share/pixmaps
diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist
index 1c4cf5bfa941..3880274d620c 100644
--- a/games/exult/pkg-plist
+++ b/games/exult/pkg-plist
@@ -12,14 +12,14 @@ bin/u7voice2syx
 bin/ucxt
 bin/wuc
 %%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
-man/man1/expack.1.gz
-man/man1/exult_studio.1.gz
-man/man1/ipack.1.gz
-man/man1/shp2pcx.1.gz
-man/man1/splitshp.1.gz
-man/man1/textpack.1.gz
-man/man1/ucc.1.gz
-man/man6/exult.6.gz
+share/man/man1/expack.1.gz
+share/man/man1/exult_studio.1.gz
+share/man/man1/ipack.1.gz
+share/man/man1/shp2pcx.1.gz
+share/man/man1/splitshp.1.gz
+share/man/man1/textpack.1.gz
+share/man/man1/ucc.1.gz
+share/man/man6/exult.6.gz
 share/applications/exult.desktop
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 98762410c801..0c3a22d98eee 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gbrainy
 DISTVERSION=	2.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	games
 MASTER_SITES=	https://gent.softcatala.org/jmas/gbrainy/
@@ -22,6 +22,7 @@ USE_GNOME=	intltool
 SHEBANG_FILES=	src/Clients/Classical/gbrainy.in
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 MAKE_ENV+=	MONO_REGISTRY_PATH=${WRKDIR}
 
 OPTIONS_DEFINE=	NLS
diff --git a/games/gbrainy/pkg-plist b/games/gbrainy/pkg-plist
index 94a192e0aa5d..0d6bb0458db0 100644
--- a/games/gbrainy/pkg-plist
+++ b/games/gbrainy/pkg-plist
@@ -4,7 +4,7 @@ lib/gbrainy/gbrainy.Core.dll.config
 lib/gbrainy/gbrainy.Games.dll
 lib/gbrainy/gbrainy.exe
 lib/gbrainy/gbrainy.exe.config
-man/man6/gbrainy.6.gz
+share/man/man6/gbrainy.6.gz
 share/applications/gbrainy.desktop
 share/games/gbrainy/box.svg
 share/games/gbrainy/classic_background.svg
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 2b45b2b08d5a..12b80d397849 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	epix
 DISTVERSION=	1.2.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/${PORTNAME}/
 
@@ -17,6 +17,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		gmake makeinfo tar:bzip2 tex
 USE_TEX=	dvipsk:build latex
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-bash=${LOCALBASE}/bin/bash \
 		--with-runtime=${CXX}
 
diff --git a/graphics/epix/pkg-plist b/graphics/epix/pkg-plist
index ee0ee51c27ef..dc40cb28381a 100644
--- a/graphics/epix/pkg-plist
+++ b/graphics/epix/pkg-plist
@@ -91,10 +91,10 @@ include/epix/triples.h
 include/epix/utils.h
 include/epix/verbatim.h
 lib/epix/libepix.a
-man/man1/elaps.1.gz
-man/man1/epix.1.gz
-man/man1/flix.1.gz
-man/man1/laps.1.gz
+share/man/man1/elaps.1.gz
+share/man/man1/epix.1.gz
+share/man/man1/flix.1.gz
+share/man/man1/laps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/config/bash_completions
 %%PORTDOCS%%%%DOCSDIR%%/config/epix.el
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf.gz
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index c76e3418af83..d20ab2b979e0 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pstoedit
 DISTVERSION=	4.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libgd.so:graphics/gd \
 USES=		ghostscript gmake libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-docs=no
 MAKE_ENV=	INSTALL_STRIP_FLAG="${STRIP}"
 CPPFLAGS+=	-isystem ${LOCALBASE}/include/ming
diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist
index f6b2cec59972..012528438fc2 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -23,7 +23,7 @@ lib/pstoedit/libp2edrvstd.so
 %%MING%%lib/pstoedit/libp2edrvswf.so
 %%EMF%%lib/pstoedit/libp2edrvwmf.so
 libdata/pkgconfig/pstoedit.pc
-man/man1/pstoedit.1.gz
+share/man/man1/pstoedit.1.gz
 share/aclocal/pstoedit.m4
 %%DATADIR%%/drvhpgl.pencolors
 %%DATADIR%%/examplefigmap.fmp
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 6bf038cdfd10..2deeff843be2 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xpaint
 DISTVERSION=	3.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${DISTVERSION}
 
@@ -27,6 +27,7 @@ USE_XORG=	ice sm x11 xext xft xmu xpm xt
 
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 # util/Makefile and vxp2ps/Makefile needs it
 BINARY_ALIAS=	make=${GMAKE}
diff --git a/graphics/xpaint/pkg-plist b/graphics/xpaint/pkg-plist
index a0aba76cf026..f1061ca75450 100644
--- a/graphics/xpaint/pkg-plist
+++ b/graphics/xpaint/pkg-plist
@@ -4,8 +4,8 @@ bin/vxp2ps
 bin/vxp2tex
 bin/xpaint
 bin/xpaint_generate_toolicons
-man/man1/imgmerge.1.gz
-man/man1/xpaint.1.gz
+share/man/man1/imgmerge.1.gz
+share/man/man1/xpaint.1.gz
 share/X11/app-defaults/XPaint
 share/X11/app-defaults/XPaint.big
 share/X11/app-defaults/XPaint.medium
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 8c2865c22d70..9cfc2053b77c 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cone
 DISTVERSION=	1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -29,6 +29,7 @@ USE_GNOME=	libxml2
 SHEBANG_FILES=	sysconftool
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--with-certdb=${PREFIX}/share/cone/rootcerts \
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index a49e67828e34..86c589d64e2b 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -3,9 +3,9 @@ bin/leaf
 bin/mailtool
 @sample etc/cone.dist etc/cone
 libexec/cone
-man/man1/cone.1.gz
-man/man1/leaf.1.gz
-man/man1/mailtool.1.gz
+share/man/man1/cone.1.gz
+share/man/man1/leaf.1.gz
+share/man/man1/mailtool.1.gz
 sbin/cone-sysconftool
 %%DATADIR%%/APPLICATION.PDF.filter
 %%DATADIR%%/FAQ.html
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 14ba68828c55..08a7b1a1a386 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	amule
 PORTVERSION=	2.3.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
@@ -20,6 +20,7 @@ USE_PERL5=	build
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index d368210cb8c8..873fc74c5ead 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -11,116 +11,116 @@
 %%FILEVIEW%%bin/mulefileview
 %%WXCAS%%bin/wxcas
 %%XAS%%lib/xchat/plugins/xas.pl
-%%NLS%%%%ALC%%man/de/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/de/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/de/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/de/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/de/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/de/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/de/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/de/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/de/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/de/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/de/man1/xas.1.gz
-%%NLS%%%%ALC%%man/es/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/es/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/es/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/es/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/es/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/es/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/es/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/es/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/es/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/es/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/es/man1/xas.1.gz
-%%NLS%%%%ALC%%man/fr/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/fr/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/fr/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/fr/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/fr/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/fr/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/fr/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/fr/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/fr/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/fr/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/fr/man1/xas.1.gz
-%%NLS%%%%ALC%%man/hu/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/hu/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/hu/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/hu/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/hu/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/hu/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/hu/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/hu/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/hu/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/hu/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/hu/man1/xas.1.gz
-%%NLS%%%%ALC%%man/it/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/it/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/it/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/it/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/it/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/it/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/it/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/it/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/it/man1/xas.1.gz
-%%NLS%%%%ALC%%man/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/man1/xas.1.gz
-%%NLS%%%%ALC%%man/ro/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/ro/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/ro/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/ro/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/ro/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/ro/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/ro/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/ro/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/ro/man1/xas.1.gz
-%%NLS%%%%ALC%%man/ru/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/ru/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/ru/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/ru/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/ru/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/ru/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/ru/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/ru/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/ru/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/ru/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/ru/man1/xas.1.gz
-%%NLS%%%%ALC%%man/tr/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/tr/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/tr/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/tr/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/tr/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/tr/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/tr/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/tr/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/tr/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/tr/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/tr/man1/xas.1.gz
-%%NLS%%%%ALC%%man/zh_TW/man1/alc.1.gz
-%%NLS%%%%ALCC%%man/zh_TW/man1/alcc.1.gz
-%%NLS%%%%MONOLITHIC%%man/zh_TW/man1/amule.1.gz
-%%NLS%%%%AMULECMD%%man/zh_TW/man1/amulecmd.1.gz
-%%NLS%%%%AMULEDAEMON%%man/zh_TW/man1/amuled.1.gz
-%%NLS%%%%AMULEGUI%%man/zh_TW/man1/amulegui.1.gz
-%%NLS%%%%WEBSERVER%%man/zh_TW/man1/amuleweb.1.gz
-%%NLS%%%%CAS%%man/zh_TW/man1/cas.1.gz
-%%NLS%%%%ED2K%%man/zh_TW/man1/ed2k.1.gz
-%%NLS%%%%WXCAS%%man/zh_TW/man1/wxcas.1.gz
-%%NLS%%%%XAS%%man/zh_TW/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/de/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/de/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/de/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/de/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/de/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/de/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/de/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/de/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/de/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/de/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/de/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/es/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/es/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/es/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/es/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/es/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/es/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/es/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/es/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/es/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/es/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/es/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/fr/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/fr/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/fr/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/fr/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/fr/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/fr/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/fr/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/fr/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/fr/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/fr/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/fr/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/hu/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/hu/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/hu/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/hu/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/hu/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/hu/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/hu/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/hu/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/hu/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/hu/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/hu/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/it/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/it/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/it/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/it/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/it/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/it/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/it/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/it/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/it/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/it/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/it/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/ro/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/ro/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/ro/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/ro/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/ro/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/ro/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/ro/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/ro/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/ro/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/ro/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/ro/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/ru/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/ru/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/ru/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/ru/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/ru/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/ru/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/ru/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/ru/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/ru/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/ru/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/ru/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/tr/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/tr/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/tr/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/tr/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/tr/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/tr/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/tr/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/tr/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/tr/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/tr/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/tr/man1/xas.1.gz
+%%NLS%%%%ALC%%share/man/zh_TW/man1/alc.1.gz
+%%NLS%%%%ALCC%%share/man/zh_TW/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%share/man/zh_TW/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%share/man/zh_TW/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%share/man/zh_TW/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%share/man/zh_TW/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%share/man/zh_TW/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%share/man/zh_TW/man1/cas.1.gz
+%%NLS%%%%ED2K%%share/man/zh_TW/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%share/man/zh_TW/man1/wxcas.1.gz
+%%NLS%%%%XAS%%share/man/zh_TW/man1/xas.1.gz
 %%AMULESKIN%%%%DATADIR%%/skins/Mac_Gray.zip
 %%AMULESKIN%%%%DATADIR%%/skins/gnome.zip
 %%AMULESKIN%%%%DATADIR%%/skins/kde4.zip
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 20234678e9f5..08a6f41d465c 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	chemtool
 PORTVERSION=	1.7.20050716
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	science
 MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 PKGNAMESUFFIX=	-devel
@@ -22,6 +22,7 @@ USES=		compiler:c++11-lang gettext gmake gnome pkgconfig tar:tgz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-emf=yes
 MAKE_ARGS+=	MAKE=${MAKE_CMD}
 CFLAGS+=	-fcommon
diff --git a/science/chemtool-devel/pkg-plist b/science/chemtool-devel/pkg-plist
index 28ddc6b88232..c99046673729 100644
--- a/science/chemtool-devel/pkg-plist
+++ b/science/chemtool-devel/pkg-plist
@@ -1,7 +1,7 @@
 bin/chemtool
 bin/cht
-man/man1/chemtool.1.gz
-man/man1/cht.1.gz
+share/man/man1/chemtool.1.gz
+share/man/man1/cht.1.gz
 share/locale/cs/LC_MESSAGES/chemtool.mo
 share/locale/de/LC_MESSAGES/chemtool.mo
 share/locale/fr/LC_MESSAGES/chemtool.mo
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 506db4f77856..6524c0876334 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	h5utils
 DISTVERSION=	1.13.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -20,6 +20,7 @@ LIB_DEPENDS=	libdf.so:science/hdf \
 
 USES=		autoreconf compiler:c++11-lang jpeg localbase
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CFLAGS+=	-pthread
 CXXFLAGS+=	-std=c++11
diff --git a/science/h5utils/pkg-plist b/science/h5utils/pkg-plist
index 4d3ba2923561..be1656b3654c 100644
--- a/science/h5utils/pkg-plist
+++ b/science/h5utils/pkg-plist
@@ -6,12 +6,12 @@ bin/h5topng
 bin/h5totxt
 bin/h5tovtk
 %%OCTAVE%%lib/octave/%%OCTAVE_VERSION%%/site/oct/%%CONFIGURE_TARGET%%/h5read.oct
-man/man1/h5fromh4.1.gz
-man/man1/h5fromtxt.1.gz
-man/man1/h5math.1.gz
-man/man1/h5topng.1.gz
-man/man1/h5totxt.1.gz
-man/man1/h5tovtk.1.gz
+share/man/man1/h5fromh4.1.gz
+share/man/man1/h5fromtxt.1.gz
+share/man/man1/h5math.1.gz
+share/man/man1/h5topng.1.gz
+share/man/man1/h5totxt.1.gz
+share/man/man1/h5tovtk.1.gz
 %%DATADIR%%/colormaps/BrBG
 %%DATADIR%%/colormaps/RdBu
 %%DATADIR%%/colormaps/autumn
diff --git a/security/uacme/Makefile b/security/uacme/Makefile
index 7818afd129db..3aced30b02fb 100644
--- a/security/uacme/Makefile
+++ b/security/uacme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	uacme
 DISTVERSIONPREFIX=	upstream/
 DISTVERSION=	1.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security www
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -17,6 +17,7 @@ USES=		gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	ndilieto
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--datadir=${EXAMPLESDIR:H} \
 		--disable-maintainer-mode \
 		--sysconfdir=${PREFIX}/etc
diff --git a/security/uacme/pkg-plist b/security/uacme/pkg-plist
index 8c65a6104a52..8b410316260f 100644
--- a/security/uacme/pkg-plist
+++ b/security/uacme/pkg-plist
@@ -1,7 +1,7 @@
 bin/uacme
 %%UALPN%%bin/ualpn
-%%MANPAGES%%man/man1/uacme.1.gz
-%%UALPN%%%%MANPAGES%%man/man1/ualpn.1.gz
+%%MANPAGES%%share/man/man1/uacme.1.gz
+%%UALPN%%%%MANPAGES%%share/man/man1/ualpn.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/uacme.html
 %%UALPN%%%%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/ualpn.html
diff --git a/sysutils/procenv/Makefile b/sysutils/procenv/Makefile
index 34eac5ebf75d..12ae0bf47ca3 100644
--- a/sysutils/procenv/Makefile
+++ b/sysutils/procenv/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	procenv
 DISTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -19,10 +20,11 @@ GH_ACCOUNT=	jamesodhunt
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/procenv \
-		man/man1/procenv.1.gz
+		share/man/man1/procenv.1.gz
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=	DOCS
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index d496d0819451..3a76e4ff17b1 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bluefish
 DISTVERSION=	2.2.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www editors
 MASTER_SITES=	https://www.bennewitz.com/bluefish/stable/source/ \
 		SF
@@ -25,6 +25,7 @@ SHEBANG_FILES=	data/css_decompressor data/cssmin.py data/jsbeautify \
 		src/plugin_zencoding/zencoding/filters/*.py \
 		src/plugin_zencoding/zencoding/*.py
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-update-databases \
 		--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 26410ed7669f..431fee9e7c08 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -6,7 +6,7 @@ lib/bluefish/htmlbar.so
 lib/bluefish/infbrowser.so
 lib/bluefish/snippets.so
 lib/bluefish/zencoding.so
-man/man1/bluefish.1.gz
+share/man/man1/bluefish.1.gz
 share/metainfo/bluefish.appdata.xml
 share/applications/bluefish.desktop
 %%DATADIR%%/bflang/JQuery.bfinc
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index a8a8d0ac352f..f4e4576e987a 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xdaliclock
 DISTVERSION=	2.48
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	https://www.jwz.org/${PORTNAME}/
 
@@ -17,11 +17,12 @@ GLIB_SCHEMAS=	org.jwz.xdaliclock.gschema.xml
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFLICTS=	xdaliclock-classic
 WRKSRC=		${WRKDIR}/${DISTNAME}/X11
 
 PLIST_FILES=	bin/xdaliclock \
-		man/man1/xdaliclock.1.gz \
+		share/man/man1/xdaliclock.1.gz \
 		share/applications/xdaliclock.desktop \
 		share/glib-2.0/schemas/gschemas.compiled \
 		share/pixmaps/xdaliclock.png
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 64d80c4530bd..850db7f0959a 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	xclip
 DISTVERSION=	0.13-82
 DISTVERSIONSUFFIX=	-gb372f73
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -16,6 +17,7 @@ GH_ACCOUNT=	astrand
 USE_XORG=	x11 xmu
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV+=	ac_cv_header_X11_Intrinsic_h=yes \
 		ac_cv_header_X11_Xmu_Atoms_h=yes \
 		ac_cv_lib_Xmu_XmuClientWindow=yes
@@ -24,8 +26,8 @@ PLIST_FILES=	bin/xclip \
 		bin/xclip-copyfile \
 		bin/xclip-cutfile \
 		bin/xclip-pastefile \
-		man/man1/xclip-copyfile.1.gz \
-		man/man1/xclip.1.gz
+		share/man/man1/xclip-copyfile.1.gz \
+		share/man/man1/xclip.1.gz
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS