git: 0ef221ab6292 - main - manprefix: move the manpages for the ports I maintain to share/man

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 24 Jan 2024 07:59:56 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ef221ab629234e3fc00d564cb25f81254b2d5ae

commit 0ef221ab629234e3fc00d564cb25f81254b2d5ae
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-24 07:58:45 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-24 07:59:53 +0000

    manprefix: move the manpages for the ports I maintain to share/man
---
 deskutils/i3lock/Makefile                    |   5 +-
 deskutils/xcbautolock/Makefile               |   5 +-
 graphics/pdfpc/Makefile                      |   2 -
 mail/abook/Makefile                          |   1 +
 mail/abook/pkg-plist                         |   4 +-
 mail/mlmmj/Makefile                          |   1 +
 mail/mlmmj/pkg-plist                         |  18 +--
 mail/neomutt/Makefile                        |   2 +-
 mail/neomutt/pkg-plist                       |  12 +-
 math/libxls/Makefile                         |   2 +
 math/libxls/pkg-plist                        |   2 +-
 math/libxlsxwriter/Makefile                  |   1 +
 net-mgmt/fence-agents/pkg-plist              | 162 ++++++++++++------------
 security/kickpass/Makefile                   |   4 +-
 security/kickpass/files/patch-CMakeLists.txt |  11 --
 security/libretls/Makefile                   |   2 +
 security/libretls/pkg-plist                  | 176 +++++++++++++--------------
 textproc/groff/Makefile                      |   3 +-
 textproc/groff/pkg-plist                     | 114 ++++++++---------
 textproc/libdiff/Makefile                    |   5 +-
 20 files changed, 267 insertions(+), 265 deletions(-)

diff --git a/deskutils/i3lock/Makefile b/deskutils/i3lock/Makefile
index 2518805b244b..6ba6ea7408bd 100644
--- a/deskutils/i3lock/Makefile
+++ b/deskutils/i3lock/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	i3lock
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils x11
 MASTER_SITES=	http://i3wm.org/${PORTNAME}/
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
 RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
 PLIST_FILES=	bin/i3lock \
-		man/man1/i3lock.1.gz \
+		share/man/man1/i3lock.1.gz \
 		etc/pam.d/i3lock
 
 USES=		gmake iconv localbase pkgconfig tar:bzip2 xorg
@@ -31,6 +31,7 @@ LDFLAGS+=	${ICONV_LIB}
 USE_XORG=	x11 xcb xt xorgproto xext
 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFLICTS_INSTALL=	i3lock-color
 
diff --git a/deskutils/xcbautolock/Makefile b/deskutils/xcbautolock/Makefile
index 6ce7eafe8fd3..2cb54d77e1bc 100644
--- a/deskutils/xcbautolock/Makefile
+++ b/deskutils/xcbautolock/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xcbautolock
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	deskutils x11
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -13,9 +14,11 @@ USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	bapt
 
+MAKE_ENV=	MANDIR=${PREFIX}/share/man/man1
+
 LIB_DEPENDS=	libxcb-screensaver.so:x11/libxcb
 
 PLIST_FILES=	bin/xcbautolock \
-		man/man1/xcbautolock.1.gz
+		share/man/man1/xcbautolock.1.gz
 
 .include <bsd.port.mk>
diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile
index 91767f1693a1..c940068be92c 100644
--- a/graphics/pdfpc/Makefile
+++ b/graphics/pdfpc/Makefile
@@ -27,8 +27,6 @@ USE_XORG=	x11
 
 USE_GITHUB=	yes
 
-CMAKE_ARGS=	-DMANDIR:STRING="man/"
-
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/pdfpcrc \
 		${STAGEDIR}${PREFIX}/etc/pdfpcrc.sample
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 580dd4017574..538c1e38c60f 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -12,6 +12,7 @@ LICENSE=	GPLv2
 
 USES=		ncurses readline gettext-tools autoreconf localbase
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PORTDOCS=	ANNOUNCE AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README \
 		THANKS TODO
diff --git a/mail/abook/pkg-plist b/mail/abook/pkg-plist
index bfedc8d21417..d54ecaa2f22b 100644
--- a/mail/abook/pkg-plist
+++ b/mail/abook/pkg-plist
@@ -1,6 +1,6 @@
 bin/abook
-man/man1/abook.1.gz
-man/man5/abookrc.5.gz
+share/man/man1/abook.1.gz
+share/man/man5/abookrc.5.gz
 %%NLS%%share/locale/de/LC_MESSAGES/abook.mo
 %%NLS%%share/locale/de/LC_TIME/abook.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/abook.mo
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index a482aa722344..3d7338842067 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -14,6 +14,7 @@ USES=		cpe gmake iconv shebangfix tar:xz pkgconfig
 SHEBANG_FILES=	contrib/web/perl-user/mlmmj.cgi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-receive-strip
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CPPFLAGS+=	-I${ICONV_INCLUDE_PATH}
 LDFLAGS+=	${ICONV_LIB_PATH}
diff --git a/mail/mlmmj/pkg-plist b/mail/mlmmj/pkg-plist
index 692e68d6435d..59a471c9181c 100644
--- a/mail/mlmmj/pkg-plist
+++ b/mail/mlmmj/pkg-plist
@@ -10,15 +10,15 @@ bin/mlmmj-receive-strip
 bin/mlmmj-send
 bin/mlmmj-sub
 bin/mlmmj-unsub
-man/man1/mlmmj-bounce.1.gz
-man/man1/mlmmj-list.1.gz
-man/man1/mlmmj-maintd.1.gz
-man/man1/mlmmj-make-ml.1.gz
-man/man1/mlmmj-process.1.gz
-man/man1/mlmmj-receive.1.gz
-man/man1/mlmmj-send.1.gz
-man/man1/mlmmj-sub.1.gz
-man/man1/mlmmj-unsub.1.gz
+share/man/man1/mlmmj-bounce.1.gz
+share/man/man1/mlmmj-list.1.gz
+share/man/man1/mlmmj-maintd.1.gz
+share/man/man1/mlmmj-make-ml.1.gz
+share/man/man1/mlmmj-process.1.gz
+share/man/man1/mlmmj-receive.1.gz
+share/man/man1/mlmmj-send.1.gz
+share/man/man1/mlmmj-sub.1.gz
+share/man/man1/mlmmj-unsub.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index eb9da355a9a6..4e6d2eb90fe6 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	neomutt
 PORTVERSION=	20231221
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -49,7 +50,6 @@ CONFIGURE_ARGS=	--with-ssl="${OPENSSLBASE}" \
 		--pcre2 \
 		--disable-idn \
 		--prefix=${PREFIX} \
-		--mandir=${PREFIX}/man \
 		${ICONV_CONFIGURE_ARGS}
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
 
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index 879d504a5157..09bac364aebd 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -1,12 +1,12 @@
 bin/neomutt
 libexec/neomutt/pgpewrap
 libexec/neomutt/smime_keys
-%%PORTDOCS%%man/man1/neomutt.1.gz
-%%PORTDOCS%%man/man1/pgpewrap_neomutt.1.gz
-%%PORTDOCS%%man/man1/smime_keys_neomutt.1.gz
-%%PORTDOCS%%man/man5/mbox_neomutt.5.gz
-%%PORTDOCS%%man/man5/mmdf_neomutt.5.gz
-%%PORTDOCS%%man/man5/neomuttrc.5.gz
+%%PORTDOCS%%share/man/man1/neomutt.1.gz
+%%PORTDOCS%%share/man/man1/pgpewrap_neomutt.1.gz
+%%PORTDOCS%%share/man/man1/smime_keys_neomutt.1.gz
+%%PORTDOCS%%share/man/man5/mbox_neomutt.5.gz
+%%PORTDOCS%%share/man/man5/mmdf_neomutt.5.gz
+%%PORTDOCS%%share/man/man5/neomuttrc.5.gz
 @sample etc/neomuttrc.dist etc/neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.md
 %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
diff --git a/math/libxls/Makefile b/math/libxls/Makefile
index 46b5cc343aea..b2a6503458f6 100644
--- a/math/libxls/Makefile
+++ b/math/libxls/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libxls
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -15,6 +16,7 @@ CPE_VENDOR=	${PORTNAME}_project
 CONFLICTS_INSTALL=	catdoc p5-Spreadsheet-Read xls2txt
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/man
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
diff --git a/math/libxls/pkg-plist b/math/libxls/pkg-plist
index dd53fb3d80b7..bc966718a988 100644
--- a/math/libxls/pkg-plist
+++ b/math/libxls/pkg-plist
@@ -12,4 +12,4 @@ lib/libxlsreader.so
 lib/libxlsreader.so.8
 lib/libxlsreader.so.8.0.2
 libdata/pkgconfig/libxls.pc
-man/man1/xls2csv.1.gz
+share/man/man1/xls2csv.1.gz
diff --git a/math/libxlsxwriter/Makefile b/math/libxlsxwriter/Makefile
index ae9e5d69e981..8907ebc9361e 100644
--- a/math/libxlsxwriter/Makefile
+++ b/math/libxlsxwriter/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libxlsxwriter
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 DISTVERSIONPREFIX=	RELEASE_
 CATEGORIES=	math devel
 
diff --git a/net-mgmt/fence-agents/pkg-plist b/net-mgmt/fence-agents/pkg-plist
index ba789371d6a9..d743eb6095a3 100644
--- a/net-mgmt/fence-agents/pkg-plist
+++ b/net-mgmt/fence-agents/pkg-plist
@@ -1,84 +1,84 @@
-%%MANPAGES%%man/man8/fence_ack_manual.8.gz
-%%MANPAGES%%man/man8/fence_aliyun.8.gz
-%%MANPAGES%%man/man8/fence_alom.8.gz
-%%MANPAGES%%man/man8/fence_amt.8.gz
-%%MANPAGES%%man/man8/fence_apc.8.gz
-%%MANPAGES%%man/man8/fence_apc_snmp.8.gz
-%%MANPAGES%%man/man8/fence_aws.8.gz
-%%MANPAGES%%man/man8/fence_azure_arm.8.gz
-%%MANPAGES%%man/man8/fence_bladecenter.8.gz
-%%MANPAGES%%man/man8/fence_brocade.8.gz
-%%MANPAGES%%man/man8/fence_cdu.8.gz
-%%MANPAGES%%man/man8/fence_cisco_mds.8.gz
-%%MANPAGES%%man/man8/fence_cisco_ucs.8.gz
-%%MANPAGES%%man/man8/fence_compute.8.gz
-%%MANPAGES%%man/man8/fence_crosslink.8.gz
-%%MANPAGES%%man/man8/fence_cyberpower_ssh.8.gz
-%%MANPAGES%%man/man8/fence_docker.8.gz
-%%MANPAGES%%man/man8/fence_drac.8.gz
-%%MANPAGES%%man/man8/fence_drac5.8.gz
-%%MANPAGES%%man/man8/fence_dummy.8.gz
-%%MANPAGES%%man/man8/fence_eaton_snmp.8.gz
-%%MANPAGES%%man/man8/fence_ecloud.8.gz
-%%MANPAGES%%man/man8/fence_emerson.8.gz
-%%MANPAGES%%man/man8/fence_eps.8.gz
-%%MANPAGES%%man/man8/fence_evacuate.8.gz
-%%MANPAGES%%man/man8/fence_gce.8.gz
-%%MANPAGES%%man/man8/fence_hds_cb.8.gz
-%%MANPAGES%%man/man8/fence_heuristics_ping.8.gz
-%%MANPAGES%%man/man8/fence_hpblade.8.gz
-%%MANPAGES%%man/man8/fence_ibm_powervs.8.gz
-%%MANPAGES%%man/man8/fence_ibm_vpc.8.gz
-%%MANPAGES%%man/man8/fence_ibmblade.8.gz
-%%MANPAGES%%man/man8/fence_ibmz.8.gz
-%%MANPAGES%%man/man8/fence_idrac.8.gz
-%%MANPAGES%%man/man8/fence_ifmib.8.gz
-%%MANPAGES%%man/man8/fence_ilo.8.gz
-%%MANPAGES%%man/man8/fence_ilo2.8.gz
-%%MANPAGES%%man/man8/fence_ilo3.8.gz
-%%MANPAGES%%man/man8/fence_ilo3_ssh.8.gz
-%%MANPAGES%%man/man8/fence_ilo4.8.gz
-%%MANPAGES%%man/man8/fence_ilo4_ssh.8.gz
-%%MANPAGES%%man/man8/fence_ilo5.8.gz
-%%MANPAGES%%man/man8/fence_ilo5_ssh.8.gz
-%%MANPAGES%%man/man8/fence_ilo_moonshot.8.gz
-%%MANPAGES%%man/man8/fence_ilo_mp.8.gz
-%%MANPAGES%%man/man8/fence_ilo_ssh.8.gz
-%%MANPAGES%%man/man8/fence_imm.8.gz
-%%MANPAGES%%man/man8/fence_intelmodular.8.gz
-%%MANPAGES%%man/man8/fence_ipdu.8.gz
-%%MANPAGES%%man/man8/fence_ipmilan.8.gz
-%%MANPAGES%%man/man8/fence_ipmilanplus.8.gz
-%%MANPAGES%%man/man8/fence_ironic.8.gz
-%%MANPAGES%%man/man8/fence_kubevirt.8.gz
-%%MANPAGES%%man/man8/fence_ldom.8.gz
-%%MANPAGES%%man/man8/fence_lindypdu.8.gz
-%%MANPAGES%%man/man8/fence_lpar.8.gz
-%%MANPAGES%%man/man8/fence_mpath.8.gz
-%%MANPAGES%%man/man8/fence_netio.8.gz
-%%MANPAGES%%man/man8/fence_openstack.8.gz
-%%MANPAGES%%man/man8/fence_powerman.8.gz
-%%MANPAGES%%man/man8/fence_pve.8.gz
-%%MANPAGES%%man/man8/fence_raritan.8.gz
-%%MANPAGES%%man/man8/fence_raritan_px3.8.gz
-%%MANPAGES%%man/man8/fence_rcd_serial.8.gz
-%%MANPAGES%%man/man8/fence_redfish.8.gz
-%%MANPAGES%%man/man8/fence_rhevm.8.gz
-%%MANPAGES%%man/man8/fence_rsa.8.gz
-%%MANPAGES%%man/man8/fence_rsb.8.gz
-%%MANPAGES%%man/man8/fence_sanbox2.8.gz
-%%MANPAGES%%man/man8/fence_sbd.8.gz
-%%MANPAGES%%man/man8/fence_scsi.8.gz
-%%MANPAGES%%man/man8/fence_skalar.8.gz
-%%MANPAGES%%man/man8/fence_tripplite_snmp.8.gz
-%%MANPAGES%%man/man8/fence_vbox.8.gz
-%%MANPAGES%%man/man8/fence_virsh.8.gz
-%%MANPAGES%%man/man8/fence_vmware.8.gz
-%%MANPAGES%%man/man8/fence_vmware_rest.8.gz
-%%MANPAGES%%man/man8/fence_vmware_vcloud.8.gz
-%%MANPAGES%%man/man8/fence_wti.8.gz
-%%MANPAGES%%man/man8/fence_xenapi.8.gz
-%%MANPAGES%%man/man8/fence_zvmip.8.gz
+%%MANPAGES%%share/man/man8/fence_ack_manual.8.gz
+%%MANPAGES%%share/man/man8/fence_aliyun.8.gz
+%%MANPAGES%%share/man/man8/fence_alom.8.gz
+%%MANPAGES%%share/man/man8/fence_amt.8.gz
+%%MANPAGES%%share/man/man8/fence_apc.8.gz
+%%MANPAGES%%share/man/man8/fence_apc_snmp.8.gz
+%%MANPAGES%%share/man/man8/fence_aws.8.gz
+%%MANPAGES%%share/man/man8/fence_azure_arm.8.gz
+%%MANPAGES%%share/man/man8/fence_bladecenter.8.gz
+%%MANPAGES%%share/man/man8/fence_brocade.8.gz
+%%MANPAGES%%share/man/man8/fence_cdu.8.gz
+%%MANPAGES%%share/man/man8/fence_cisco_mds.8.gz
+%%MANPAGES%%share/man/man8/fence_cisco_ucs.8.gz
+%%MANPAGES%%share/man/man8/fence_compute.8.gz
+%%MANPAGES%%share/man/man8/fence_crosslink.8.gz
+%%MANPAGES%%share/man/man8/fence_cyberpower_ssh.8.gz
+%%MANPAGES%%share/man/man8/fence_docker.8.gz
+%%MANPAGES%%share/man/man8/fence_drac.8.gz
+%%MANPAGES%%share/man/man8/fence_drac5.8.gz
+%%MANPAGES%%share/man/man8/fence_dummy.8.gz
+%%MANPAGES%%share/man/man8/fence_eaton_snmp.8.gz
+%%MANPAGES%%share/man/man8/fence_ecloud.8.gz
+%%MANPAGES%%share/man/man8/fence_emerson.8.gz
+%%MANPAGES%%share/man/man8/fence_eps.8.gz
+%%MANPAGES%%share/man/man8/fence_evacuate.8.gz
+%%MANPAGES%%share/man/man8/fence_gce.8.gz
+%%MANPAGES%%share/man/man8/fence_hds_cb.8.gz
+%%MANPAGES%%share/man/man8/fence_heuristics_ping.8.gz
+%%MANPAGES%%share/man/man8/fence_hpblade.8.gz
+%%MANPAGES%%share/man/man8/fence_ibm_powervs.8.gz
+%%MANPAGES%%share/man/man8/fence_ibm_vpc.8.gz
+%%MANPAGES%%share/man/man8/fence_ibmblade.8.gz
+%%MANPAGES%%share/man/man8/fence_ibmz.8.gz
+%%MANPAGES%%share/man/man8/fence_idrac.8.gz
+%%MANPAGES%%share/man/man8/fence_ifmib.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo2.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo3.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo3_ssh.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo4.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo4_ssh.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo5.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo5_ssh.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo_moonshot.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo_mp.8.gz
+%%MANPAGES%%share/man/man8/fence_ilo_ssh.8.gz
+%%MANPAGES%%share/man/man8/fence_imm.8.gz
+%%MANPAGES%%share/man/man8/fence_intelmodular.8.gz
+%%MANPAGES%%share/man/man8/fence_ipdu.8.gz
+%%MANPAGES%%share/man/man8/fence_ipmilan.8.gz
+%%MANPAGES%%share/man/man8/fence_ipmilanplus.8.gz
+%%MANPAGES%%share/man/man8/fence_ironic.8.gz
+%%MANPAGES%%share/man/man8/fence_kubevirt.8.gz
+%%MANPAGES%%share/man/man8/fence_ldom.8.gz
+%%MANPAGES%%share/man/man8/fence_lindypdu.8.gz
+%%MANPAGES%%share/man/man8/fence_lpar.8.gz
+%%MANPAGES%%share/man/man8/fence_mpath.8.gz
+%%MANPAGES%%share/man/man8/fence_netio.8.gz
+%%MANPAGES%%share/man/man8/fence_openstack.8.gz
+%%MANPAGES%%share/man/man8/fence_powerman.8.gz
+%%MANPAGES%%share/man/man8/fence_pve.8.gz
+%%MANPAGES%%share/man/man8/fence_raritan.8.gz
+%%MANPAGES%%share/man/man8/fence_raritan_px3.8.gz
+%%MANPAGES%%share/man/man8/fence_rcd_serial.8.gz
+%%MANPAGES%%share/man/man8/fence_redfish.8.gz
+%%MANPAGES%%share/man/man8/fence_rhevm.8.gz
+%%MANPAGES%%share/man/man8/fence_rsa.8.gz
+%%MANPAGES%%share/man/man8/fence_rsb.8.gz
+%%MANPAGES%%share/man/man8/fence_sanbox2.8.gz
+%%MANPAGES%%share/man/man8/fence_sbd.8.gz
+%%MANPAGES%%share/man/man8/fence_scsi.8.gz
+%%MANPAGES%%share/man/man8/fence_skalar.8.gz
+%%MANPAGES%%share/man/man8/fence_tripplite_snmp.8.gz
+%%MANPAGES%%share/man/man8/fence_vbox.8.gz
+%%MANPAGES%%share/man/man8/fence_virsh.8.gz
+%%MANPAGES%%share/man/man8/fence_vmware.8.gz
+%%MANPAGES%%share/man/man8/fence_vmware_rest.8.gz
+%%MANPAGES%%share/man/man8/fence_vmware_vcloud.8.gz
+%%MANPAGES%%share/man/man8/fence_wti.8.gz
+%%MANPAGES%%share/man/man8/fence_xenapi.8.gz
+%%MANPAGES%%share/man/man8/fence_zvmip.8.gz
 sbin/fence_ack_manual
 sbin/fence_aliyun
 sbin/fence_alom
diff --git a/security/kickpass/Makefile b/security/kickpass/Makefile
index eb6aad229334..ae654a52620a 100644
--- a/security/kickpass/Makefile
+++ b/security/kickpass/Makefile
@@ -16,12 +16,14 @@ BUILD_DEPENDS=	checkmk:devel/check
 
 USES=		cmake xorg
 USE_XORG=	x11
+# tries to append versioning and does crap if git is present
+BINARY_ALIAS=	git=false
 
 PLIST_FILES=	bin/kickpass \
 		lib/libkickpass.so \
 		lib/libkickpass.so.0 \
 		lib/libkickpass.so.0.2.0 \
-		man/man1/kickpass.1.gz \
+		share/man/man1/kickpass.1.gz \
 		share/zsh/site-functions/_kickpass
 
 USE_GITHUB=	yes
diff --git a/security/kickpass/files/patch-CMakeLists.txt b/security/kickpass/files/patch-CMakeLists.txt
deleted file mode 100644
index 2dbe07c7a889..000000000000
--- a/security/kickpass/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2017-05-10 08:40:22 UTC
-+++ CMakeLists.txt
-@@ -151,7 +151,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall 
- # Configure install
- 
- install(TARGETS kickpass libkickpass RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
--install(FILES manual/kickpass.1 DESTINATION share/man/man1/)
-+install(FILES manual/kickpass.1 DESTINATION man/man1/)
- install(FILES extra/completion/zsh/_kickpass DESTINATION share/zsh/site-functions/)
- 
- # Tests
diff --git a/security/libretls/Makefile b/security/libretls/Makefile
index d686037e5765..3d1db9c72cfe 100644
--- a/security/libretls/Makefile
+++ b/security/libretls/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libretls
 PORTVERSION=	3.8.1
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://causal.agency/libretls/
 
@@ -12,6 +13,7 @@ LICENSE=	ISCL
 USES=	libtool ssl pkgconfig
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 USE_LDCONFIG=	yes
 
diff --git a/security/libretls/pkg-plist b/security/libretls/pkg-plist
index 1e42e87b1f5b..ac276890a03c 100644
--- a/security/libretls/pkg-plist
+++ b/security/libretls/pkg-plist
@@ -4,91 +4,91 @@ lib/libtls.so
 lib/libtls.so.28
 lib/libtls.so.28.0.0
 libdata/pkgconfig/libtls.pc
-man/man3/tls_accept_cbs.3.gz
-man/man3/tls_accept_fds.3.gz
-man/man3/tls_accept_socket.3.gz
-man/man3/tls_client.3.gz
-man/man3/tls_close.3.gz
-man/man3/tls_config_add_keypair_file.3.gz
-man/man3/tls_config_add_keypair_mem.3.gz
-man/man3/tls_config_add_keypair_ocsp_file.3.gz
-man/man3/tls_config_add_keypair_ocsp_mem.3.gz
-man/man3/tls_config_add_ticket_key.3.gz
-man/man3/tls_config_clear_keys.3.gz
-man/man3/tls_config_error.3.gz
-man/man3/tls_config_free.3.gz
-man/man3/tls_config_insecure_noverifycert.3.gz
-man/man3/tls_config_insecure_noverifyname.3.gz
-man/man3/tls_config_insecure_noverifytime.3.gz
-man/man3/tls_config_new.3.gz
-man/man3/tls_config_ocsp_require_stapling.3.gz
-man/man3/tls_config_parse_protocols.3.gz
-man/man3/tls_config_prefer_ciphers_client.3.gz
-man/man3/tls_config_prefer_ciphers_server.3.gz
-man/man3/tls_config_set_alpn.3.gz
-man/man3/tls_config_set_ca_file.3.gz
-man/man3/tls_config_set_ca_mem.3.gz
-man/man3/tls_config_set_ca_path.3.gz
-man/man3/tls_config_set_cert_file.3.gz
-man/man3/tls_config_set_cert_mem.3.gz
-man/man3/tls_config_set_ciphers.3.gz
-man/man3/tls_config_set_crl_file.3.gz
-man/man3/tls_config_set_crl_mem.3.gz
-man/man3/tls_config_set_dheparams.3.gz
-man/man3/tls_config_set_ecdhecurves.3.gz
-man/man3/tls_config_set_key_file.3.gz
-man/man3/tls_config_set_key_mem.3.gz
-man/man3/tls_config_set_keypair_file.3.gz
-man/man3/tls_config_set_keypair_mem.3.gz
-man/man3/tls_config_set_keypair_ocsp_file.3.gz
-man/man3/tls_config_set_keypair_ocsp_mem.3.gz
-man/man3/tls_config_set_ocsp_staple_file.3.gz
-man/man3/tls_config_set_ocsp_staple_mem.3.gz
-man/man3/tls_config_set_protocols.3.gz
-man/man3/tls_config_set_session_fd.3.gz
-man/man3/tls_config_set_session_id.3.gz
-man/man3/tls_config_set_session_lifetime.3.gz
-man/man3/tls_config_set_verify_depth.3.gz
-man/man3/tls_config_verify.3.gz
-man/man3/tls_config_verify_client.3.gz
-man/man3/tls_config_verify_client_optional.3.gz
-man/man3/tls_configure.3.gz
-man/man3/tls_conn_alpn_selected.3.gz
-man/man3/tls_conn_cipher.3.gz
-man/man3/tls_conn_cipher_strength.3.gz
-man/man3/tls_conn_servername.3.gz
-man/man3/tls_conn_session_resumed.3.gz
-man/man3/tls_conn_version.3.gz
-man/man3/tls_connect.3.gz
-man/man3/tls_connect_cbs.3.gz
-man/man3/tls_connect_fds.3.gz
-man/man3/tls_connect_servername.3.gz
-man/man3/tls_connect_socket.3.gz
-man/man3/tls_default_ca_cert_file.3.gz
-man/man3/tls_error.3.gz
-man/man3/tls_free.3.gz
-man/man3/tls_handshake.3.gz
-man/man3/tls_init.3.gz
-man/man3/tls_load_file.3.gz
-man/man3/tls_ocsp_process_response.3.gz
-man/man3/tls_peer_cert_chain_pem.3.gz
-man/man3/tls_peer_cert_contains_name.3.gz
-man/man3/tls_peer_cert_hash.3.gz
-man/man3/tls_peer_cert_issuer.3.gz
-man/man3/tls_peer_cert_notafter.3.gz
-man/man3/tls_peer_cert_notbefore.3.gz
-man/man3/tls_peer_cert_provided.3.gz
-man/man3/tls_peer_cert_subject.3.gz
-man/man3/tls_peer_ocsp_cert_status.3.gz
-man/man3/tls_peer_ocsp_crl_reason.3.gz
-man/man3/tls_peer_ocsp_next_update.3.gz
-man/man3/tls_peer_ocsp_response_status.3.gz
-man/man3/tls_peer_ocsp_result.3.gz
-man/man3/tls_peer_ocsp_revocation_time.3.gz
-man/man3/tls_peer_ocsp_this_update.3.gz
-man/man3/tls_peer_ocsp_url.3.gz
-man/man3/tls_read.3.gz
-man/man3/tls_reset.3.gz
-man/man3/tls_server.3.gz
-man/man3/tls_unload_file.3.gz
-man/man3/tls_write.3.gz
+share/man/man3/tls_accept_cbs.3.gz
+share/man/man3/tls_accept_fds.3.gz
+share/man/man3/tls_accept_socket.3.gz
+share/man/man3/tls_client.3.gz
+share/man/man3/tls_close.3.gz
+share/man/man3/tls_config_add_keypair_file.3.gz
+share/man/man3/tls_config_add_keypair_mem.3.gz
+share/man/man3/tls_config_add_keypair_ocsp_file.3.gz
+share/man/man3/tls_config_add_keypair_ocsp_mem.3.gz
+share/man/man3/tls_config_add_ticket_key.3.gz
+share/man/man3/tls_config_clear_keys.3.gz
+share/man/man3/tls_config_error.3.gz
+share/man/man3/tls_config_free.3.gz
+share/man/man3/tls_config_insecure_noverifycert.3.gz
+share/man/man3/tls_config_insecure_noverifyname.3.gz
+share/man/man3/tls_config_insecure_noverifytime.3.gz
+share/man/man3/tls_config_new.3.gz
+share/man/man3/tls_config_ocsp_require_stapling.3.gz
+share/man/man3/tls_config_parse_protocols.3.gz
+share/man/man3/tls_config_prefer_ciphers_client.3.gz
+share/man/man3/tls_config_prefer_ciphers_server.3.gz
+share/man/man3/tls_config_set_alpn.3.gz
+share/man/man3/tls_config_set_ca_file.3.gz
+share/man/man3/tls_config_set_ca_mem.3.gz
+share/man/man3/tls_config_set_ca_path.3.gz
+share/man/man3/tls_config_set_cert_file.3.gz
+share/man/man3/tls_config_set_cert_mem.3.gz
+share/man/man3/tls_config_set_ciphers.3.gz
+share/man/man3/tls_config_set_crl_file.3.gz
+share/man/man3/tls_config_set_crl_mem.3.gz
+share/man/man3/tls_config_set_dheparams.3.gz
+share/man/man3/tls_config_set_ecdhecurves.3.gz
+share/man/man3/tls_config_set_key_file.3.gz
+share/man/man3/tls_config_set_key_mem.3.gz
+share/man/man3/tls_config_set_keypair_file.3.gz
+share/man/man3/tls_config_set_keypair_mem.3.gz
+share/man/man3/tls_config_set_keypair_ocsp_file.3.gz
+share/man/man3/tls_config_set_keypair_ocsp_mem.3.gz
+share/man/man3/tls_config_set_ocsp_staple_file.3.gz
+share/man/man3/tls_config_set_ocsp_staple_mem.3.gz
+share/man/man3/tls_config_set_protocols.3.gz
+share/man/man3/tls_config_set_session_fd.3.gz
+share/man/man3/tls_config_set_session_id.3.gz
+share/man/man3/tls_config_set_session_lifetime.3.gz
+share/man/man3/tls_config_set_verify_depth.3.gz
+share/man/man3/tls_config_verify.3.gz
+share/man/man3/tls_config_verify_client.3.gz
+share/man/man3/tls_config_verify_client_optional.3.gz
+share/man/man3/tls_configure.3.gz
+share/man/man3/tls_conn_alpn_selected.3.gz
+share/man/man3/tls_conn_cipher.3.gz
+share/man/man3/tls_conn_cipher_strength.3.gz
+share/man/man3/tls_conn_servername.3.gz
+share/man/man3/tls_conn_session_resumed.3.gz
+share/man/man3/tls_conn_version.3.gz
+share/man/man3/tls_connect.3.gz
+share/man/man3/tls_connect_cbs.3.gz
+share/man/man3/tls_connect_fds.3.gz
+share/man/man3/tls_connect_servername.3.gz
+share/man/man3/tls_connect_socket.3.gz
+share/man/man3/tls_default_ca_cert_file.3.gz
+share/man/man3/tls_error.3.gz
+share/man/man3/tls_free.3.gz
+share/man/man3/tls_handshake.3.gz
+share/man/man3/tls_init.3.gz
+share/man/man3/tls_load_file.3.gz
+share/man/man3/tls_ocsp_process_response.3.gz
+share/man/man3/tls_peer_cert_chain_pem.3.gz
+share/man/man3/tls_peer_cert_contains_name.3.gz
+share/man/man3/tls_peer_cert_hash.3.gz
+share/man/man3/tls_peer_cert_issuer.3.gz
+share/man/man3/tls_peer_cert_notafter.3.gz
+share/man/man3/tls_peer_cert_notbefore.3.gz
+share/man/man3/tls_peer_cert_provided.3.gz
+share/man/man3/tls_peer_cert_subject.3.gz
+share/man/man3/tls_peer_ocsp_cert_status.3.gz
+share/man/man3/tls_peer_ocsp_crl_reason.3.gz
+share/man/man3/tls_peer_ocsp_next_update.3.gz
+share/man/man3/tls_peer_ocsp_response_status.3.gz
+share/man/man3/tls_peer_ocsp_result.3.gz
+share/man/man3/tls_peer_ocsp_revocation_time.3.gz
+share/man/man3/tls_peer_ocsp_this_update.3.gz
+share/man/man3/tls_peer_ocsp_url.3.gz
+share/man/man3/tls_read.3.gz
+share/man/man3/tls_reset.3.gz
+share/man/man3/tls_server.3.gz
+share/man/man3/tls_unload_file.3.gz
+share/man/man3/tls_write.3.gz
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 0ebf5bd06f16..94b8c09a7a2b 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	groff
 PORTVERSION=	1.23.0
-PORTREVISION=   2
+PORTREVISION=   3
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -19,6 +19,7 @@ CPE_VENDOR=	gnu
 USE_CXXSTD=	gnu++98
 
 GNU_CONFIGURE=		yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk \
 			--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
 			--without-gs \
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index 44477588223d..e97ede36b2ac 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -37,63 +37,63 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
-man/man1/addftinfo.1.gz
-man/man1/afmtodit.1.gz
-man/man1/chem.1.gz
-man/man1/eqn.1.gz
-man/man1/eqn2graph.1.gz
-man/man1/gdiffmk.1.gz
-man/man1/glilypond.1.gz
-man/man1/gperl.1.gz
-man/man1/gpinyin.1.gz
-man/man1/grap2graph.1.gz
-man/man1/grn.1.gz
-man/man1/grodvi.1.gz
-man/man1/groff.1.gz
-man/man1/grog.1.gz
-man/man1/grohtml.1.gz
-man/man1/grolbp.1.gz
-man/man1/grolj4.1.gz
-man/man1/gropdf.1.gz
-man/man1/grops.1.gz
-man/man1/grotty.1.gz
-man/man1/hpftodit.1.gz
-man/man1/indxbib.1.gz
-man/man1/lkbib.1.gz
-man/man1/lookbib.1.gz
-man/man1/mmroff.1.gz
-man/man1/neqn.1.gz
-man/man1/nroff.1.gz
-man/man1/pdfmom.1.gz
-man/man1/pdfroff.1.gz
-man/man1/pfbtops.1.gz
-man/man1/pic.1.gz
-man/man1/pic2graph.1.gz
-man/man1/preconv.1.gz
-man/man1/refer.1.gz
-man/man1/soelim.1.gz
-man/man1/tbl.1.gz
-man/man1/tfmtodit.1.gz
-man/man1/troff.1.gz
-man/man5/groff_font.5.gz
-man/man5/groff_out.5.gz
-man/man5/groff_tmac.5.gz
-man/man7/groff.7.gz
-man/man7/groff_char.7.gz
-man/man7/groff_diff.7.gz
-man/man7/groff_hdtbl.7.gz
-man/man7/groff_man.7.gz
-man/man7/groff_man_style.7.gz
-man/man7/groff_mdoc.7.gz
-man/man7/groff_me.7.gz
-man/man7/groff_mm.7.gz
-man/man7/groff_mmse.7.gz
-man/man7/groff_mom.7.gz
-man/man7/groff_ms.7.gz
-man/man7/groff_rfc1345.7.gz
-man/man7/groff_trace.7.gz
-man/man7/groff_www.7.gz
-man/man7/roff.7.gz
+share/man/man1/addftinfo.1.gz
+share/man/man1/afmtodit.1.gz
+share/man/man1/chem.1.gz
+share/man/man1/eqn.1.gz
+share/man/man1/eqn2graph.1.gz
+share/man/man1/gdiffmk.1.gz
+share/man/man1/glilypond.1.gz
+share/man/man1/gperl.1.gz
+share/man/man1/gpinyin.1.gz
+share/man/man1/grap2graph.1.gz
+share/man/man1/grn.1.gz
+share/man/man1/grodvi.1.gz
+share/man/man1/groff.1.gz
+share/man/man1/grog.1.gz
+share/man/man1/grohtml.1.gz
+share/man/man1/grolbp.1.gz
+share/man/man1/grolj4.1.gz
+share/man/man1/gropdf.1.gz
+share/man/man1/grops.1.gz
+share/man/man1/grotty.1.gz
+share/man/man1/hpftodit.1.gz
+share/man/man1/indxbib.1.gz
+share/man/man1/lkbib.1.gz
+share/man/man1/lookbib.1.gz
+share/man/man1/mmroff.1.gz
+share/man/man1/neqn.1.gz
+share/man/man1/nroff.1.gz
+share/man/man1/pdfmom.1.gz
+share/man/man1/pdfroff.1.gz
+share/man/man1/pfbtops.1.gz
+share/man/man1/pic.1.gz
+share/man/man1/pic2graph.1.gz
+share/man/man1/preconv.1.gz
+share/man/man1/refer.1.gz
+share/man/man1/soelim.1.gz
+share/man/man1/tbl.1.gz
+share/man/man1/tfmtodit.1.gz
+share/man/man1/troff.1.gz
+share/man/man5/groff_font.5.gz
+share/man/man5/groff_out.5.gz
+share/man/man5/groff_tmac.5.gz
+share/man/man7/groff.7.gz
+share/man/man7/groff_char.7.gz
+share/man/man7/groff_diff.7.gz
+share/man/man7/groff_hdtbl.7.gz
+share/man/man7/groff_man.7.gz
+share/man/man7/groff_man_style.7.gz
+share/man/man7/groff_mdoc.7.gz
+share/man/man7/groff_me.7.gz
+share/man/man7/groff_mm.7.gz
+share/man/man7/groff_mmse.7.gz
+share/man/man7/groff_mom.7.gz
+share/man/man7/groff_ms.7.gz
+share/man/man7/groff_rfc1345.7.gz
+share/man/man7/groff_trace.7.gz
+share/man/man7/groff_www.7.gz
+share/man/man7/roff.7.gz
 %%EXAMPLESDIR%%/chem/122/README
 %%EXAMPLESDIR%%/chem/122/ch2a_ethyl.chem
 %%EXAMPLESDIR%%/chem/122/ch2b_benzene.chem
diff --git a/textproc/libdiff/Makefile b/textproc/libdiff/Makefile
index 4408d594bf1e..e9ae1bbc2ea8 100644
--- a/textproc/libdiff/Makefile
+++ b/textproc/libdiff/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libdiff
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://kristaps.bsd.lv/libdiff/snapshots/
 
@@ -11,8 +12,8 @@ LICENSE=	MIT
 
 PLIST_FILES=	lib/libdiff.a \
 		include/diff.h \
-		man/man3/diff.3.gz
+		share/man/man3/diff.3.gz
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	PREFIX="${PREFIX}"
+CONFIGURE_ARGS=	PREFIX="${PREFIX}" MANDIR="${PREFIX}/share/man"
 
 .include <bsd.port.mk>