git: 20fa6b8f4122 - main - *: Move manpages to share/man

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sun, 28 Jan 2024 17:04:48 UTC
The branch main has been updated by arrowd:

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

commit 20fa6b8f412262d3a3ef15a8a548926f94b91810
Author:     Helge Oldach <freebsd@oldach.net>
AuthorDate: 2024-01-28 16:45:48 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-01-28 17:04:11 +0000

    *: Move manpages to share/man
    
    Approved by:    portmgr (blanket)
---
 audio/madplay/Makefile                    |   3 +-
 audio/madplay/pkg-plist                   |   4 +-
 converters/libutf-8/Makefile              |   3 +-
 converters/libutf-8/pkg-plist             |  10 +-
 converters/tuc/Makefile                   |   6 +-
 devel/rcs/Makefile                        |   3 +-
 devel/rcs/pkg-plist                       |  20 +--
 graphics/ppmcaption/Makefile              |   4 +-
 math/sc/Makefile                          |   3 +-
 math/sc/pkg-plist                         |   4 +-
 multimedia/rtmpdump/Makefile              |   5 +
 multimedia/rtmpdump/pkg-plist             |   4 +-
 net/arping/Makefile                       |   4 +-
 net/fping/Makefile                        |   5 +-
 net/fping/pkg-plist                       |   4 +-
 net/mtr/Makefile                          |   3 +-
 net/mtr/pkg-plist                         |   4 +-
 print/ghostscript10/Makefile              |   3 +-
 print/ghostscript10/pkg-plist             |  44 +++----
 print/mp-letter/Makefile                  |   3 +-
 print/mp-letter/files/patch-Makefile.dist |  20 +--
 print/mp-letter/pkg-plist                 |  18 +--
 print/qpdf/Makefile                       |   3 +-
 print/qpdf/pkg-plist                      |   6 +-
 sysutils/pwgen/Makefile                   |   4 +-
 sysutils/tarsnap/Makefile                 |   3 +-
 sysutils/tarsnap/pkg-plist                |  12 +-
 www/neon/Makefile                         |   3 +-
 www/neon/pkg-plist                        | 200 +++++++++++++++---------------
 x11-fonts/fonttosfnt/Makefile             |   5 +-
 x11/iceauth/Makefile                      |   6 +-
 x11/xorg-docs/Makefile                    |   2 +
 x11/xorg-docs/pkg-plist                   |  12 +-
 33 files changed, 232 insertions(+), 201 deletions(-)

diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index feb78782c07a..1ddbf6d4ed05 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	madplay
 PORTVERSION=	0.15.2b
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION} \
 		ftp://ftp.mars.org/pub/mpeg/
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libmad.so:audio/libmad \
 USES=		localbase
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--without-esd
 LDFLAGS+=	-lz
 ALL_TARGET=	all madtime
diff --git a/audio/madplay/pkg-plist b/audio/madplay/pkg-plist
index c6a93bbb50b1..bf5e1abcf1cb 100644
--- a/audio/madplay/pkg-plist
+++ b/audio/madplay/pkg-plist
@@ -1,8 +1,8 @@
 bin/abxtest
 bin/madplay
 bin/madtime
-man/man1/abxtest.1.gz
-man/man1/madplay.1.gz
+share/man/man1/abxtest.1.gz
+share/man/man1/madplay.1.gz
 %%NLS%%share/locale/en/LC_MESSAGES/madplay.mo
 %%NLS%%share/locale/es/LC_MESSAGES/madplay.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/madplay.mo
diff --git a/converters/libutf-8/Makefile b/converters/libutf-8/Makefile
index c9536bccf8c5..64b140d23567 100644
--- a/converters/libutf-8/Makefile
+++ b/converters/libutf-8/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libutf-8
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	converters
 MASTER_SITES=	http://www.whizkidtech.redprince.net/i18n/ \
@@ -15,6 +16,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libutf-8.so.1 ${STAGEDIR}${PREFIX}/lib
 	${LN} -fs ${PREFIX}/lib/libutf-8.so.1 ${STAGEDIR}${PREFIX}/lib/libutf-8.so
 	${INSTALL_DATA} ${WRKSRC}/utf-8.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 .include <bsd.port.mk>
diff --git a/converters/libutf-8/pkg-plist b/converters/libutf-8/pkg-plist
index a8fa1d2f07db..096695129a1c 100644
--- a/converters/libutf-8/pkg-plist
+++ b/converters/libutf-8/pkg-plist
@@ -1,8 +1,8 @@
 include/utf-8.h
 lib/libutf-8.so
 lib/libutf-8.so.1
-man/man3/fgetu8.3.gz
-man/man3/fputu8.3.gz
-man/man3/libutf-8.3.gz
-man/man3/sgetu8.3.gz
-man/man3/sputu8.3.gz
+share/man/man3/fgetu8.3.gz
+share/man/man3/fputu8.3.gz
+share/man/man3/libutf-8.3.gz
+share/man/man3/sgetu8.3.gz
+share/man/man3/sputu8.3.gz
diff --git a/converters/tuc/Makefile b/converters/tuc/Makefile
index 9278daf2509b..01528bc6c9b8 100644
--- a/converters/tuc/Makefile
+++ b/converters/tuc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tuc
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 
@@ -15,10 +15,10 @@ LICENSE_TEXT=	Author does not allow CD-ROM distribution
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 PLIST_FILES=	bin/tuc \
-		man/man1/tuc.1.gz
+		share/man/man1/tuc.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tuc ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 791e0619ee8b..f904018a7836 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rcs
 PORTVERSION=	5.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -12,6 +12,7 @@ LICENSE=	GPLv3
 
 USES=		tar:lz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFLICTS_INSTALL=	rcs57
 
diff --git a/devel/rcs/pkg-plist b/devel/rcs/pkg-plist
index a33aa1e477bf..e646ad551f42 100644
--- a/devel/rcs/pkg-plist
+++ b/devel/rcs/pkg-plist
@@ -7,13 +7,13 @@ bin/rcsclean
 bin/rcsdiff
 bin/rcsmerge
 bin/rlog
-man/man1/ci.1.gz
-man/man1/co.1.gz
-man/man1/ident.1.gz
-man/man1/merge.1.gz
-man/man1/rcs.1.gz
-man/man1/rcsclean.1.gz
-man/man1/rcsdiff.1.gz
-man/man1/rcsmerge.1.gz
-man/man1/rlog.1.gz
-man/man5/rcsfile.5.gz
+share/man/man1/ci.1.gz
+share/man/man1/co.1.gz
+share/man/man1/ident.1.gz
+share/man/man1/merge.1.gz
+share/man/man1/rcs.1.gz
+share/man/man1/rcsclean.1.gz
+share/man/man1/rcsdiff.1.gz
+share/man/man1/rcsmerge.1.gz
+share/man/man1/rlog.1.gz
+share/man/man5/rcsfile.5.gz
diff --git a/graphics/ppmcaption/Makefile b/graphics/ppmcaption/Makefile
index 6bf29b0c2ff3..91939dc05bed 100644
--- a/graphics/ppmcaption/Makefile
+++ b/graphics/ppmcaption/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ppmcaption
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.jwz.org/ppmcaption/
 
@@ -8,11 +9,12 @@ COMMENT=	Utility which adds text to images
 WWW=		https://www.jwz.org/ppmcaption/
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	CPP="${CPP}"
 CONFIGURE_ARGS=	--with-builtin="ncenB24.bdf -scale 0.5 -blur 5"
 MAKE_ARGS=	install_prefix=${STAGEDIR}
 
-PLIST_FILES=	bin/ppmcaption man/man1/ppmcaption.1.gz
+PLIST_FILES=	bin/ppmcaption share/man/man1/ppmcaption.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,-lang-c89,," ${WRKSRC}/configure
diff --git a/math/sc/Makefile b/math/sc/Makefile
index 2879dfd00585..9a80293c5707 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sc
 PORTVERSION=	7.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SUNSITE/apps/financial/spreadsheet
 
@@ -15,6 +15,7 @@ post-patch:
 		-e '/^CFLAGS=/s,=.*,=-DSYSV3 ${CFLAGS} -O0,' \
 		-e '/^LIBDIR=/s,=.*,=$${DESTDIR}${DATADIR},' \
 		-e '/^MANDIR=/s,=,=$${DESTDIR},' \
+		-e '/^MANDIR=/s,$${prefix},$${prefix}/share,' \
 		-e '/^EXDIR=/s,=.*,=$${DESTDIR}${PREFIX}/bin,' \
 		-e '/^YACC=/s,=.*,=${YACC},' \
 		-e '/usr.bin.crypt/s,^# *,,' \
diff --git a/math/sc/pkg-plist b/math/sc/pkg-plist
index f0c057fc9c8f..1bb8e78350e9 100644
--- a/math/sc/pkg-plist
+++ b/math/sc/pkg-plist
@@ -1,6 +1,6 @@
 bin/sc
 bin/scqref
 bin/psc
-man/man1/psc.1.gz
-man/man1/sc.1.gz
+share/man/man1/psc.1.gz
+share/man/man1/sc.1.gz
 %%DATADIR%%/tutorial.sc
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index f894a63a0565..90133a73daa2 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rtmpdump
 DISTVERSION=	2.4.20190330
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz?/
 
@@ -23,6 +24,10 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-c5f04a5
 
+post-patch:
+	${REINPLACE_CMD} -e '/^mandir=/s,$$(prefix),$$(prefix)/share,' \
+		${WRKSRC}/Makefile
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/multimedia/rtmpdump/pkg-plist b/multimedia/rtmpdump/pkg-plist
index b63677867627..4e4501cc367e 100644
--- a/multimedia/rtmpdump/pkg-plist
+++ b/multimedia/rtmpdump/pkg-plist
@@ -2,5 +2,5 @@ bin/rtmpdump
 sbin/rtmpgw
 sbin/rtmpsrv
 sbin/rtmpsuck
-man/man1/rtmpdump.1.gz
-man/man8/rtmpgw.8.gz
+share/man/man1/rtmpdump.1.gz
+share/man/man8/rtmpgw.8.gz
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 1ae18f25c31f..d2d9a45ee9b2 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	arping
 DISTVERSION=	2.24
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.habets.pp.se/synscan/files/
 
@@ -15,7 +16,8 @@ LIB_DEPENDS=	libnet.so:net/libnet
 USES=		localbase
 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PLIST_FILES=	include/arping.h man/man8/arping.8.gz sbin/arping
+PLIST_FILES=	include/arping.h sbin/arping share/man/man8/arping.8.gz
 
 .include <bsd.port.mk>
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 859f45d0fb36..56f4bcc6eed1 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fping
 PORTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://fping.org/dist/ \
 		https://github.com/schweikert/${PORTNAME}/releases/download/v${PORTVERSION}/
@@ -18,6 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 USES=		autoreconf
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	IPV6
@@ -26,6 +27,6 @@ IPV6_CONFIGURE_OFF=--disable-ipv6
 
 post-install-IPV6-on:
 	${RLN} ${STAGEDIR}${PREFIX}/sbin/fping  ${STAGEDIR}${PREFIX}/sbin/fping6
-	${RLN} ${STAGEDIR}${PREFIX}/man/man8/fping.8 ${STAGEDIR}${PREFIX}/man/man8/fping6.8
+	${RLN} ${STAGEDIR}${PREFIX}/share/man/man8/fping.8 ${STAGEDIR}${PREFIX}/share/man/man8/fping6.8
 
 .include <bsd.port.mk>
diff --git a/net/fping/pkg-plist b/net/fping/pkg-plist
index d1086d6437dd..e7fd9543fbbd 100644
--- a/net/fping/pkg-plist
+++ b/net/fping/pkg-plist
@@ -2,5 +2,5 @@
 sbin/fping
 %%IPV6%%sbin/fping6
 @mode
-man/man8/fping.8.gz
-%%IPV6%%man/man8/fping6.8.gz
+share/man/man8/fping.8.gz
+%%IPV6%%share/man/man8/fping6.8.gz
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index f2ff8eb177bb..30cd4dce735e 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mtr
 PORTVERSION=	0.95
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf ncurses pkgconfig
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 LDFLAGS+=	-lncurses
 
 GH_ACCOUNT=	traviscross
diff --git a/net/mtr/pkg-plist b/net/mtr/pkg-plist
index 4b0d7b258180..bad4c0e6a5e2 100644
--- a/net/mtr/pkg-plist
+++ b/net/mtr/pkg-plist
@@ -1,5 +1,5 @@
-man/man8/mtr-packet.8.gz
-man/man8/mtr.8.gz
+share/man/man8/mtr-packet.8.gz
+share/man/man8/mtr.8.gz
 sbin/mtr
 sbin/mtr-packet
 share/bash-completion/completions/mtr
diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile
index c38cf9069367..765f769e4a53 100644
--- a/print/ghostscript10/Makefile
+++ b/print/ghostscript10/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ghostscript
 DISTVERSION=	10.02.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${DISTVERSION:S/.//g}/
 PKGNAMESUFFIX=	${GS_MAJOR_VERSION}
@@ -48,6 +48,7 @@ EXTRACT_AFTER_ARGS=	--exclude cups/libs \
 			--exclude zlib
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
diff --git a/print/ghostscript10/pkg-plist b/print/ghostscript10/pkg-plist
index 3d3b080d9442..1d472e0c99ca 100644
--- a/print/ghostscript10/pkg-plist
+++ b/print/ghostscript10/pkg-plist
@@ -29,28 +29,28 @@ include/ghostscript/ierrors.h
 lib/libgs.so
 lib/libgs.so.%%GS_MAJOR_VERSION%%
 lib/libgs.so.%%GS_MAJOR_VERSION%%.%%GS_MINOR_VERSION%%
-man/man1/dvipdf.1.gz
-man/man1/eps2eps.1.gz
-man/man1/gs.1.gz
-man/man1/gsbj.1.gz
-man/man1/gsdj.1.gz
-man/man1/gsdj500.1.gz
-man/man1/gslj.1.gz
-man/man1/gslp.1.gz
-man/man1/gsnd.1.gz
-man/man1/pdf2dsc.1.gz
-man/man1/pdf2ps.1.gz
-man/man1/pf2afm.1.gz
-man/man1/pfbtopfa.1.gz
-man/man1/printafm.1.gz
-man/man1/ps2ascii.1.gz
-man/man1/ps2epsi.1.gz
-man/man1/ps2pdf.1.gz
-man/man1/ps2pdf12.1.gz
-man/man1/ps2pdf13.1.gz
-man/man1/ps2pdf14.1.gz
-man/man1/ps2pdfwr.1.gz
-man/man1/ps2ps.1.gz
+share/man/man1/dvipdf.1.gz
+share/man/man1/eps2eps.1.gz
+share/man/man1/gs.1.gz
+share/man/man1/gsbj.1.gz
+share/man/man1/gsdj.1.gz
+share/man/man1/gsdj500.1.gz
+share/man/man1/gslj.1.gz
+share/man/man1/gslp.1.gz
+share/man/man1/gsnd.1.gz
+share/man/man1/pdf2dsc.1.gz
+share/man/man1/pdf2ps.1.gz
+share/man/man1/pf2afm.1.gz
+share/man/man1/pfbtopfa.1.gz
+share/man/man1/printafm.1.gz
+share/man/man1/ps2ascii.1.gz
+share/man/man1/ps2epsi.1.gz
+share/man/man1/ps2pdf.1.gz
+share/man/man1/ps2pdf12.1.gz
+share/man/man1/ps2pdf13.1.gz
+share/man/man1/ps2pdf14.1.gz
+share/man/man1/ps2pdfwr.1.gz
+share/man/man1/ps2ps.1.gz
 share/cmap/Identity-H
 share/cmap/Identity-UTF16-H
 share/cmap/Identity-V
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index 38834aa49123..b82629e34d60 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mp-${PAPERSIZE}
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/obrien
 DISTNAME=	mp-3.0.1
@@ -21,7 +22,7 @@ MAKEFILE=	Makefile.dist
 
 post-install:
 .for a in ${LINKS}
-	${LN} -sf mp.1 ${STAGEDIR}${PREFIX}/man/man1/${a}.1
+	${LN} -sf mp.1 ${STAGEDIR}${PREFIX}/share/man/man1/${a}.1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/print/mp-letter/files/patch-Makefile.dist b/print/mp-letter/files/patch-Makefile.dist
index f6298dd4d17c..4c5509f8741c 100644
--- a/print/mp-letter/files/patch-Makefile.dist
+++ b/print/mp-letter/files/patch-Makefile.dist
@@ -1,6 +1,6 @@
---- Makefile.dist.orig	1993-08-01 20:28:21.000000000 +0000
-+++ Makefile.dist
-@@ -45,11 +45,14 @@ PROLOGUE = -DPROLOGUE=\"$(MPLIBDIR)\"
+--- Makefile.dist.orig	1993-08-01 22:28:21.000000000 +0200
++++ Makefile.dist	2024-01-28 16:11:09.205979000 +0100
+@@ -45,11 +45,15 @@
  #  Default locations where mp files will be installed.
  #  You might wish to alter these values.
  #
@@ -9,16 +9,18 @@
 +MPPATH     = $(PREFIX)
  MPBINDIR   = $(MPPATH)/bin
 -MPLIBDIR   = $(MPPATH)/lib
+-MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
+-MPMANSECT  = l
 +#MPLIBDIR   = $(MPPATH)/lib
 +MPLIBDIR   = $(MPPATH)/share/mp
- MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
--MPMANSECT  = l
++#MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
++MPMANDIR   = $(MPPATH)/share/man/man$(MPMANSECT)
 +#MPMANSECT  = l
 +MPMANSECT  = 1
  #---------------------------------------------------------------------
  #  Alternate names for the mailp frontend
  #
-@@ -58,11 +61,13 @@ MAILPNAMES = mailp newsp digestp filep f
+@@ -58,11 +62,13 @@
  #  Compilation flags and standard macro definitions.
  #
  CDEFS	 = $(GECOSFIELDS) $(GECOSLENGTH) $(PROLOGUE)
@@ -34,7 +36,7 @@
  #=================================================================
  
  .KEEPSTATE:
-@@ -95,7 +100,7 @@ mp:	$(OBJS) mp.man
+@@ -95,7 +101,7 @@
  SHELL = /bin/sh
  install-a4: common-install
  	   @echo "      Adjusting for A4 paper"
@@ -43,7 +45,7 @@
  		cp mp.common.ps /tmp/tmp-pro; \
  		sed < /tmp/tmp-pro > mp.common.ps \
  		   -e 's|^/fullwidth 8.5 inch def|/fullwidth 595 def|' \
-@@ -107,47 +112,19 @@ install:   common-install
+@@ -107,47 +113,19 @@
  	   @echo "**IMPORTANT NOTE**"
  	   @echo
  	   @echo "Mp is setup by default to work with US Letter sized paper."
@@ -99,7 +101,7 @@
  #
  #  NOTE: If you don't want the mailp, newsp, filep ... symbolic links
  #        installed, then you should comment out the following seven lines.
-@@ -155,8 +132,7 @@ common-install: $(BINARIES)
+@@ -155,8 +133,7 @@
  	   @echo Making mp links
  	   -@for name in $(MAILPNAMES); do \
  		echo -n $$name " "; \
diff --git a/print/mp-letter/pkg-plist b/print/mp-letter/pkg-plist
index 5c81333d4edf..cbdcd146518f 100644
--- a/print/mp-letter/pkg-plist
+++ b/print/mp-letter/pkg-plist
@@ -7,15 +7,15 @@ bin/mp
 bin/newsp
 bin/timemanp
 bin/timesysp
-man/man1/mp.1.gz
-man/man1/digestp.1.gz
-man/man1/filep.1.gz
-man/man1/filofaxp.1.gz
-man/man1/franklinp.1.gz
-man/man1/mailp.1.gz
-man/man1/newsp.1.gz
-man/man1/timemanp.1.gz
-man/man1/timesysp.1.gz
+share/man/man1/mp.1.gz
+share/man/man1/digestp.1.gz
+share/man/man1/filep.1.gz
+share/man/man1/filofaxp.1.gz
+share/man/man1/franklinp.1.gz
+share/man/man1/mailp.1.gz
+share/man/man1/newsp.1.gz
+share/man/man1/timemanp.1.gz
+share/man/man1/timesysp.1.gz
 share/mp/mp.common.ps
 share/mp/mp.pro.alt.ps
 share/mp/mp.pro.altl.ps
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index 0b0521027894..ba1de650c5a2 100644
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	qpdf
 DISTVERSION=	11.7.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -20,7 +21,7 @@ CMAKE_ARGS=	-DHAVE_EXTERN_LONG_TIMEZONE=0 \
 		-DBUILD_STATIC_LIBS=0 \
 		-DUSE_IMPLICIT_CRYPTO=0 \
 		-DALLOW_CRYPTO_NATIVE=0 \
-		-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
+		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_RADIO=		CRYPTO
diff --git a/print/qpdf/pkg-plist b/print/qpdf/pkg-plist
index bbaff795f5e1..bb30860beefe 100644
--- a/print/qpdf/pkg-plist
+++ b/print/qpdf/pkg-plist
@@ -77,9 +77,9 @@ lib/cmake/qpdf/libqpdfTargets.cmake
 lib/cmake/qpdf/qpdfConfig.cmake
 lib/cmake/qpdf/qpdfConfigVersion.cmake
 libdata/pkgconfig/libqpdf.pc
-man/man1/fix-qdf.1.gz
-man/man1/qpdf.1.gz
-man/man1/zlib-flate.1.gz
+share/man/man1/fix-qdf.1.gz
+share/man/man1/qpdf.1.gz
+share/man/man1/zlib-flate.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-doc.txt
 %%PORTDOCS%%%%DOCSDIR%%/examples/extend-c-api-impl.cc
 %%PORTDOCS%%%%DOCSDIR%%/examples/extend-c-api.c
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
index f4553f85426b..5ba9cce82077 100644
--- a/sysutils/pwgen/Makefile
+++ b/sysutils/pwgen/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pwgen
 PORTVERSION=	2.08
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
@@ -11,10 +12,11 @@ WWW=		https://sourceforge.net/projects/pwgen/
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USES=		cpe
 CPE_VENDOR=	pwgen_project
 
 PLIST_FILES=	bin/pwgen \
-		man/man1/pwgen.1.gz
+		share/man/man1/pwgen.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/tarsnap/Makefile b/sysutils/tarsnap/Makefile
index a8ac472d4c1f..2523d2e734d3 100644
--- a/sysutils/tarsnap/Makefile
+++ b/sysutils/tarsnap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tarsnap
 PORTVERSION=	1.0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tarsnap.com/download-http/
 DISTNAME=	${PORTNAME}-autoconf-${PORTVERSION}
@@ -13,6 +13,7 @@ LICENSE=	tarsnap
 LICENSE_NAME=	tarsnap
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
 		LDFLAGS="-L${OPENSSLLIB} ${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d/	\
diff --git a/sysutils/tarsnap/pkg-plist b/sysutils/tarsnap/pkg-plist
index 91db16919519..3eeceeade0f5 100644
--- a/sysutils/tarsnap/pkg-plist
+++ b/sysutils/tarsnap/pkg-plist
@@ -8,11 +8,11 @@ etc/bash_completion.d/tarsnap-keygen
 etc/bash_completion.d/tarsnap-keymgmt
 etc/bash_completion.d/tarsnap-keyregen
 etc/bash_completion.d/tarsnap-recrypt
-man/man1/tarsnap-keygen.1.gz
-man/man1/tarsnap-keymgmt.1.gz
-man/man1/tarsnap-keyregen.1.gz
-man/man1/tarsnap-recrypt.1.gz
-man/man1/tarsnap.1.gz
-man/man5/tarsnap.conf.5.gz
+share/man/man1/tarsnap-keygen.1.gz
+share/man/man1/tarsnap-keymgmt.1.gz
+share/man/man1/tarsnap-keyregen.1.gz
+share/man/man1/tarsnap-recrypt.1.gz
+share/man/man1/tarsnap.1.gz
+share/man/man5/tarsnap.conf.5.gz
 share/zsh/site-functions/_tarsnap
 @sample etc/tarsnap.conf.sample
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 1f78984c3853..cb792e888ee8 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	neon
 DISTVERSION=	0.32.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://notroj.github.io/neon/
 
@@ -16,6 +16,7 @@ CPE_VENDOR=	webdav
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 OPTIONS_DEFINE=		DOCS GSSAPI NLS PROXY
 OPTIONS_DEFAULT=	EXPAT GSSAPI OPENSSL
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index 841896c15f03..6414da8a0399 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -27,106 +27,106 @@ lib/libneon.so
 lib/libneon.so.27
 lib/libneon.so.27.5.5
 libdata/pkgconfig/neon.pc
-%%DOCS%%man/man1/neon-config.1.gz
-%%DOCS%%man/man3/ne_add_request_header.3.gz
-%%DOCS%%man/man3/ne_addr_destroy.3.gz
-%%DOCS%%man/man3/ne_addr_error.3.gz
-%%DOCS%%man/man3/ne_addr_first.3.gz
-%%DOCS%%man/man3/ne_addr_next.3.gz
-%%DOCS%%man/man3/ne_addr_resolve.3.gz
-%%DOCS%%man/man3/ne_addr_result.3.gz
-%%DOCS%%man/man3/ne_buffer.3.gz
-%%DOCS%%man/man3/ne_buffer_altered.3.gz
-%%DOCS%%man/man3/ne_buffer_append.3.gz
-%%DOCS%%man/man3/ne_buffer_clear.3.gz
-%%DOCS%%man/man3/ne_buffer_concat.3.gz
-%%DOCS%%man/man3/ne_buffer_create.3.gz
-%%DOCS%%man/man3/ne_buffer_destroy.3.gz
-%%DOCS%%man/man3/ne_buffer_finish.3.gz
-%%DOCS%%man/man3/ne_buffer_grow.3.gz
-%%DOCS%%man/man3/ne_buffer_ncreate.3.gz
-%%DOCS%%man/man3/ne_buffer_zappend.3.gz
-%%DOCS%%man/man3/ne_calloc.3.gz
-%%DOCS%%man/man3/ne_close_connection.3.gz
-%%DOCS%%man/man3/ne_forget_auth.3.gz
-%%DOCS%%man/man3/ne_get_error.3.gz
-%%DOCS%%man/man3/ne_get_request_flag.3.gz
-%%DOCS%%man/man3/ne_get_response_header.3.gz
-%%DOCS%%man/man3/ne_get_scheme.3.gz
-%%DOCS%%man/man3/ne_get_server_hostport.3.gz
-%%DOCS%%man/man3/ne_get_session_flag.3.gz
-%%DOCS%%man/man3/ne_get_status.3.gz
-%%DOCS%%man/man3/ne_has_support.3.gz
-%%DOCS%%man/man3/ne_i18n_init.3.gz
-%%DOCS%%man/man3/ne_iaddr_cmp.3.gz
-%%DOCS%%man/man3/ne_iaddr_free.3.gz
-%%DOCS%%man/man3/ne_iaddr_make.3.gz
-%%DOCS%%man/man3/ne_iaddr_parse.3.gz
-%%DOCS%%man/man3/ne_iaddr_print.3.gz
-%%DOCS%%man/man3/ne_iaddr_raw.3.gz
-%%DOCS%%man/man3/ne_iaddr_reverse.3.gz
-%%DOCS%%man/man3/ne_iaddr_typeof.3.gz
-%%DOCS%%man/man3/ne_malloc.3.gz
-%%DOCS%%man/man3/ne_oom_callback.3.gz
-%%DOCS%%man/man3/ne_print_request_header.3.gz
-%%DOCS%%man/man3/ne_qtoken.3.gz
-%%DOCS%%man/man3/ne_realloc.3.gz
-%%DOCS%%man/man3/ne_request_create.3.gz
-%%DOCS%%man/man3/ne_request_destroy.3.gz
-%%DOCS%%man/man3/ne_request_dispatch.3.gz
-%%DOCS%%man/man3/ne_response_header_iterate.3.gz
-%%DOCS%%man/man3/ne_session_create.3.gz
-%%DOCS%%man/man3/ne_session_destroy.3.gz
-%%DOCS%%man/man3/ne_session_proxy.3.gz
-%%DOCS%%man/man3/ne_session_socks_proxy.3.gz
-%%DOCS%%man/man3/ne_session_system_proxy.3.gz
-%%DOCS%%man/man3/ne_set_addrlist.3.gz
-%%DOCS%%man/man3/ne_set_connect_timeout.3.gz
-%%DOCS%%man/man3/ne_set_error.3.gz
-%%DOCS%%man/man3/ne_set_proxy_auth.3.gz
-%%DOCS%%man/man3/ne_set_read_timeout.3.gz
-%%DOCS%%man/man3/ne_set_request_body_buffer.3.gz
-%%DOCS%%man/man3/ne_set_request_body_fd.3.gz
-%%DOCS%%man/man3/ne_set_request_flag.3.gz
-%%DOCS%%man/man3/ne_set_server_auth.3.gz
-%%DOCS%%man/man3/ne_set_session_flag.3.gz
-%%DOCS%%man/man3/ne_set_useragent.3.gz
-%%DOCS%%man/man3/ne_shave.3.gz
-%%DOCS%%man/man3/ne_sock_exit.3.gz
-%%DOCS%%man/man3/ne_sock_init.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_cmp.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_export.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_free.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_identity.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_import.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_issuer.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_read.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_signedby.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_subject.3.gz
-%%DOCS%%man/man3/ne_ssl_cert_write.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_decrypt.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_encrypted.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_free.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_name.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_owner.3.gz
-%%DOCS%%man/man3/ne_ssl_clicert_read.3.gz
-%%DOCS%%man/man3/ne_ssl_dname_cmp.3.gz
-%%DOCS%%man/man3/ne_ssl_readable_dname.3.gz
-%%DOCS%%man/man3/ne_ssl_set_verify.3.gz
-%%DOCS%%man/man3/ne_ssl_trust_cert.3.gz
-%%DOCS%%man/man3/ne_ssl_trust_default_ca.3.gz
-%%DOCS%%man/man3/ne_status.3.gz
-%%DOCS%%man/man3/ne_strdup.3.gz
-%%DOCS%%man/man3/ne_strhash.3.gz
-%%DOCS%%man/man3/ne_strndup.3.gz
-%%DOCS%%man/man3/ne_strparam.3.gz
-%%DOCS%%man/man3/ne_vstrhash.3.gz
-%%DOCS%%man/man3/ne_token.3.gz
-%%DOCS%%man/man3/ne_version_match.3.gz
-%%DOCS%%man/man3/ne_version_string.3.gz
-%%DOCS%%man/man3/ne_xml_create.3.gz
-%%DOCS%%man/man3/ne_xml_destroy.3.gz
-%%DOCS%%man/man3/neon.3.gz
+%%DOCS%%share/man/man1/neon-config.1.gz
+%%DOCS%%share/man/man3/ne_add_request_header.3.gz
+%%DOCS%%share/man/man3/ne_addr_destroy.3.gz
+%%DOCS%%share/man/man3/ne_addr_error.3.gz
+%%DOCS%%share/man/man3/ne_addr_first.3.gz
+%%DOCS%%share/man/man3/ne_addr_next.3.gz
+%%DOCS%%share/man/man3/ne_addr_resolve.3.gz
+%%DOCS%%share/man/man3/ne_addr_result.3.gz
+%%DOCS%%share/man/man3/ne_buffer.3.gz
+%%DOCS%%share/man/man3/ne_buffer_altered.3.gz
+%%DOCS%%share/man/man3/ne_buffer_append.3.gz
+%%DOCS%%share/man/man3/ne_buffer_clear.3.gz
+%%DOCS%%share/man/man3/ne_buffer_concat.3.gz
+%%DOCS%%share/man/man3/ne_buffer_create.3.gz
+%%DOCS%%share/man/man3/ne_buffer_destroy.3.gz
+%%DOCS%%share/man/man3/ne_buffer_finish.3.gz
+%%DOCS%%share/man/man3/ne_buffer_grow.3.gz
+%%DOCS%%share/man/man3/ne_buffer_ncreate.3.gz
+%%DOCS%%share/man/man3/ne_buffer_zappend.3.gz
+%%DOCS%%share/man/man3/ne_calloc.3.gz
+%%DOCS%%share/man/man3/ne_close_connection.3.gz
+%%DOCS%%share/man/man3/ne_forget_auth.3.gz
+%%DOCS%%share/man/man3/ne_get_error.3.gz
+%%DOCS%%share/man/man3/ne_get_request_flag.3.gz
+%%DOCS%%share/man/man3/ne_get_response_header.3.gz
+%%DOCS%%share/man/man3/ne_get_scheme.3.gz
+%%DOCS%%share/man/man3/ne_get_server_hostport.3.gz
+%%DOCS%%share/man/man3/ne_get_session_flag.3.gz
+%%DOCS%%share/man/man3/ne_get_status.3.gz
+%%DOCS%%share/man/man3/ne_has_support.3.gz
+%%DOCS%%share/man/man3/ne_i18n_init.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_cmp.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_free.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_make.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_parse.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_print.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_raw.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_reverse.3.gz
+%%DOCS%%share/man/man3/ne_iaddr_typeof.3.gz
+%%DOCS%%share/man/man3/ne_malloc.3.gz
+%%DOCS%%share/man/man3/ne_oom_callback.3.gz
+%%DOCS%%share/man/man3/ne_print_request_header.3.gz
+%%DOCS%%share/man/man3/ne_qtoken.3.gz
+%%DOCS%%share/man/man3/ne_realloc.3.gz
+%%DOCS%%share/man/man3/ne_request_create.3.gz
+%%DOCS%%share/man/man3/ne_request_destroy.3.gz
+%%DOCS%%share/man/man3/ne_request_dispatch.3.gz
+%%DOCS%%share/man/man3/ne_response_header_iterate.3.gz
+%%DOCS%%share/man/man3/ne_session_create.3.gz
+%%DOCS%%share/man/man3/ne_session_destroy.3.gz
+%%DOCS%%share/man/man3/ne_session_proxy.3.gz
+%%DOCS%%share/man/man3/ne_session_socks_proxy.3.gz
+%%DOCS%%share/man/man3/ne_session_system_proxy.3.gz
+%%DOCS%%share/man/man3/ne_set_addrlist.3.gz
+%%DOCS%%share/man/man3/ne_set_connect_timeout.3.gz
+%%DOCS%%share/man/man3/ne_set_error.3.gz
+%%DOCS%%share/man/man3/ne_set_proxy_auth.3.gz
+%%DOCS%%share/man/man3/ne_set_read_timeout.3.gz
+%%DOCS%%share/man/man3/ne_set_request_body_buffer.3.gz
+%%DOCS%%share/man/man3/ne_set_request_body_fd.3.gz
+%%DOCS%%share/man/man3/ne_set_request_flag.3.gz
+%%DOCS%%share/man/man3/ne_set_server_auth.3.gz
+%%DOCS%%share/man/man3/ne_set_session_flag.3.gz
+%%DOCS%%share/man/man3/ne_set_useragent.3.gz
+%%DOCS%%share/man/man3/ne_shave.3.gz
+%%DOCS%%share/man/man3/ne_sock_exit.3.gz
+%%DOCS%%share/man/man3/ne_sock_init.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_cmp.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_export.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_free.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_identity.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_import.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_issuer.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_read.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_signedby.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_subject.3.gz
+%%DOCS%%share/man/man3/ne_ssl_cert_write.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_decrypt.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_encrypted.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_free.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_name.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_owner.3.gz
+%%DOCS%%share/man/man3/ne_ssl_clicert_read.3.gz
+%%DOCS%%share/man/man3/ne_ssl_dname_cmp.3.gz
+%%DOCS%%share/man/man3/ne_ssl_readable_dname.3.gz
+%%DOCS%%share/man/man3/ne_ssl_set_verify.3.gz
+%%DOCS%%share/man/man3/ne_ssl_trust_cert.3.gz
+%%DOCS%%share/man/man3/ne_ssl_trust_default_ca.3.gz
+%%DOCS%%share/man/man3/ne_status.3.gz
+%%DOCS%%share/man/man3/ne_strdup.3.gz
+%%DOCS%%share/man/man3/ne_strhash.3.gz
+%%DOCS%%share/man/man3/ne_strndup.3.gz
+%%DOCS%%share/man/man3/ne_strparam.3.gz
+%%DOCS%%share/man/man3/ne_vstrhash.3.gz
+%%DOCS%%share/man/man3/ne_token.3.gz
+%%DOCS%%share/man/man3/ne_version_match.3.gz
+%%DOCS%%share/man/man3/ne_version_string.3.gz
+%%DOCS%%share/man/man3/ne_xml_create.3.gz
+%%DOCS%%share/man/man3/ne_xml_destroy.3.gz
+%%DOCS%%share/man/man3/neon.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 83c06c02f68f..3d83977a7163 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	fonttosfnt
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,6 +15,8 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2
 USES=		xorg xorg-cat:app
 USE_XORG=	xorgproto fontenc
 
-PLIST_FILES=	bin/fonttosfnt man/man1/fonttosfnt.1.gz
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
+PLIST_FILES=	bin/fonttosfnt share/man/man1/fonttosfnt.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 75903d07c7b8..e3aac0f34e08 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	iceauth
 PORTVERSION=	1.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,6 +12,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		xorg xorg-cat:app
 USE_XORG=	xorgproto ice
 
-PLIST_FILES=	bin/iceauth man/man1/iceauth.1.gz
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
+PLIST_FILES=	bin/iceauth share/man/man1/iceauth.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
index 8e828134dcee..06bc7782194f 100644
--- a/x11/xorg-docs/Makefile
+++ b/x11/xorg-docs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xorg-docs
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -7,6 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org documentation files
 
 CONFIGURE_ARGS+=	--without-xmlto --without-fop --disable-specs
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 USES=		xorg-cat:doc
 
diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist
index 640c13b2aec2..52a8c1fdfdeb 100644
--- a/x11/xorg-docs/pkg-plist
+++ b/x11/xorg-docs/pkg-plist
@@ -1,9 +1,9 @@
-man/man7/X.7.gz
-man/man7/Standards.7.gz
-man/man7/XProjectTeam.7.gz
-man/man7/Consortium.7.gz
-man/man7/Xsecurity.7.gz
-man/man7/XOrgFoundation.7.gz
+share/man/man7/X.7.gz
+share/man/man7/Standards.7.gz
+share/man/man7/XProjectTeam.7.gz
+share/man/man7/Consortium.7.gz
+share/man/man7/Xsecurity.7.gz
+share/man/man7/XOrgFoundation.7.gz
 %%DOCSDIR%%/fonts/fonts.xml
 %%DOCSDIR%%/input/XKB-Config.xml
 %%DOCSDIR%%/input/XKB-Enhancing.xml