Convert more of my ports to new manual page location (part two).

51 files changed, 198 insertions, 175 deletions

diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile
index 1d2572e961ea..c03bf5826ede 100644
--- a/astro/gnuastro/Makefile
+++ b/astro/gnuastro/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 
 USES=		gmake jpeg libtool:build localbase tar:lz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
diff --git a/astro/gnuastro/pkg-plist b/astro/gnuastro/pkg-plist
index d41b97aa6765..26484ee432bf 100644
--- a/astro/gnuastro/pkg-plist
+++ b/astro/gnuastro/pkg-plist
@@ -93,33 +93,10 @@ lib/libgnuastro_make.so
 lib/libgnuastro_make.so.19
 lib/libgnuastro_make.so.19.0.0
 libdata/pkgconfig/gnuastro.pc
-man/man1/astarithmetic.1.gz
-man/man1/astbuildprog.1.gz
-man/man1/astconvertt.1.gz
-man/man1/astconvolve.1.gz
-man/man1/astcosmiccal.1.gz
-man/man1/astcrop.1.gz
-man/man1/astfits.1.gz
-man/man1/astmatch.1.gz
-man/man1/astmkcatalog.1.gz
-man/man1/astmkprof.1.gz
-man/man1/astnoisechisel.1.gz
-man/man1/astquery.1.gz
-man/man1/astscript-ds9-region.1.gz
-man/man1/astscript-fits-view.1.gz
-man/man1/astscript-pointing-simulate.1.gz
-man/man1/astscript-psf-scale-factor.1.gz
-man/man1/astscript-psf-select-stars.1.gz
-man/man1/astscript-psf-stamp.1.gz
-man/man1/astscript-psf-subtract.1.gz
-man/man1/astscript-psf-unite.1.gz
-man/man1/astscript-radial-profile.1.gz
-man/man1/astscript-sort-by-night.1.gz
-man/man1/astscript-zeropoint.1.gz
-man/man1/astsegment.1.gz
-man/man1/aststatistics.1.gz
-man/man1/asttable.1.gz
-man/man1/astwarp.1.gz
+%%DATADIR%%/astscript-fits-view.desktop
+%%DATADIR%%/completion.bash
+%%DATADIR%%/pointing-simulate.mk
+%%DATADIR%%/zeropoint.mk
 share/info/gnuastro-figures/README
 share/info/gnuastro-figures/color-names.eps
 share/info/gnuastro-figures/color-names.pdf
@@ -149,7 +126,30 @@ share/info/gnuastro-figures/sphereandplane.eps
 share/info/gnuastro-figures/sphereandplane.pdf
 share/info/gnuastro-figures/sphereandplane.png
 share/info/gnuastro-figures/sphereandplane.txt
-%%DATADIR%%/astscript-fits-view.desktop
-%%DATADIR%%/completion.bash
-%%DATADIR%%/pointing-simulate.mk
-%%DATADIR%%/zeropoint.mk
+share/man/man1/astarithmetic.1.gz
+share/man/man1/astbuildprog.1.gz
+share/man/man1/astconvertt.1.gz
+share/man/man1/astconvolve.1.gz
+share/man/man1/astcosmiccal.1.gz
+share/man/man1/astcrop.1.gz
+share/man/man1/astfits.1.gz
+share/man/man1/astmatch.1.gz
+share/man/man1/astmkcatalog.1.gz
+share/man/man1/astmkprof.1.gz
+share/man/man1/astnoisechisel.1.gz
+share/man/man1/astquery.1.gz
+share/man/man1/astscript-ds9-region.1.gz
+share/man/man1/astscript-fits-view.1.gz
+share/man/man1/astscript-pointing-simulate.1.gz
+share/man/man1/astscript-psf-scale-factor.1.gz
+share/man/man1/astscript-psf-select-stars.1.gz
+share/man/man1/astscript-psf-stamp.1.gz
+share/man/man1/astscript-psf-subtract.1.gz
+share/man/man1/astscript-psf-unite.1.gz
+share/man/man1/astscript-radial-profile.1.gz
+share/man/man1/astscript-sort-by-night.1.gz
+share/man/man1/astscript-zeropoint.1.gz
+share/man/man1/astsegment.1.gz
+share/man/man1/aststatistics.1.gz
+share/man/man1/asttable.1.gz
+share/man/man1/astwarp.1.gz
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 9fa9f3916445..f65890349a22 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -19,6 +19,7 @@ SHEBANG_FILES=	scripts/mab2vcard scripts/sync-evolution.sh \
 		scripts/sync-palm-jppy.py
 USE_GNOME=	gtk20 intltool libglade2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 836b676eedc6..56b2f7a5ee25 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -1,5 +1,4 @@
 bin/gtkpod
-man/man1/gtkpod.1.gz
 %%DATADIR%%/data/default-cover.png
 %%DATADIR%%/data/gtkpod-add-dirs.png
 %%DATADIR%%/data/gtkpod-add-files.png
@@ -93,3 +92,4 @@ share/locale/ro/LC_MESSAGES/gtkpod.mo
 share/locale/ru/LC_MESSAGES/gtkpod.mo
 share/locale/sv/LC_MESSAGES/gtkpod.mo
 share/locale/zh_CN/LC_MESSAGES/gtkpod.mo
+share/man/man1/gtkpod.1.gz
diff --git a/cad/libredwg/Makefile b/cad/libredwg/Makefile
index 1d4160974691..ef60828076dd 100644
--- a/cad/libredwg/Makefile
+++ b/cad/libredwg/Makefile
@@ -11,6 +11,7 @@ LICENSE=	GPLv3+
 
 USES=		cpe libtool tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-trace --with-perl-install=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/cad/libredwg/pkg-plist b/cad/libredwg/pkg-plist
index b88b8845176a..a14d80d6d9d7 100644
--- a/cad/libredwg/pkg-plist
+++ b/cad/libredwg/pkg-plist
@@ -17,21 +17,6 @@ lib/libredwg.a
 lib/libredwg.so
 lib/libredwg.so.0
 lib/libredwg.so.0.0.12
-libdata/pkgconfig/libredwg.pc
-man/man1/dwg2SVG.1.gz
-man/man1/dwg2dxf.1.gz
-%%PSLIB%%man/man1/dwg2ps.1.gz
-man/man1/dwgadd.1.gz
-man/man1/dwgbmp.1.gz
-man/man1/dwgfilter.1.gz
-man/man1/dwggrep.1.gz
-man/man1/dwglayers.1.gz
-man/man1/dwgread.1.gz
-man/man1/dwgrewrite.1.gz
-man/man1/dwgwrite.1.gz
-man/man1/dxf2dwg.1.gz
-man/man1/dxfwrite.1.gz
-man/man5/dwgadd.5.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/LibreDWG.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.so
@@ -39,3 +24,18 @@ man/man5/dwgadd.5.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.so.0.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/LibreDWG.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/LibreDWG.cpython-%%PYTHON_SUFFIX%%.pyc
+libdata/pkgconfig/libredwg.pc
+share/man/man1/dwg2SVG.1.gz
+share/man/man1/dwg2dxf.1.gz
+%%PSLIB%%share/man/man1/dwg2ps.1.gz
+share/man/man1/dwgadd.1.gz
+share/man/man1/dwgbmp.1.gz
+share/man/man1/dwgfilter.1.gz
+share/man/man1/dwggrep.1.gz
+share/man/man1/dwglayers.1.gz
+share/man/man1/dwgread.1.gz
+share/man/man1/dwgrewrite.1.gz
+share/man/man1/dwgwrite.1.gz
+share/man/man1/dxf2dwg.1.gz
+share/man/man1/dxfwrite.1.gz
+share/man/man5/dwgadd.5.gz
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index b75c6c3320f2..7a42449bdc55 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libticables2.so:comms/libticables2	\
 		libticonv.so:converters/libticonv
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 USES=		autoreconf compiler:c11 desktop-file-utils gettext gmake gnome \
 		groff libtool localbase pkgconfig shared-mime-info tar:bzip2
diff --git a/comms/tilp2/pkg-plist b/comms/tilp2/pkg-plist
index f3365ce97c7c..7b914f7b94f7 100644
--- a/comms/tilp2/pkg-plist
+++ b/comms/tilp2/pkg-plist
@@ -1,9 +1,9 @@
 bin/tilp
-man/man1/tilp.1.gz
 share/appdata/tilp.appdata.xml
 share/applications/tilp.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/tilp2.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/tilp2.mo
+share/man/man1/tilp.1.gz
 share/mime/packages/tilp.xml
 %%DATADIR%%/COPYING
 %%DATADIR%%/Manpage.txt
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 744b6f234293..8bc1aef8f393 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -11,6 +11,7 @@ LICENSE=	GPLv3+
 
 USES=		gmake libtool:keepla readline
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
diff --git a/databases/gdbm/pkg-plist b/databases/gdbm/pkg-plist
index 58215a01feea..b6512e2d3ce4 100644
--- a/databases/gdbm/pkg-plist
+++ b/databases/gdbm/pkg-plist
@@ -14,10 +14,6 @@ lib/libgdbm.so.6.0.0
 %%COMPAT%%lib/libgdbm_compat.so
 %%COMPAT%%lib/libgdbm_compat.so.4
 %%COMPAT%%lib/libgdbm_compat.so.4.0.0
-man/man1/gdbm_dump.1.gz
-man/man1/gdbm_load.1.gz
-man/man1/gdbmtool.1.gz
-man/man3/gdbm.3.gz
 %%NLS%%share/locale/da/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gdbm.mo
@@ -32,3 +28,7 @@ man/man3/gdbm.3.gz
 %%NLS%%share/locale/sv/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gdbm.mo
+share/man/man1/gdbm_dump.1.gz
+share/man/man1/gdbm_load.1.gz
+share/man/man1/gdbmtool.1.gz
+share/man/man3/gdbm.3.gz
diff --git a/devel/hp48cc/Makefile b/devel/hp48cc/Makefile
index 704c0f724926..c88b9c538c93 100644
--- a/devel/hp48cc/Makefile
+++ b/devel/hp48cc/Makefile
@@ -13,10 +13,10 @@ LICENSE=	GPLv2
 
 USES=		bison
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index dcd515f5b1a7..6b3a1b218127 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libexif.so:graphics/libexif \
 USES=		gmake jpeg pkgconfig tar:bzip2
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 		POPT_LIBS="$$(pkg-config --libs popt)"
 CONFIGURE_ARGS=	--without-cdk
diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist
index 75c684b9c751..6f853e6e3ef3 100644
--- a/graphics/gphoto2/pkg-plist
+++ b/graphics/gphoto2/pkg-plist
@@ -1,5 +1,4 @@
 bin/gphoto2
-man/man1/gphoto2.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
 %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
@@ -30,3 +29,4 @@ man/man1/gphoto2.1.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
+share/man/man1/gphoto2.1.gz
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index a6590e8841f9..7a85ccd345c9 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -19,6 +19,7 @@ USE_CSTD=	gnu99
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 		PATH="${PATH:C,${HOME}/bin,,}" \
diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist
index 57b16dfb1d2f..c27b3fdc9d00 100644
--- a/graphics/libgphoto2/pkg-plist
+++ b/graphics/libgphoto2/pkg-plist
@@ -50,8 +50,6 @@ lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.so
 lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
 libdata/pkgconfig/libgphoto2.pc
 libdata/pkgconfig/libgphoto2_port.pc
-man/man3/libgphoto2.3.gz
-man/man3/libgphoto2_port.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -149,3 +147,5 @@ man/man3/libgphoto2_port.3.gz
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-12.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-12.mo
+share/man/man3/libgphoto2.3.gz
+share/man/man3/libgphoto2_port.3.gz
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 370d18d97925..f36569e9ad82 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -22,8 +22,9 @@ MPFR_CONFIGURE_OFF=	--without-gmp --without-mpfr
 
 INFO=		gawk gawkinet gawkworkflow pm-gawk
 
-GNU_CONFIGURE=	yes
 USES=		gmake iconv libtool readline tar:lz
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE} \
 		AWK=${AWK}
diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist
index b3536d2989bb..84f684010d41 100644
--- a/lang/gawk/pkg-plist
+++ b/lang/gawk/pkg-plist
@@ -18,20 +18,6 @@ lib/gawk/rwarray.so
 lib/gawk/time.so
 libexec/awk/grcat
 libexec/awk/pwcat
-man/man1/gawk.1.gz
-man/man1/gawkbug.1.gz
-man/man1/pm-gawk.1.gz
-man/man3/filefuncs.3am.gz
-man/man3/fnmatch.3am.gz
-man/man3/fork.3am.gz
-man/man3/inplace.3am.gz
-man/man3/ordchr.3am.gz
-man/man3/readdir.3am.gz
-man/man3/readfile.3am.gz
-man/man3/revoutput.3am.gz
-man/man3/revtwoway.3am.gz
-man/man3/rwarray.3am.gz
-man/man3/time.3am.gz
 share/awk/assert.awk
 share/awk/bits2str.awk
 share/awk/cliff_rand.awk
@@ -90,3 +76,17 @@ share/info/gawk_statist.jpg
 %%NLS%%share/locale/uk/LC_MESSAGES/gawk.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gawk.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gawk.mo
+share/man/man1/gawk.1.gz
+share/man/man1/gawkbug.1.gz
+share/man/man1/pm-gawk.1.gz
+share/man/man3/filefuncs.3am.gz
+share/man/man3/fnmatch.3am.gz
+share/man/man3/fork.3am.gz
+share/man/man3/inplace.3am.gz
+share/man/man3/ordchr.3am.gz
+share/man/man3/readdir.3am.gz
+share/man/man3/readfile.3am.gz
+share/man/man3/revoutput.3am.gz
+share/man/man3/revtwoway.3am.gz
+share/man/man3/rwarray.3am.gz
+share/man/man3/time.3am.gz
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 118d64bfc218..4791cbb4bd42 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	libavcall.so:devel/libffcall \
 USES=		gmake libtool:build localbase makeinfo
 USE_GCC=	yes
 USE_LDCONFIG=	${PREFIX}/lib/gforth/${PORTVERSION}/libcc-named
-
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	GFORTHHIST=${WRKSRC}
 MAKE_ENV=	GFORTHHIST=${WRKSRC}
 ALL_TARGET=	kernel/version.fs more info
diff --git a/lang/gforth/pkg-plist b/lang/gforth/pkg-plist
index 30dec414da85..c03f8cf88971 100644
--- a/lang/gforth/pkg-plist
+++ b/lang/gforth/pkg-plist
@@ -28,7 +28,6 @@ lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a
 lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
 lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0
 lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0.0.0
-man/man1/gforth.1.gz
 %%DATADIR%%/%%PORTVERSION%%/TAGS
 %%DATADIR%%/%%PORTVERSION%%/add.fs
 %%DATADIR%%/%%PORTVERSION%%/ans-report.fs
@@ -234,6 +233,7 @@ man/man1/gforth.1.gz
 %%DATADIR%%/%%PORTVERSION%%/wordinfo.fs
 %%DATADIR%%/%%PORTVERSION%%/wordsets.fs
 %%DATADIR%%/%%PORTVERSION%%/xwords.fs
+share/man/man1/gforth.1.gz
 @dir %%DATADIR%%/%%PORTVERSION%%/vmgen-ex
 @dir %%DATADIR%%/site-forth
 @dir lib/gforth/site-forth
diff --git a/lang/gnu-apl/Makefile b/lang/gnu-apl/Makefile
index 8121380a4e22..4974d6d5dd40 100644
--- a/lang/gnu-apl/Makefile
+++ b/lang/gnu-apl/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		compiler:c++11-lang gmake libtool localbase
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	CXX_WERROR=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/lang/gnu-apl/pkg-plist b/lang/gnu-apl/pkg-plist
index c88c3b12ff7e..e4a1eff3ac54 100644
--- a/lang/gnu-apl/pkg-plist
+++ b/lang/gnu-apl/pkg-plist
@@ -53,4 +53,4 @@ lib/apl/wslib5/iso-apl-cf/_metadata_
 lib/apl/wslib5/iso-apl-cf/iso_cf.apl
 lib/apl/wslib5/iso-apl-cf/perf.apl
 lib/apl/wslib5/iso-apl-cf/test.apl
-man/man1/apl.1.gz
+share/man/man1/apl.1.gz
diff --git a/misc/hxtools/Makefile b/misc/hxtools/Makefile
index 1d0b48e1f4c4..1f8138516d15 100644
--- a/misc/hxtools/Makefile
+++ b/misc/hxtools/Makefile
@@ -17,6 +17,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		compiler:c++11-lang iconv perl5 pkgconfig shebangfix \
 		tar:zst xorg
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 SHEBANG_FILES=	data/hxtools_bashrc.bash data/hxtools_profile.bash \
 		examples/git-deconstruct examples/rc4 sadmin/hxnetload \
 		sadmin/ldif-duplicate-attrs sadmin/ldif-leading-spaces \
diff --git a/misc/hxtools/pkg-plist b/misc/hxtools/pkg-plist
index edff95cdb808..9637562a1f23 100644
--- a/misc/hxtools/pkg-plist
+++ b/misc/hxtools/pkg-plist
@@ -60,54 +60,6 @@ libexec/hxtools/recursive_lower
 libexec/hxtools/rezip
 libexec/hxtools/sourcefuncsize
 libexec/hxtools/vcsaview
-man/man1/aumeta.1.gz
-man/man1/bin2c.1.gz
-man/man1/bsvplay.1.gz
-man/man1/checkbrack.1.gz
-man/man1/clock_info.1.gz
-man/man1/cwdiff.1.gz
-man/man1/declone.1.gz
-man/man1/diff2php.1.gz
-man/man1/extract_d3pkg.1.gz
-man/man1/extract_dxhog.1.gz
-man/man1/extract_f3pod.1.gz
-man/man1/extract_qupak.1.gz
-man/man1/fd0ssh.1.gz
-man/man1/fxterm.1.gz
-man/man1/git-author-stat.1.gz
-man/man1/git-forest.1.gz
-man/man1/git-revert-stats.1.gz
-man/man1/git-track.1.gz
-man/man1/gpsh.1.gz
-man/man1/hcdplay.1.gz
-man/man1/ldif-duplicate-attrs.1.gz
-man/man1/mailsplit.1.gz
-man/man1/man2html.1.gz
-man/man1/mod2opus.1.gz
-man/man1/ofl.1.gz
-man/man1/pcmdiff.1.gz
-man/man1/pcmmix.1.gz
-man/man1/pegrep.1.gz
-man/man1/peicon.1.gz
-man/man1/pesubst.1.gz
-man/man1/psthreads.1.gz
-man/man1/qplay.1.gz
-man/man1/qtar.1.gz
-man/man1/recursive_lower.1.gz
-man/man1/rezip.1.gz
-man/man1/rot13.1.gz
-man/man1/sourcefuncsize.1.gz
-man/man1/spec-beautifier.1.gz
-man/man1/ssa2srt.1.gz
-man/man1/sysinfo.1.gz
-man/man1/tailhex.1.gz
-man/man1/wktimer.1.gz
-man/man1/xcp.1.gz
-man/man7/hxtools.7.gz
-man/man8/hxnetload.8.gz
-man/man8/logontime.8.gz
-man/man8/vcsaview.8.gz
-man/man8/xfs_irecover.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/changelog.rst
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/git-deconstruct
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc4
@@ -136,3 +88,51 @@ share/kbd/keymaps/i386/qwerty/us_jng_vaiou3.map
 share/kbd/keymaps/i386/qwertz/de_jng.map
 share/kbd/unimaps/cp437AB.uni
 share/kbd/unimaps/cp437x.uni
+share/man/man1/aumeta.1.gz
+share/man/man1/bin2c.1.gz
+share/man/man1/bsvplay.1.gz
+share/man/man1/checkbrack.1.gz
+share/man/man1/clock_info.1.gz
+share/man/man1/cwdiff.1.gz
+share/man/man1/declone.1.gz
+share/man/man1/diff2php.1.gz
+share/man/man1/extract_d3pkg.1.gz
+share/man/man1/extract_dxhog.1.gz
+share/man/man1/extract_f3pod.1.gz
+share/man/man1/extract_qupak.1.gz
+share/man/man1/fd0ssh.1.gz
+share/man/man1/fxterm.1.gz
+share/man/man1/git-author-stat.1.gz
+share/man/man1/git-forest.1.gz
+share/man/man1/git-revert-stats.1.gz
+share/man/man1/git-track.1.gz
+share/man/man1/gpsh.1.gz
+share/man/man1/hcdplay.1.gz
+share/man/man1/ldif-duplicate-attrs.1.gz
+share/man/man1/mailsplit.1.gz
+share/man/man1/man2html.1.gz
+share/man/man1/mod2opus.1.gz
+share/man/man1/ofl.1.gz
+share/man/man1/pcmdiff.1.gz
+share/man/man1/pcmmix.1.gz
+share/man/man1/pegrep.1.gz
+share/man/man1/peicon.1.gz
+share/man/man1/pesubst.1.gz
+share/man/man1/psthreads.1.gz
+share/man/man1/qplay.1.gz
+share/man/man1/qtar.1.gz
+share/man/man1/recursive_lower.1.gz
+share/man/man1/rezip.1.gz
+share/man/man1/rot13.1.gz
+share/man/man1/sourcefuncsize.1.gz
+share/man/man1/spec-beautifier.1.gz
+share/man/man1/ssa2srt.1.gz
+share/man/man1/sysinfo.1.gz
+share/man/man1/tailhex.1.gz
+share/man/man1/wktimer.1.gz
+share/man/man1/xcp.1.gz
+share/man/man7/hxtools.7.gz
+share/man/man8/hxnetload.8.gz
+share/man/man8/logontime.8.gz
+share/man/man8/vcsaview.8.gz
+share/man/man8/xfs_irecover.8.gz
diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile
index 10d6d496fe52..bcf40591ca07 100644
--- a/multimedia/recordmydesktop/Makefile
+++ b/multimedia/recordmydesktop/Makefile
@@ -15,9 +15,10 @@ LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 USES=		xorg
 USE_XORG=	ice sm x11 xdamage xext xfixes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-oss=yes
 
-PLIST_FILES=	bin/recordmydesktop man/man1/recordmydesktop.1.gz
+PLIST_FILES=	bin/recordmydesktop share/man/man1/recordmydesktop.1.gz
 PORTDOCS=	ChangeLog
 
 OPTIONS_DEFINE=	DOCS JACK
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 84198d48ce7f..728cb786aeaa 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -21,6 +21,7 @@ USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-experimental
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
index 8daf21d16fd5..ce25f8e3d104 100644
--- a/net-mgmt/aircrack-ng/pkg-plist
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -23,29 +23,6 @@ lib/libaircrack-crypto-1.3.0.so
 lib/libaircrack-crypto.so
 lib/libaircrack-osdep-1.3.0.so
 lib/libaircrack-osdep.so
-man/man1/aircrack-ng.1.gz
-man/man1/airdecap-ng.1.gz
-man/man1/airdecloak-ng.1.gz
-%%SQLITE%%man/man1/airolib-ng.1.gz
-man/man1/besside-ng-crawler.1.gz
-man/man1/buddy-ng.1.gz
-man/man1/ivstools.1.gz
-man/man1/kstats.1.gz
-man/man1/makeivs-ng.1.gz
-man/man1/packetforge-ng.1.gz
-man/man1/wpaclean.1.gz
-man/man8/airbase-ng.8.gz
-man/man8/aireplay-ng.8.gz
-man/man8/airmon-ng.8.gz
-man/man8/airodump-ng-oui-update.8.gz
-man/man8/airodump-ng.8.gz
-man/man8/airserv-ng.8.gz
-man/man8/airtun-ng.8.gz
-man/man8/airventriloquist-ng.8.gz
-man/man8/besside-ng.8.gz
-man/man8/easside-ng.8.gz
-man/man8/tkiptun-ng.8.gz
-man/man8/wesside-ng.8.gz
 sbin/airbase-ng
 sbin/aireplay-ng
 sbin/airmon-ng
@@ -58,4 +35,27 @@ sbin/besside-ng
 sbin/easside-ng
 sbin/tkiptun-ng
 sbin/wesside-ng
+share/man/man1/aircrack-ng.1.gz
+share/man/man1/airdecap-ng.1.gz
+share/man/man1/airdecloak-ng.1.gz
+%%SQLITE%%share/man/man1/airolib-ng.1.gz
+share/man/man1/besside-ng-crawler.1.gz
+share/man/man1/buddy-ng.1.gz
+share/man/man1/ivstools.1.gz
+share/man/man1/kstats.1.gz
+share/man/man1/makeivs-ng.1.gz
+share/man/man1/packetforge-ng.1.gz
+share/man/man1/wpaclean.1.gz
+share/man/man8/airbase-ng.8.gz
+share/man/man8/aireplay-ng.8.gz
+share/man/man8/airmon-ng.8.gz
+share/man/man8/airodump-ng-oui-update.8.gz
+share/man/man8/airodump-ng.8.gz
+share/man/man8/airserv-ng.8.gz
+share/man/man8/airtun-ng.8.gz
+share/man/man8/airventriloquist-ng.8.gz
+share/man/man8/besside-ng.8.gz
+share/man/man8/easside-ng.8.gz
+share/man/man8/tkiptun-ng.8.gz
+share/man/man8/wesside-ng.8.gz
 @dir %%ETCDIR%%
diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index 79798877ec4f..93291c0076b3 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -23,6 +23,7 @@ GH_ACCOUNT=	freedesktop
 GH_PROJECT=	libfprint-${PORTNAME}
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	sysconfdir="${ETCDIR}/"
 
diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist
index 4e3a01d8bd40..e682483d73d2 100644
--- a/security/fprintd/pkg-plist
+++ b/security/fprintd/pkg-plist
@@ -81,5 +81,5 @@ share/dbus-1/system-services/net.reactivated.Fprint.service
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
-man/man1/fprintd.1.gz
+share/man/man1/fprintd.1.gz
 share/polkit-1/actions/net.reactivated.fprint.device.policy
diff --git a/sysutils/bsdfan/Makefile b/sysutils/bsdfan/Makefile
index 2cb710a7b4d6..0a3ad6913b6f 100644
--- a/sysutils/bsdfan/Makefile
+++ b/sysutils/bsdfan/Makefile
@@ -16,8 +16,9 @@ USES=		uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	claudiozz
 GH_TAGNAME=	d8428a7
+MAKE_ARGS=	MANDIR=${PREFIX}/share/man/man
 
-PLIST_FILES=	bin/bsdfan man/man1/bsdfan.1.gz \
+PLIST_FILES=	bin/bsdfan share/man/man1/bsdfan.1.gz \
 		@sample\ etc/bsdfan.conf.sample
 
 post-patch:
diff --git a/sysutils/read-edid/Makefile b/sysutils/read-edid/Makefile
index 1a1a9fead261..98241eddaf7f 100644
--- a/sysutils/read-edid/Makefile
+++ b/sysutils/read-edid/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libx86.so:devel/libx86
 
 USES=		cmake localbase
 
-PLIST_FILES=	bin/get-edid bin/parse-edid man/man1/get-edid.1.gz
+PLIST_FILES=	bin/get-edid bin/parse-edid share/man/man1/get-edid.1.gz
 PORTDOCS=	AUTHORS ChangeLog LICENSE README
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/read-edid/files/patch-CMakeLists.txt b/sysutils/read-edid/files/patch-CMakeLists.txt
index 9b6704add7cf..f958e3b26721 100644
--- a/sysutils/read-edid/files/patch-CMakeLists.txt
+++ b/sysutils/read-edid/files/patch-CMakeLists.txt
@@ -1,11 +1,9 @@
 --- CMakeLists.txt.orig	2014-02-05 16:27:26 UTC
 +++ CMakeLists.txt
-@@ -12,6 +12,6 @@ if (I2CBUILD OR CLASSICBUILD)
- endif ()
+@@ -13,5 +13,5 @@ endif ()
  add_subdirectory (parse-edid)
  
--INSTALL(FILES get-edid.1 DESTINATION share/man/man1)
+ INSTALL(FILES get-edid.1 DESTINATION share/man/man1)
 -INSTALL(FILES AUTHORS ChangeLog COPYING README DESTINATION
-+INSTALL(FILES get-edid.1 DESTINATION man/man1)
 +INSTALL(FILES AUTHORS ChangeLog LICENSE README DESTINATION
  	share/doc/read-edid)
diff --git a/sysutils/scanmem/Makefile b/sysutils/scanmem/Makefile
index 81967eb010b9..be7a6f31023d 100644
--- a/sysutils/scanmem/Makefile
+++ b/sysutils/scanmem/Makefile
@@ -18,6 +18,7 @@ USE_GITHUB=	yes
 USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_file__proc_self_maps=yes \
 		ac_cv_file__proc_self_mem=yes
 
diff --git a/sysutils/scanmem/pkg-plist b/sysutils/scanmem/pkg-plist
index 915af44a8b38..c9db7f5a42b5 100644
--- a/sysutils/scanmem/pkg-plist
+++ b/sysutils/scanmem/pkg-plist
@@ -13,8 +13,6 @@ lib/libscanmem.a
 lib/libscanmem.so
 lib/libscanmem.so.1
 lib/libscanmem.so.1.0.0
-%%X11%%man/man1/gameconqueror.1.gz
-man/man1/scanmem.1.gz
 %%X11%%share/appdata/GameConqueror.appdata.xml
 %%X11%%share/applications/GameConqueror.desktop
 %%X11%%share/gameconqueror/GameConqueror.py
@@ -45,6 +43,8 @@ man/man1/scanmem.1.gz
 %%X11%%share/locale/ja/LC_MESSAGES/GameConqueror.mo
 %%X11%%share/locale/ru/LC_MESSAGES/GameConqueror.mo
 %%X11%%share/locale/sr_ME/LC_MESSAGES/GameConqueror.mo
+%%X11%%share/man/man1/gameconqueror.1.gz
+share/man/man1/scanmem.1.gz
 %%X11%%share/polkit-1/actions/org.freedesktop.gameconqueror.policy
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%X11%%%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/textproc/datamash/Makefile b/textproc/datamash/Makefile
index 6058595182e6..471c9b5b6cfd 100644
--- a/textproc/datamash/Makefile
+++ b/textproc/datamash/Makefile
@@ -11,6 +11,7 @@ LICENSE=	GPLv3+
 
 USES=		gmake iconv perl5
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 TEST_TARGET=	check
 USE_PERL5=	test
 
diff --git a/textproc/datamash/pkg-plist b/textproc/datamash/pkg-plist
index f085323eb379..6418e520dd74 100644
--- a/textproc/datamash/pkg-plist
+++ b/textproc/datamash/pkg-plist
@@ -1,7 +1,5 @@
 bin/datamash
 bin/decorate
-man/man1/datamash.1.gz
-man/man1/decorate.1.gz
 %%DATADIR%%/bash-completion.d/datamash
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/genes.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/genes_h.txt
@@ -20,3 +18,5 @@ man/man1/decorate.1.gz
 %%NLS%%share/locale/sv/LC_MESSAGES/datamash.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/datamash.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/datamash.mo
+share/man/man1/datamash.1.gz
+share/man/man1/decorate.1.gz
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 312b416a0ba6..12e11853bf45 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -14,6 +14,7 @@ CONFLICTS=	bsd-grep
 
 USES=		charsetfix cpe tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g
 TEST_TARGET=	check
 
diff --git a/textproc/gnugrep/pkg-plist b/textproc/gnugrep/pkg-plist
index 1e2023dbc18a..125fd67f7050 100644
--- a/textproc/gnugrep/pkg-plist
+++ b/textproc/gnugrep/pkg-plist
@@ -4,7 +4,6 @@ bin/gegrep
 bin/gfgrep
 bin/ggrep
 %%COMPAT%%bin/grep
-man/man1/ggrep.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/be/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/grep.mo
@@ -50,3 +49,4 @@ man/man1/ggrep.1.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/grep.mo
+share/man/man1/ggrep.1.gz
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index a46260747a8d..712f38828e2a 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -14,6 +14,7 @@ LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 
 USES=		charsetfix cpe makeinfo tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO} --no-split"
 TEST_TARGET=	check
diff --git a/textproc/gsed/pkg-plist b/textproc/gsed/pkg-plist
index d64592ec643f..59409e79d884 100644
--- a/textproc/gsed/pkg-plist
+++ b/textproc/gsed/pkg-plist
@@ -1,5 +1,4 @@
 bin/gsed
-man/man1/gsed.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/sed.mo
@@ -40,3 +39,4 @@ man/man1/gsed.1.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/sed.mo
+share/man/man1/gsed.1.gz
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 533e37882c48..0dfbf13a8dc5 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -20,6 +20,7 @@ USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	NROFF=echo
 CPE_VENDOR=	fltk_project
@@ -31,9 +32,9 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	CAIRO EXAMPLES
 OPTIONS_SUB=	yes
 
-CAIRO_CONFIGURE_ON=	--enable-cairo
 CAIRO_USES=	gnome
 CAIRO_USE=	GNOME=cairo XORG=pixman
+CAIRO_CONFIGURE_ON=	--enable-cairo
 
 post-patch: .SILENT
 	prefix="${PREFIX}" ; fplen=$$(($${#prefix}+10)) ; \
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index 46d51d8ba0d4..ee3d056c0974 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -165,6 +165,6 @@ lib/libfltk_images.a
 lib/libfltk_images.so
 lib/libfltk_images.so.1
 lib/libfltk_images.so.1.3
-man/man1/fltk-config.1.gz
-man/man1/fluid.1.gz
-man/man3/fltk.3.gz
+share/man/man1/fltk-config.1.gz
+share/man/man1/fluid.1.gz
+share/man/man3/fltk.3.gz
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 2add0390d45a..8e60a9f4317c 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -24,6 +24,7 @@ USES=		gmake gnome libtool makeinfo pathfix pkgconfig tar:xz xorg
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst xrender xext
 USE_GNOME=	cairo gdkpixbuf2 gdkpixbuf2xlib gtk20
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 941eb8cda608..ef0d2f6d80d3 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -32,9 +32,6 @@ lib/sawfish/selection.so
 lib/sawfish/x.a
 lib/sawfish/x.so
 libdata/pkgconfig/sawfish.pc
-man/man1/sawfish-client.1.gz
-man/man1/sawfish-config.1.gz
-man/man1/sawfish.1.gz
 share/applications/sawfish-config.desktop
 share/applications/sawfish.desktop
 share/gnome/wm-properties/sawfish-wm.desktop
@@ -96,6 +93,9 @@ share/ksmserver/windowmanagers/sawfish.desktop
 %%NLS%%share/locale/wa/LC_MESSAGES/sawfish.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sawfish.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/sawfish.mo
+share/man/man1/sawfish-client.1.gz
+share/man/man1/sawfish-config.1.gz
+share/man/man1/sawfish.1.gz
 %%DATADIR%%/images/cabinet-missing.png
 %%DATADIR%%/lisp/anim-outline.jl
 %%DATADIR%%/lisp/anim-outline.jlc
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index 8cb4b66054f9..1044d03f3ea7 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -13,10 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnome pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 
 PLIST_FILES=	bin/selectwm share/locale/fr/LC_MESSAGES/selectwm.mo \
-		man/man1/selectwm.1.gz
+		share/man/man1/selectwm.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS = /s,-s -O2 -Wall ,,' \
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 2cafc91ec753..323eccd84100 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -23,6 +23,7 @@ USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 SHEBANG_FILES=	scripts/getfile.pl.in scripts/upgrade.pl.in
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 LIBS=		-lintl -lX11 -lWUtil
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/wmakerconf/pkg-plist b/x11-wm/wmakerconf/pkg-plist
index c42039d055f4..8b068f57db38 100644
--- a/x11-wm/wmakerconf/pkg-plist
+++ b/x11-wm/wmakerconf/pkg-plist
@@ -1,7 +1,5 @@
 bin/mkpreview
 bin/wmakerconf
-man/man1/mkpreview.1.gz
-man/man1/wmakerconf.1.gz
 share/applications/wmakerconf.desktop
 share/locale/ca/LC_MESSAGES/wmakerconf.mo
 share/locale/da/LC_MESSAGES/wmakerconf-data.mo
@@ -28,6 +26,8 @@ share/locale/ru/LC_MESSAGES/wmakerconf-data.mo
 share/locale/ru/LC_MESSAGES/wmakerconf.mo
 share/locale/sv/LC_MESSAGES/wmakerconf.mo
 share/locale/tr/LC_MESSAGES/wmakerconf.mo
+share/man/man1/mkpreview.1.gz
+share/man/man1/wmakerconf.1.gz
 %%DATADIR%%/ABOUT-NLS
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
diff --git a/x11/gxkb/Makefile b/x11/gxkb/Makefile
index 7d41509d44aa..700d05b487f0 100644
--- a/x11/gxkb/Makefile
+++ b/x11/gxkb/Makefile
@@ -14,6 +14,7 @@ LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 USES=		gnome pkgconfig
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	gdkpixbuf2 glib20
 
 PORTDOCS=	AUTHORS NEWS
diff --git a/x11/gxkb/pkg-plist b/x11/gxkb/pkg-plist
index d5bd853c43e2..fd8ac420c216 100644
--- a/x11/gxkb/pkg-plist
+++ b/x11/gxkb/pkg-plist
@@ -1,5 +1,4 @@
 bin/gxkb
-man/man1/gxkb.1.gz
 share/applications/gxkb.desktop
 %%DATADIR%%/flags/am.png
 %%DATADIR%%/flags/bg.png
@@ -36,4 +35,5 @@ share/applications/gxkb.desktop
 %%DATADIR%%/flags/uz.png
 %%DATADIR%%/flags/zz.png
 %%DATADIR%%/logo.png
+share/man/man1/gxkb.1.gz
 share/pixmaps/gxkb.xpm
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index 6cbd2edc416c..f7a4e62d35f6 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -24,6 +24,7 @@ USES=		gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
 USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2 gdkpixbuf2xlib intltool
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugins="${LXPANEL_PLUGINS}"
 INSTALL_TARGET=	install-strip
diff --git a/x11/lxpanel/pkg-plist b/x11/lxpanel/pkg-plist
index d6f0ec7552a9..df0356613753 100644
--- a/x11/lxpanel/pkg-plist
+++ b/x11/lxpanel/pkg-plist
@@ -22,8 +22,6 @@ lib/lxpanel/plugins/volume.so
 %%WEATHER%%lib/lxpanel/plugins/weather.so
 lib/lxpanel/plugins/xkb.so
 libdata/pkgconfig/lxpanel.pc
-man/man1/lxpanel.1.gz
-man/man1/lxpanelctl.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/lxpanel.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lxpanel.mo
 %%NLS%%share/locale/be/LC_MESSAGES/lxpanel.mo
@@ -255,3 +253,5 @@ man/man1/lxpanelctl.1.gz
 %%DATADIR%%/xkeyboardconfig/layouts.cfg
 %%DATADIR%%/xkeyboardconfig/models.cfg
 %%DATADIR%%/xkeyboardconfig/toggle.cfg
+share/man/man1/lxpanel.1.gz
+share/man/man1/lxpanelctl.1.gz
diff --git a/x11/xkbind/Makefile b/x11/xkbind/Makefile
index df13428c916b..0d41f0105a09 100644
--- a/x11/xkbind/Makefile
+++ b/x11/xkbind/Makefile
@@ -9,12 +9,13 @@ WWW=		https://xkbind.sourceforge.net/
 
 LICENSE=	GPLv2
 
-GNU_CONFIGURE=	yes
 USES=		xorg
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_XORG=	x11
 
 PLIST_FILES=	bin/${PORTNAME} lib/${PORTNAME}/app-defaults/Xkbind \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 PORTDOCS=	AUTHORS ChangeLog README README.utf8.ru THANKS
 
 OPTIONS_DEFINE=	DOCS