git: 32df485cf68a - main - x11/*: Move manpages to share/man

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 29 Jan 2024 19:34:58 UTC
The branch main has been updated by arrowd:

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

commit 32df485cf68a4b91699696ebfb4f475d3f715a3f
Author:     Helge Oldach <freebsd@oldach.net>
AuthorDate: 2024-01-29 19:34:01 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-01-29 19:34:26 +0000

    x11/*: Move manpages to share/man
    
    Approved by:    portmgr (blanket)
---
 x11-clocks/oclock/Makefile                | 3 +++
 x11-clocks/oclock/pkg-plist               | 2 +-
 x11-clocks/xclock/Makefile                | 3 +++
 x11-clocks/xclock/pkg-plist               | 2 +-
 x11-drivers/xf86-input-libinput/Makefile  | 3 +++
 x11-drivers/xf86-input-libinput/pkg-plist | 2 +-
 x11-fonts/xfontsel/Makefile               | 3 +++
 x11-fonts/xfontsel/pkg-plist              | 2 +-
 x11-wm/twm/Makefile                       | 3 +++
 x11-wm/twm/pkg-plist                      | 2 +-
 x11/bitmap/Makefile                       | 3 +++
 x11/bitmap/pkg-plist                      | 6 +++---
 x11/editres/Makefile                      | 3 +++
 x11/editres/pkg-plist                     | 2 +-
 x11/x11perf/Makefile                      | 3 +++
 x11/x11perf/pkg-plist                     | 6 +++---
 x11/xcalc/Makefile                        | 3 +++
 x11/xcalc/pkg-plist                       | 2 +-
 x11/xclipboard/Makefile                   | 3 +++
 x11/xclipboard/pkg-plist                  | 4 ++--
 x11/xconsole/Makefile                     | 3 +++
 x11/xconsole/pkg-plist                    | 2 +-
 x11/xditview/Makefile                     | 3 +++
 x11/xditview/pkg-plist                    | 2 +-
 x11/xedit/Makefile                        | 4 +++-
 x11/xedit/pkg-plist                       | 2 +-
 x11/xfd/Makefile                          | 3 +++
 x11/xfd/pkg-plist                         | 2 +-
 x11/xgc/Makefile                          | 3 +++
 x11/xgc/pkg-plist                         | 2 +-
 x11/xinit/Makefile                        | 3 +++
 x11/xinit/pkg-plist                       | 4 ++--
 x11/xkbutils/Makefile                     | 4 +++-
 x11/xkbutils/pkg-plist                    | 6 +++---
 x11/xload/Makefile                        | 3 +++
 x11/xload/pkg-plist                       | 2 +-
 x11/xlogo/Makefile                        | 3 +++
 x11/xlogo/pkg-plist                       | 2 +-
 x11/xmag/Makefile                         | 3 +++
 x11/xmag/pkg-plist                        | 2 +-
 x11/xman/Makefile                         | 3 +++
 x11/xman/pkg-plist                        | 2 +-
 x11/xmessage/Makefile                     | 3 +++
 x11/xmessage/pkg-plist                    | 2 +-
 x11/xmore/Makefile                        | 3 +++
 x11/xmore/pkg-plist                       | 2 +-
 46 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/x11-clocks/oclock/Makefile b/x11-clocks/oclock/Makefile
index bfddcd5b0c4c..2f76de567900 100644
--- a/x11-clocks/oclock/Makefile
+++ b/x11-clocks/oclock/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	oclock
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,4 +9,6 @@ COMMENT=	Round clock application for X
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xmu xext xt xkbfile
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11-clocks/oclock/pkg-plist b/x11-clocks/oclock/pkg-plist
index 076faaff4971..f6998e5e86de 100644
--- a/x11-clocks/oclock/pkg-plist
+++ b/x11-clocks/oclock/pkg-plist
@@ -1,3 +1,3 @@
 bin/oclock
-man/man1/oclock.1.gz
+share/man/man1/oclock.1.gz
 share/X11/app-defaults/Clock-color
diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile
index 5dd122f1c483..4e6ee2b5e4f9 100644
--- a/x11-clocks/xclock/Makefile
+++ b/x11-clocks/xclock/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xclock
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,4 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		iconv xorg xorg-cat:app
 USE_XORG=	x11 xaw xft xkbfile xmu xrender xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11-clocks/xclock/pkg-plist b/x11-clocks/xclock/pkg-plist
index 23ab2be98c90..960ed22a00e6 100644
--- a/x11-clocks/xclock/pkg-plist
+++ b/x11-clocks/xclock/pkg-plist
@@ -1,4 +1,4 @@
 bin/xclock
-man/man1/xclock.1.gz
+share/man/man1/xclock.1.gz
 share/X11/app-defaults/XClock-color
 share/X11/app-defaults/XClock
diff --git a/x11-drivers/xf86-input-libinput/Makefile b/x11-drivers/xf86-input-libinput/Makefile
index 46b445439c70..b1ad92fbc524 100644
--- a/x11-drivers/xf86-input-libinput/Makefile
+++ b/x11-drivers/xf86-input-libinput/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xf86-input-libinput
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,4 +15,6 @@ LIB_DEPENDS=	libinput.so:x11/libinput
 
 USES=		pathfix tar:xz xorg-cat:driver
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-libinput/pkg-plist b/x11-drivers/xf86-input-libinput/pkg-plist
index 50299f617aa5..91467ff488b6 100644
--- a/x11-drivers/xf86-input-libinput/pkg-plist
+++ b/x11-drivers/xf86-input-libinput/pkg-plist
@@ -1,5 +1,5 @@
 include/xorg/libinput-properties.h
 lib/xorg/modules/input/libinput_drv.so
 libdata/pkgconfig/xorg-libinput.pc
-man/man4/libinput.4x.gz
+share/man/man4/libinput.4x.gz
 share/X11/xorg.conf.d/40-libinput.conf
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index bb0ff51427b3..cdb050373af7 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfontsel
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,4 +10,6 @@ WWW=		https://www.x.org/
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xmu xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfontsel/pkg-plist b/x11-fonts/xfontsel/pkg-plist
index 5ca0cd806e78..a1e5f3a7998f 100644
--- a/x11-fonts/xfontsel/pkg-plist
+++ b/x11-fonts/xfontsel/pkg-plist
@@ -1,3 +1,3 @@
 bin/xfontsel
-man/man1/xfontsel.1.gz
+share/man/man1/xfontsel.1.gz
 share/X11/app-defaults/XFontSel
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
index 3ae20500ddd9..2ba13aa2d44a 100644
--- a/x11-wm/twm/Makefile
+++ b/x11-wm/twm/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	twm
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		tar:xz xorg xorg-cat:app
 USE_XORG=	ice sm x11 xext xmu xrandr xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11-wm/twm/pkg-plist b/x11-wm/twm/pkg-plist
index d0b0d7704048..9bb77a67636a 100644
--- a/x11-wm/twm/pkg-plist
+++ b/x11-wm/twm/pkg-plist
@@ -1,3 +1,3 @@
 bin/twm
-man/man1/twm.1.gz
+share/man/man1/twm.1.gz
 share/X11/twm/system.twmrc
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 415c5943582b..38d7ad00dc67 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bitmap
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xbitmaps xmu xorgproto xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/bitmap/pkg-plist b/x11/bitmap/pkg-plist
index be68c5aec292..f723a4ed836c 100644
--- a/x11/bitmap/pkg-plist
+++ b/x11/bitmap/pkg-plist
@@ -14,9 +14,9 @@ include/X11/bitmaps/RotateRight
 include/X11/bitmaps/Stipple
 include/X11/bitmaps/Term
 include/X11/bitmaps/Up
-man/man1/atobm.1.gz
-man/man1/bitmap.1.gz
-man/man1/bmtoa.1.gz
+share/man/man1/atobm.1.gz
+share/man/man1/bitmap.1.gz
+share/man/man1/bmtoa.1.gz
 share/X11/app-defaults/Bitmap
 share/X11/app-defaults/Bitmap-color
 share/X11/app-defaults/Bitmap-nocase
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 678ae295f10f..dccc68cbbe76 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	editres
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		tar:xz xorg xorg-cat:app
 USE_XORG=	x11 xt xmu xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
index 2d2e1d362383..2b67a9d08cbf 100644
--- a/x11/editres/pkg-plist
+++ b/x11/editres/pkg-plist
@@ -1,4 +1,4 @@
 bin/editres
-man/man1/editres.1.gz
+share/man/man1/editres.1.gz
 share/X11/app-defaults/Editres
 share/X11/app-defaults/Editres-color
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index ba36b51af320..f25b028e2e81 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	x11perf
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,4 +13,6 @@ USES=		cpe xorg xorg-cat:app
 USE_XORG=	x11 xmuu xrender xft xext
 CPE_VENDOR=	xfree86
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/x11perf/pkg-plist b/x11/x11perf/pkg-plist
index af9c9bc39732..20179b1a7890 100644
--- a/x11/x11perf/pkg-plist
+++ b/x11/x11perf/pkg-plist
@@ -4,6 +4,6 @@ lib/X11/x11perfcomp/fillblnk
 lib/X11/x11perfcomp/perfboth
 lib/X11/x11perfcomp/perfratio
 lib/X11/x11perfcomp/Xmark
-man/man1/Xmark.1.gz
-man/man1/x11perf.1.gz
-man/man1/x11perfcomp.1.gz
+share/man/man1/Xmark.1.gz
+share/man/man1/x11perf.1.gz
+share/man/man1/x11perfcomp.1.gz
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index e3643b1d313e..09df5a61be37 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xcalc
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -17,4 +18,6 @@ RUN_DEPENDS=	font-adobe-100dpi>=1.0.3:x11-fonts/font-adobe-100dpi \
 USES=		tar:xz xorg xorg-cat:app
 USE_XORG=	x11 xaw xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xcalc/pkg-plist b/x11/xcalc/pkg-plist
index 78f162291ece..bb358ddd21e7 100644
--- a/x11/xcalc/pkg-plist
+++ b/x11/xcalc/pkg-plist
@@ -1,4 +1,4 @@
 bin/xcalc
-man/man1/xcalc.1.gz
+share/man/man1/xcalc.1.gz
 share/X11/app-defaults/XCalc
 share/X11/app-defaults/XCalc-color
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 17d848ce1ec5..fa849e6f23e3 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xclipboard
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -11,4 +12,6 @@ LICENSE=	MIT
 USES=		xorg xorg-cat:app
 USE_XORG=	xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xclipboard/pkg-plist b/x11/xclipboard/pkg-plist
index 75729ee6da0c..e9585a694f8c 100644
--- a/x11/xclipboard/pkg-plist
+++ b/x11/xclipboard/pkg-plist
@@ -1,5 +1,5 @@
 bin/xclipboard
 bin/xcutsel
-man/man1/xclipboard.1.gz
-man/man1/xcutsel.1.gz
+share/man/man1/xclipboard.1.gz
+share/man/man1/xcutsel.1.gz
 share/X11/app-defaults/XClipboard
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index fa0ba65a2278..460286c24e52 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xconsole
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,4 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		tar:xz xorg xorg-cat:app
 USE_XORG=	x11 xaw xmu xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xconsole/pkg-plist b/x11/xconsole/pkg-plist
index 578b7590d8c9..9367fd5d4a77 100644
--- a/x11/xconsole/pkg-plist
+++ b/x11/xconsole/pkg-plist
@@ -1,3 +1,3 @@
 bin/xconsole
-man/man1/xconsole.1.gz
+share/man/man1/xconsole.1.gz
 share/X11/app-defaults/XConsole
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index 039ff9d336a0..9b1823f22d66 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xditview
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xmu xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xditview/pkg-plist b/x11/xditview/pkg-plist
index 7ea4350566e1..a1958ca5c350 100644
--- a/x11/xditview/pkg-plist
+++ b/x11/xditview/pkg-plist
@@ -1,6 +1,6 @@
 bin/xditview
 include/X11/bitmaps/ldblarrow
 include/X11/bitmaps/rdblarrow
-man/man1/xditview.1.gz
+share/man/man1/xditview.1.gz
 share/X11/app-defaults/Xditview
 share/X11/app-defaults/Xditview-chrtr
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index aae9cba17760..3d7b769afe3e 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xedit
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -13,4 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xmu xt xaw7
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist
index 7cfaa9293b5b..d4220c858386 100644
--- a/x11/xedit/pkg-plist
+++ b/x11/xedit/pkg-plist
@@ -19,6 +19,6 @@ lib/X11/xedit/lisp/lisp.lsp
 lib/X11/xedit/lisp/xedit.lsp
 lib/X11/xedit/lisp/syntax.lsp
 lib/X11/xedit/lisp/indent.lsp
-man/man1/xedit.1.gz
+share/man/man1/xedit.1.gz
 share/X11/app-defaults/Xedit-color
 share/X11/app-defaults/Xedit
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index 0e9eb566a4ad..831b293e1370 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfd
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,4 +17,6 @@ EXTRACT_SUFX=	.tar.xz
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xft xkbfile xmu xrender xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xfd/pkg-plist b/x11/xfd/pkg-plist
index 8b4f15307d5b..149955988d25 100644
--- a/x11/xfd/pkg-plist
+++ b/x11/xfd/pkg-plist
@@ -1,3 +1,3 @@
 bin/xfd
-man/man1/xfd.1.gz
+share/man/man1/xfd.1.gz
 share/X11/app-defaults/Xfd
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index f414de7c1d33..ffd4f4c5cfce 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xgc
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,4 +11,6 @@ LICENSE=	MIT
 USES=		xorg xorg-cat:app
 USE_XORG=	xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
index 5b1c54782e50..feee3a81c5c4 100644
--- a/x11/xgc/pkg-plist
+++ b/x11/xgc/pkg-plist
@@ -1,4 +1,4 @@
 bin/xgc
-man/man1/xgc.1.gz
+share/man/man1/xgc.1.gz
 share/X11/app-defaults/Xgc
 share/X11/app-defaults/Xgc-color
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index c000f82b0943..f4d6269e6cc4 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xinit
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -18,4 +19,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xinit/pkg-plist b/x11/xinit/pkg-plist
index 35e76c3ff750..24993551dfc2 100644
--- a/x11/xinit/pkg-plist
+++ b/x11/xinit/pkg-plist
@@ -1,5 +1,5 @@
 bin/startx
 bin/xinit
-man/man1/startx.1.gz
-man/man1/xinit.1.gz
+share/man/man1/startx.1.gz
+share/man/man1/xinit.1.gz
 etc/X11/xinit/xinitrc
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index a6b4cc759d2f..1dad1181eee9 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xkbutils
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +11,6 @@ LICENSE=	MIT
 USES=		xorg xorg-cat:app
 USE_XORG=	xkbfile x11 xaw xorgproto
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xkbutils/pkg-plist b/x11/xkbutils/pkg-plist
index 8606612d937f..c7d2e2021db2 100644
--- a/x11/xkbutils/pkg-plist
+++ b/x11/xkbutils/pkg-plist
@@ -1,6 +1,6 @@
 bin/xkbvleds
 bin/xkbwatch
 bin/xkbbell
-man/man1/xkbbell.1.gz
-man/man1/xkbvleds.1.gz
-man/man1/xkbwatch.1.gz
+share/man/man1/xkbbell.1.gz
+share/man/man1/xkbvleds.1.gz
+share/man/man1/xkbwatch.1.gz
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index ac4430e93dd9..57c2f196f26d 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xload
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xmu xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xload/pkg-plist b/x11/xload/pkg-plist
index ca50f84f08f0..011d81469415 100644
--- a/x11/xload/pkg-plist
+++ b/x11/xload/pkg-plist
@@ -1,3 +1,3 @@
 bin/xload
-man/man1/xload.1.gz
+share/man/man1/xload.1.gz
 share/X11/app-defaults/XLoad
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 5ad9b718b3c4..31ebec3220ee 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xlogo
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -18,4 +19,6 @@ XKB_DESC=		Use XKB to sound bells
 XKB_USE=		XORG=xkbfile
 XKB_CONFIGURE_WITH=	xkb
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xlogo/pkg-plist b/x11/xlogo/pkg-plist
index 7c93169f34be..9ac6b851c2ac 100644
--- a/x11/xlogo/pkg-plist
+++ b/x11/xlogo/pkg-plist
@@ -1,4 +1,4 @@
 bin/xlogo
-man/man1/xlogo.1.gz
+share/man/man1/xlogo.1.gz
 share/X11/app-defaults/XLogo
 share/X11/app-defaults/XLogo-color
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index b1adea009ed6..992bf0ca2dfb 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xmag
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,4 +11,6 @@ LICENSE=	MIT
 USES=		xorg xorg-cat:app
 USE_XORG=	xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xmag/pkg-plist b/x11/xmag/pkg-plist
index 4f7fead417b2..b3df9c117af3 100644
--- a/x11/xmag/pkg-plist
+++ b/x11/xmag/pkg-plist
@@ -1,3 +1,3 @@
 bin/xmag
-man/man1/xmag.1.gz
+share/man/man1/xmag.1.gz
 share/X11/app-defaults/Xmag
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index 619f24cf598e..04cf34538695 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xman
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,4 +12,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xman/pkg-plist b/x11/xman/pkg-plist
index 56727d778de7..b83b9d9972f8 100644
--- a/x11/xman/pkg-plist
+++ b/x11/xman/pkg-plist
@@ -1,4 +1,4 @@
 bin/xman
-man/man1/xman.1.gz
+share/man/man1/xman.1.gz
 share/X11/app-defaults/Xman
 share/X11/xman.help
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index 6c7abe72d1ac..9b70da8d9acd 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xmessage
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,4 +9,6 @@ COMMENT=	Display message or query in a X window
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xt xaw
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xmessage/pkg-plist b/x11/xmessage/pkg-plist
index 6d45bc566ce3..c10d93c28e71 100644
--- a/x11/xmessage/pkg-plist
+++ b/x11/xmessage/pkg-plist
@@ -1,4 +1,4 @@
 bin/xmessage
-man/man1/xmessage.1.gz
+share/man/man1/xmessage.1.gz
 share/X11/app-defaults/Xmessage
 share/X11/app-defaults/Xmessage-color
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 1d907b84f19c..d53724b3dfc2 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xmore
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,4 +11,6 @@ LICENSE=	MIT
 USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xt
 
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/x11/xmore/pkg-plist b/x11/xmore/pkg-plist
index 0f0281de215e..73e49c01cbe5 100644
--- a/x11/xmore/pkg-plist
+++ b/x11/xmore/pkg-plist
@@ -1,3 +1,3 @@
 bin/xmore
-man/man1/xmore.1.gz
+share/man/man1/xmore.1.gz
 share/X11/app-defaults/XMore