MANPREFIX: eleminate its usage and move man to share/man

30 files changed, 126 insertions, 119 deletions

diff --git a/mail/akpop3d/Makefile b/mail/akpop3d/Makefile
index 831792702ad9..4ca158fa12a3 100644
--- a/mail/akpop3d/Makefile
+++ b/mail/akpop3d/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	akpop3d
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://synflood.at/akpop3d/
 
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/akpop3d man/man8/akpop3d.8.gz
+PLIST_FILES=	bin/akpop3d share/man/man8/akpop3d.8.gz
 
 OPTIONS_DEFINE=		SSL
 OPTIONS_DEFAULT=	SSL
@@ -30,6 +31,6 @@ pre-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/akpop3d ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/akpop3d.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/akpop3d.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 0e750ef8afd7..a17063fa52eb 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	autorespond
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/devel/
 
@@ -9,7 +10,7 @@ PATCHFILES=	${DISTNAME}-conf-strcasestr.patch
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple autoresponder for qmail
 
-PLIST_FILES=	bin/autorespond man/man1/autorespond.1.gz
+PLIST_FILES=	bin/autorespond share/man/man1/autorespond.1.gz
 
 .if defined(WITHOUT_MDOC_MANPAGE)
 AR_MANPAGE=	${WRKSRC}/autorespond.1
@@ -24,6 +25,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${AR_MANPAGE} ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${AR_MANPAGE} ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index 9b42d23d8ab3..5efa1d93e61b 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bincimap
 PORTVERSION=	1.2.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}final
@@ -19,6 +19,7 @@ USE_CXXSTD=	c++14
 USE_RC_SUBR=	bincimapd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share/
 
 DOCS=		AUTHORS ChangeLog README doc/bincimap* \
 		doc/manual/bincimap-manual.ps
@@ -37,9 +38,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/bincimap.conf \
 		${STAGEDIR}${ETCDIR}/bincimap.conf.sample
 	cd ${WRKSRC}/man && ${INSTALL_MAN} bincimap-up.1 bincimapd.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/bincimap.conf.5 \
-		${STAGEDIR}${MANPREFIX}/man/man5
+		${STAGEDIR}${PREFIX}/share/man/man5
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist
index 7b5e6b516030..0c96ca6243db 100644
--- a/mail/bincimap/pkg-plist
+++ b/mail/bincimap/pkg-plist
@@ -1,9 +1,9 @@
 bin/bincimapd
 bin/bincimap-up
 @sample etc/bincimap/bincimap.conf.sample
-man/man1/bincimap-up.1.gz
-man/man1/bincimapd.1.gz
-man/man5/bincimap.conf.5.gz
+share/man/man1/bincimap-up.1.gz
+share/man/man1/bincimapd.1.gz
+share/man/man5/bincimap.conf.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/cvsmail/Makefile b/mail/cvsmail/Makefile
index a18a37108fa9..0fac551b8bab 100644
--- a/mail/cvsmail/Makefile
+++ b/mail/cvsmail/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cvsmail
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/pgollucci
 DISTNAME=	mailutils-${PORTVERSION}
@@ -9,10 +10,10 @@ COMMENT=	Small program to add cvsweb links to FreeBSD commit messages
 
 DIST_SUBDIR=	${PORTNAME}
 ALL_TARGET=	cvsmail
-PLIST_FILES=	bin/cvsmail man/man1/cvsmail.1.gz
+PLIST_FILES=	bin/cvsmail share/man/man1/cvsmail.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsmail ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cvsmail.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cvsmail.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index b6d7ecfb1747..551792cdd86b 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ezmlm-idx
 PORTVERSION=	7.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/ezmlm/archive/${PORTVERSION}/
 
@@ -78,7 +78,7 @@ post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS} ${EXTRACT_INCLUDE}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} -s -rdynamic ${EXTRACT_LIB}" > ${WRKSRC}/conf-ld
 .endif
-	@${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
+	@${ECHO_CMD} "${PREFIX}/share/man" > ${WRKSRC}/conf-man
 	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
 	@${REINPLACE_CMD} -e 's,/etc/ezmlm/,${PREFIX}/etc/ezmlm/,' \
 		${WRKSRC}/idx.h
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index bae1317aa9bd..93638eb4799b 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -603,42 +603,42 @@ etc/ezmlm/sv/text/unsub-confirm
 etc/ezmlm/sv/text/unsub-nop
 etc/ezmlm/sv/text/unsub-ok
 lib/ezmlm/sub-std.so
-man/man1/ezmlm-accept.1.gz
-man/man1/ezmlm-archive.1.gz
-man/man1/ezmlm-cgi.1.gz
-man/man1/ezmlm-check.1.gz
-man/man1/ezmlm-checksub.1.gz
-man/man1/ezmlm-clean.1.gz
-man/man1/ezmlm-confirm.1.gz
-man/man1/ezmlm-cron.1.gz
-man/man1/ezmlm-dispatch.1.gz
-man/man1/ezmlm-gate.1.gz
-man/man1/ezmlm-get.1.gz
-man/man1/ezmlm-glconf.1.gz
-man/man1/ezmlm-idx.1.gz
-man/man1/ezmlm-import.1.gz
-man/man1/ezmlm-issubn.1.gz
-man/man1/ezmlm-limit.1.gz
-man/man1/ezmlm-list.1.gz
-man/man1/ezmlm-make.1.gz
-man/man1/ezmlm-manage.1.gz
-man/man1/ezmlm-moderate.1.gz
-man/man1/ezmlm-reject.1.gz
-man/man1/ezmlm-request.1.gz
-man/man1/ezmlm-return.1.gz
-man/man1/ezmlm-rmtab.1.gz
-man/man1/ezmlm-send.1.gz
-man/man1/ezmlm-split.1.gz
-man/man1/ezmlm-store.1.gz
-man/man1/ezmlm-sub.1.gz
-man/man1/ezmlm-tstdig.1.gz
-man/man1/ezmlm-unsub.1.gz
-man/man1/ezmlm-warn.1.gz
-man/man1/ezmlm-weed.1.gz
-man/man5/ezmlm.5.gz
-man/man5/ezmlmglrc.5.gz
-man/man5/ezmlmrc.5.gz
-man/man5/ezmlmsubrc.5.gz
+share/man/man1/ezmlm-accept.1.gz
+share/man/man1/ezmlm-archive.1.gz
+share/man/man1/ezmlm-cgi.1.gz
+share/man/man1/ezmlm-check.1.gz
+share/man/man1/ezmlm-checksub.1.gz
+share/man/man1/ezmlm-clean.1.gz
+share/man/man1/ezmlm-confirm.1.gz
+share/man/man1/ezmlm-cron.1.gz
+share/man/man1/ezmlm-dispatch.1.gz
+share/man/man1/ezmlm-gate.1.gz
+share/man/man1/ezmlm-get.1.gz
+share/man/man1/ezmlm-glconf.1.gz
+share/man/man1/ezmlm-idx.1.gz
+share/man/man1/ezmlm-import.1.gz
+share/man/man1/ezmlm-issubn.1.gz
+share/man/man1/ezmlm-limit.1.gz
+share/man/man1/ezmlm-list.1.gz
+share/man/man1/ezmlm-make.1.gz
+share/man/man1/ezmlm-manage.1.gz
+share/man/man1/ezmlm-moderate.1.gz
+share/man/man1/ezmlm-reject.1.gz
+share/man/man1/ezmlm-request.1.gz
+share/man/man1/ezmlm-return.1.gz
+share/man/man1/ezmlm-rmtab.1.gz
+share/man/man1/ezmlm-send.1.gz
+share/man/man1/ezmlm-split.1.gz
+share/man/man1/ezmlm-store.1.gz
+share/man/man1/ezmlm-sub.1.gz
+share/man/man1/ezmlm-tstdig.1.gz
+share/man/man1/ezmlm-unsub.1.gz
+share/man/man1/ezmlm-warn.1.gz
+share/man/man1/ezmlm-weed.1.gz
+share/man/man5/ezmlm.5.gz
+share/man/man5/ezmlmglrc.5.gz
+share/man/man5/ezmlmrc.5.gz
+share/man/man5/ezmlmsubrc.5.gz
 %%MYSQL%%lib/ezmlm/sub-mysql.so
 %%PGSQL%%lib/ezmlm/sub-pgsql.so
 %%PORTDOCS%%%%DOCSDIR%%/BLURB
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 6d426b513c1d..0af9e77ac91c 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ezmlm
 PORTVERSION=	0.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.fu-berlin.de/unix/mail/qmail/ \
@@ -44,8 +44,8 @@ post-patch:
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \
-		${INSTALL_MAN} *.1 ${STAGEDIR}${MANPREFIX}/man/man1 && \
-		${INSTALL_MAN} *.5 ${STAGEDIR}${MANPREFIX}/man/man5
+		${INSTALL_MAN} *.1 ${STAGEDIR}${PREFIX}/share/man/man1 && \
+		${INSTALL_MAN} *.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/ezmlm/pkg-plist b/mail/ezmlm/pkg-plist
index a713e68b2987..670a60efd7aa 100644
--- a/mail/ezmlm/pkg-plist
+++ b/mail/ezmlm/pkg-plist
@@ -8,17 +8,17 @@ bin/ezmlm-sub
 bin/ezmlm-unsub
 bin/ezmlm-warn
 bin/ezmlm-weed
-man/man1/ezmlm-list.1.gz
-man/man1/ezmlm-make.1.gz
-man/man1/ezmlm-manage.1.gz
-man/man1/ezmlm-reject.1.gz
-man/man1/ezmlm-return.1.gz
-man/man1/ezmlm-send.1.gz
-man/man1/ezmlm-sub.1.gz
-man/man1/ezmlm-unsub.1.gz
-man/man1/ezmlm-warn.1.gz
-man/man1/ezmlm-weed.1.gz
-man/man5/ezmlm.5.gz
+share/man/man1/ezmlm-list.1.gz
+share/man/man1/ezmlm-make.1.gz
+share/man/man1/ezmlm-manage.1.gz
+share/man/man1/ezmlm-reject.1.gz
+share/man/man1/ezmlm-return.1.gz
+share/man/man1/ezmlm-send.1.gz
+share/man/man1/ezmlm-sub.1.gz
+share/man/man1/ezmlm-unsub.1.gz
+share/man/man1/ezmlm-warn.1.gz
+share/man/man1/ezmlm-weed.1.gz
+share/man/man5/ezmlm.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/BLURB
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 91b22d218182..79680ba91219 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gotmail
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail perl5
 MASTER_SITES=	SF
 
@@ -19,13 +19,13 @@ SHEBANG_FILES=	gotmail
 NO_ARCH=	yes
 
 PORTDOCS=	ChangeLog README sample.gotmailrc
-PLIST_FILES=	bin/gotmail man/man1/gotmail.1.gz
+PLIST_FILES=	bin/gotmail share/man/man1/gotmail.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
-		${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
+		${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index 7ef11dc48e46..e8dbda401c4d 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ifile
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	mail textproc
 MASTER_SITES=	http://people.csail.mit.edu/jrennie/ifile/
 
@@ -14,10 +15,10 @@ GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
 
 PLIST_FILES=	bin/ifile \
-		man/man1/ifile.1.gz
+		share/man/man1/ifile.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ifile ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ifile.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ifile.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/mdpop3d/Makefile b/mail/mdpop3d/Makefile
index 11528c2b76a4..7251e7a06a54 100644
--- a/mail/mdpop3d/Makefile
+++ b/mail/mdpop3d/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	mdpop3d
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.corpit.ru/home/mjt/mdpop3d/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple and small POP3 daemon implementation with Maildir support
 
-PLIST_FILES=	libexec/mdpop3d man/man8/mdpop3d.8.gz
+PLIST_FILES=	libexec/mdpop3d share/man/man8/mdpop3d.8.gz
 
 OPTIONS_DEFINE=	PAM APOP
 APOP_DESC=	Build with APOP command support (requires PAM)
@@ -31,6 +32,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/mdpop3d.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/mdpop3d.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 4aefde4f2e66..34dcf4f04c61 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	popa3d
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/
@@ -81,7 +82,7 @@ pre-install:
 do-install:
 	${INSTALL} ${COPY} -m 500 \
 	    ${WRKSRC}/popa3d ${STAGEDIR}${PREFIX}/libexec/popa3d
-	${INSTALL_MAN} ${WRKSRC}/popa3d.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/popa3d.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 .if ${PORT_OPTIONS:MSMTP_AFTER_POP3} && !defined(WITHOUT_POPAUTH_M4)
 	${MKDIR} ${STAGEDIR}${CFDIR}/hack
 	${INSTALL_DATA} ${FILESDIR}/popauth.m4 ${STAGEDIR}${CFDIR}/hack/
diff --git a/mail/popa3d/pkg-plist b/mail/popa3d/pkg-plist
index 8a2c3ec1bce5..ac2dfb4aeeff 100644
--- a/mail/popa3d/pkg-plist
+++ b/mail/popa3d/pkg-plist
@@ -1,5 +1,5 @@
 libexec/popa3d
-man/man8/popa3d.8.gz
+share/man/man8/popa3d.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/DESIGN
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%SMTP_AFTER_POP3%%%%PORTDOCS%%%%DOCSDIR%%/POPAUTH
diff --git a/mail/popcheck/Makefile b/mail/popcheck/Makefile
index b574e05d62f6..5836328b54f2 100644
--- a/mail/popcheck/Makefile
+++ b/mail/popcheck/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	popcheck
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ludd.luth.se/~staham/linux/programs/ \
 		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
@@ -12,10 +13,10 @@ WWW=		http://www.ludd.luth.se/~staham/linux/programs.html
 USES=		ncurses
 ALL_TARGET=	popcheck
 MAKE_ARGS=	LDFLAGS="${LDFLAGS} -lncurses"
-PLIST_FILES=	bin/popcheck man/man1/popcheck.1.gz
+PLIST_FILES=	bin/popcheck share/man/man1/popcheck.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/popcheck ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/popcheck.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/popcheck.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-logwatch/Makefile b/mail/postfix-logwatch/Makefile
index 4aa1f754cb85..3ff0a11e87be 100644
--- a/mail/postfix-logwatch/Makefile
+++ b/mail/postfix-logwatch/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	postfix-logwatch
 PORTVERSION=	1.40.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/logreporters/${PORTNAME}/release/${PORTVERSION}
 
@@ -28,7 +28,7 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
diff --git a/mail/postfix-logwatch/pkg-plist b/mail/postfix-logwatch/pkg-plist
index 60fba6cca7d2..a4ad55da7035 100644
--- a/mail/postfix-logwatch/pkg-plist
+++ b/mail/postfix-logwatch/pkg-plist
@@ -1,3 +1,3 @@
 @sample %%ETCDIR%%/postfix-logwatch.conf.sample
 bin/postfix-logwatch
-man/man1/postfix-logwatch.1.gz
+share/man/man1/postfix-logwatch.1.gz
diff --git a/mail/prepflog/Makefile b/mail/prepflog/Makefile
index 8c5c6af37034..349eb20d413f 100644
--- a/mail/prepflog/Makefile
+++ b/mail/prepflog/Makefile
@@ -16,12 +16,12 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	johnfawcett
 
 SHEBANG_FILES=	prepflog.pl
-PLIST_FILES=	bin/prepflog man/man1/prepflog.1.gz
+PLIST_FILES=	bin/prepflog share/man/man1/prepflog.1.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${LOCALBASE}/bin/pod2man ${WRKSRC}/prepflog.pl > \
-		${STAGEDIR}${MANPREFIX}/man/man1/prepflog.1
+		${STAGEDIR}${PREFIX}/share/man/man1/prepflog.1
 
 .include <bsd.port.mk>
diff --git a/mail/qconfirm/Makefile b/mail/qconfirm/Makefile
index 84c5f75a7222..a1b429c45fba 100644
--- a/mail/qconfirm/Makefile
+++ b/mail/qconfirm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qconfirm
 PORTVERSION=	0.14.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://smarden.org/qconfirm/
 
@@ -32,7 +32,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/qconfirm/pkg-plist b/mail/qconfirm/pkg-plist
index 91816ff09444..73cb50b1d114 100644
--- a/mail/qconfirm/pkg-plist
+++ b/mail/qconfirm/pkg-plist
@@ -9,17 +9,17 @@ bin/qconfirm-control
 bin/qconfirm-inject
 bin/qconfirm-notice
 bin/qconfirm-return
-man/man1/qconfirm.1.gz
-man/man1/qconfirm-accept.1.gz
-man/man1/qconfirm-cdb-check.1.gz
-man/man1/qconfirm-cdb-update.1.gz
-man/man1/qconfirm-check.1.gz
-man/man1/qconfirm-check-mid.1.gz
-man/man1/qconfirm-conf.1.gz
-man/man1/qconfirm-control.1.gz
-man/man1/qconfirm-inject.1.gz
-man/man1/qconfirm-notice.1.gz
-man/man1/qconfirm-return.1.gz
+share/man/man1/qconfirm.1.gz
+share/man/man1/qconfirm-accept.1.gz
+share/man/man1/qconfirm-cdb-check.1.gz
+share/man/man1/qconfirm-cdb-update.1.gz
+share/man/man1/qconfirm-check.1.gz
+share/man/man1/qconfirm-check-mid.1.gz
+share/man/man1/qconfirm-conf.1.gz
+share/man/man1/qconfirm-control.1.gz
+share/man/man1/qconfirm-inject.1.gz
+share/man/man1/qconfirm-notice.1.gz
+share/man/man1/qconfirm-return.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/benefits.html
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index 7ebf2bf164f0..32c25aab9958 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qmail-qfilter
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/
 
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-configure:
 	${ECHO_CMD} "${STAGEDIR}${PREFIX}/bin"	> ${WRKSRC}/conf-bin
-	${ECHO_CMD} "${STAGEDIR}${MANPREFIX}/man" > ${WRKSRC}/conf-man
+	${ECHO_CMD} "${STAGEDIR}${PREFIX}/share/man" > ${WRKSRC}/conf-man
 	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
 	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
diff --git a/mail/qmail-qfilter/pkg-plist b/mail/qmail-qfilter/pkg-plist
index de9cb75f99b2..e6b404867241 100644
--- a/mail/qmail-qfilter/pkg-plist
+++ b/mail/qmail-qfilter/pkg-plist
@@ -1,5 +1,5 @@
 bin/qmail-qfilter
-man/man1/qmail-qfilter.1.gz
+share/man/man1/qmail-qfilter.1.gz
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/block-long-dates
 %%EXAMPLESDIR%%/deny-filetypes
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index fba981f0bd3a..5d406d8f7f66 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	serialmail
 PORTVERSION=	0.75
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.gbnet.net/pub/qmail/ \
@@ -63,7 +63,7 @@ do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \
 		${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin && \
-		${INSTALL_MAN} ${MAN} ${STAGEDIR}${MANPREFIX}/man/man1
+		${INSTALL_MAN} ${MAN} ${STAGEDIR}${PREFIX}/share/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/serialmail/pkg-plist b/mail/serialmail/pkg-plist
index e5fd16c268cd..ac203857a698 100644
--- a/mail/serialmail/pkg-plist
+++ b/mail/serialmail/pkg-plist
@@ -5,10 +5,10 @@ bin/maildirsmtp
 bin/serialqmtp
 bin/serialsmtp
 bin/setlock
-man/man1/maildirqmtp.1.gz
-man/man1/maildirserial.1.gz
-man/man1/maildirsmtp.1.gz
-man/man1/serialqmtp.1.gz
-man/man1/serialsmtp.1.gz
-man/man1/setlock.1.gz
+share/man/man1/maildirqmtp.1.gz
+share/man/man1/maildirserial.1.gz
+share/man/man1/maildirsmtp.1.gz
+share/man/man1/serialqmtp.1.gz
+share/man/man1/serialsmtp.1.gz
+share/man/man1/setlock.1.gz
 %%UCSPI_SSL%%man/man1/maildirsmtps.1.gz
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 7f188b8ea069..2c7ad5b3de15 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	smtpfeed
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/smtpfeed/
 
@@ -17,7 +18,7 @@ SUB_FILES=	pkg-message
 PORTDOCS=	FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 		ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
 		RELEASE.NOTE SIGNAL SIGNAL.j TODO smtpfeed.html
-PLIST_FILES=	libexec/smtpfeed man/man8/smtpfeed.8.gz
+PLIST_FILES=	libexec/smtpfeed share/man/man8/smtpfeed.8.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -26,7 +27,7 @@ pre-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smtpfeed ${STAGEDIR}${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index ef89a8b88212..0e08bd7d3f9c 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sqlgrey
 PORTVERSION=	1.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.8%20%28stable%29
 
@@ -49,7 +49,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_config ${STAGEDIR}${PREFIX}/sbin
-	cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${STAGEDIR}${MANPREFIX}/man/man1/sqlgrey.1
+	cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${STAGEDIR}${PREFIX}/share/man/man1/sqlgrey.1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for i in ${ETCFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
diff --git a/mail/sqlgrey/pkg-plist b/mail/sqlgrey/pkg-plist
index b21253341c88..237b1c8fcc11 100644
--- a/mail/sqlgrey/pkg-plist
+++ b/mail/sqlgrey/pkg-plist
@@ -4,9 +4,6 @@ bin/sqlgrey-logstats.pl
 @sample %%ETCDIR%%/dyn_fqdn.regexp.sample
 @sample %%ETCDIR%%/smtp_server.regexp.sample
 @sample %%ETCDIR%%/sqlgrey.conf.sample
-man/man1/sqlgrey.1.gz
+share/man/man1/sqlgrey.1.gz
 sbin/sqlgrey
 sbin/update_sqlgrey_config
-@unexec echo "---> Please, remember to remove the database directory:"
-@unexec echo "     %%DATADIR%%"
-@unexec echo "     If you're only updating, you can leave the things as they are."
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index 3905f6c73aba..58335b0c6649 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tpop3d
 PORTVERSION=	1.5.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH
 
@@ -70,8 +70,8 @@ post-patch:
 do-install:
 	${INSTALL_DATA} ${FILESDIR}/tpop3d.conf.dist \
 		${STAGEDIR}${DEFAULT_CONFIG}
-	${INSTALL_MAN} ${WRKSRC}/tpop3d.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/tpop3d.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/tpop3d.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
+	${INSTALL_MAN} ${WRKSRC}/tpop3d.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/tpop3d ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/tpop3d/pkg-plist b/mail/tpop3d/pkg-plist
index c0c5b915382f..ca63ddabdcc3 100644
--- a/mail/tpop3d/pkg-plist
+++ b/mail/tpop3d/pkg-plist
@@ -1,4 +1,4 @@
 @sample etc/tpop3d.conf.sample
-man/man5/tpop3d.conf.5.gz
-man/man8/tpop3d.8.gz
+share/man/man5/tpop3d.conf.5.gz
+share/man/man8/tpop3d.8.gz
 sbin/tpop3d
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 4b13c6d8a92e..41fcec2b2e50 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -26,7 +26,8 @@ LDFLAGS+=	-L${OPENSSLLIB}
 MAKE_ENV=	DEBUG_CFLAGS="" DEBUG_LDFLAGS=""
 
 PLIST_FILES=	bin/wmmaiload bin/wmmaiload-config \
-		man/man1/wmmaiload.1.gz man/man1/wmmaiload-config.1.gz
+		share/man/man1/wmmaiload.1.gz \
+		share/man/man1/wmmaiload-config.1.gz
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -35,7 +36,7 @@ post-patch:
 do-install:
 .for i in wmmaiload wmmaiload-config
 	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>