mail/qmail: Sanitize MANPREFIX

Approved by:    portmgr (blanket)

2 files changed, 60 insertions, 60 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index b9bc4105fb96..642becda86c9 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	${QMAIL_PORTNAME}
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	mail
 MASTER_SITES+=	QMAIL
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -784,7 +784,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e "s/void *main/int main/g" ${WRKSRC}/*.c
 	@${REINPLACE_CMD} -e "/int main/ s/argc, *argv/int argc, char **argv/" ${WRKSRC}/install.c
-	@${ECHO_CMD} "MANPATH ${MANPREFIX}/man" > ${WRKDIR}/qmail.conf
+	@${ECHO_CMD} "MANPATH ${PREFIX}/share/man" > ${WRKDIR}/qmail.conf
 
 do-configure:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
@@ -832,9 +832,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/qmailsend ${STAGEDIR}${PREFIX}/boot
 .endif
 .for i in 1 5 7 8
-	@${MKDIR} ${STAGEDIR}${PREFIX}/man/man$i
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man$i
 . for j in ${MMAN${i}}
-	${INSTALL_MAN} ${WRKSRC}/$j ${STAGEDIR}${PREFIX}/man/man${i}
+	${INSTALL_MAN} ${WRKSRC}/$j ${STAGEDIR}${PREFIX}/share/man/man${i}
 . endfor
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 71536d67a3cd..89529edfdad8 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -123,62 +123,62 @@ configure/ipmeprint
 %%LDAP%%@sample control/qmail-qmqpd.rules.sample
 %%LDAP%%@sample control/qmail-smtpd.rules.sample
 %%LDAP%%@sample control/signatures.sample
-man/man1/bouncesaying.1.gz
-man/man1/condredirect.1.gz
-man/man1/except.1.gz
-man/man1/forward.1.gz
-man/man1/maildir2mbox.1.gz
-man/man1/maildirmake.1.gz
-man/man1/maildirwatch.1.gz
-man/man1/mailsubj.1.gz
-man/man1/preline.1.gz
-man/man1/qbiff.1.gz
-man/man1/qreceipt.1.gz
-man/man1/tcp-env.1.gz
-man/man5/addresses.5.gz
-man/man5/dot-qmail.5.gz
-man/man5/envelopes.5.gz
-man/man5/maildir.5.gz
-man/man5/mbox.5.gz
-man/man5/qmail-control.5.gz
-man/man5/qmail-header.5.gz
-man/man5/qmail-log.5.gz
-man/man5/qmail-users.5.gz
-man/man5/tcp-environ.5.gz
-man/man7/forgeries.7.gz
-man/man7/qmail-limits.7.gz
-man/man7/qmail.7.gz
-man/man8/qmail-clean.8.gz
-man/man8/qmail-command.8.gz
-man/man8/qmail-getpw.8.gz
-man/man8/qmail-inject.8.gz
-man/man8/qmail-local.8.gz
-man/man8/qmail-lspawn.8.gz
-man/man8/qmail-newmrh.8.gz
-man/man8/qmail-newu.8.gz
-man/man8/qmail-pop3d.8.gz
-man/man8/qmail-popup.8.gz
-man/man8/qmail-pw2u.8.gz
-man/man8/qmail-qmqpc.8.gz
-man/man8/qmail-qmqpd.8.gz
-man/man8/qmail-qmtpd.8.gz
-man/man8/qmail-qread.8.gz
-man/man8/qmail-qstat.8.gz
-man/man8/qmail-queue.8.gz
-man/man8/qmail-remote.8.gz
-man/man8/qmail-rspawn.8.gz
-man/man8/qmail-send.8.gz
-man/man8/qmail-showctl.8.gz
-man/man8/qmail-smtpd.8.gz
-man/man8/qmail-start.8.gz
-man/man8/qmail-tcpok.8.gz
-man/man8/qmail-tcpto.8.gz
-man/man8/splogger.8.gz
-%%SPAMCONTROL%%man/man8/qmail-smtpam.8.gz
-%%SPAMCONTROL%%man/man8/qmail-badloadertypes.8.gz
-%%SPAMCONTROL%%man/man8/qmail-badmimetypes.8.gz
-%%SPAMCONTROL%%man/man8/qmail-mfrules.8.gz
-%%SPAMCONTROL%%man/man8/qmail-recipients.8.gz
+share/man/man1/bouncesaying.1.gz
+share/man/man1/condredirect.1.gz
+share/man/man1/except.1.gz
+share/man/man1/forward.1.gz
+share/man/man1/maildir2mbox.1.gz
+share/man/man1/maildirmake.1.gz
+share/man/man1/maildirwatch.1.gz
+share/man/man1/mailsubj.1.gz
+share/man/man1/preline.1.gz
+share/man/man1/qbiff.1.gz
+share/man/man1/qreceipt.1.gz
+share/man/man1/tcp-env.1.gz
+share/man/man5/addresses.5.gz
+share/man/man5/dot-qmail.5.gz
+share/man/man5/envelopes.5.gz
+share/man/man5/maildir.5.gz
+share/man/man5/mbox.5.gz
+share/man/man5/qmail-control.5.gz
+share/man/man5/qmail-header.5.gz
+share/man/man5/qmail-log.5.gz
+share/man/man5/qmail-users.5.gz
+share/man/man5/tcp-environ.5.gz
+share/man/man7/forgeries.7.gz
+share/man/man7/qmail-limits.7.gz
+share/man/man7/qmail.7.gz
+share/man/man8/qmail-clean.8.gz
+share/man/man8/qmail-command.8.gz
+share/man/man8/qmail-getpw.8.gz
+share/man/man8/qmail-inject.8.gz
+share/man/man8/qmail-local.8.gz
+share/man/man8/qmail-lspawn.8.gz
+share/man/man8/qmail-newmrh.8.gz
+share/man/man8/qmail-newu.8.gz
+share/man/man8/qmail-pop3d.8.gz
+share/man/man8/qmail-popup.8.gz
+share/man/man8/qmail-pw2u.8.gz
+share/man/man8/qmail-qmqpc.8.gz
+share/man/man8/qmail-qmqpd.8.gz
+share/man/man8/qmail-qmtpd.8.gz
+share/man/man8/qmail-qread.8.gz
+share/man/man8/qmail-qstat.8.gz
+share/man/man8/qmail-queue.8.gz
+share/man/man8/qmail-remote.8.gz
+share/man/man8/qmail-rspawn.8.gz
+share/man/man8/qmail-send.8.gz
+share/man/man8/qmail-showctl.8.gz
+share/man/man8/qmail-smtpd.8.gz
+share/man/man8/qmail-start.8.gz
+share/man/man8/qmail-tcpok.8.gz
+share/man/man8/qmail-tcpto.8.gz
+share/man/man8/splogger.8.gz
+%%SPAMCONTROL%%share/man/man8/qmail-smtpam.8.gz
+%%SPAMCONTROL%%share/man/man8/qmail-badloadertypes.8.gz
+%%SPAMCONTROL%%share/man/man8/qmail-badmimetypes.8.gz
+%%SPAMCONTROL%%share/man/man8/qmail-mfrules.8.gz
+%%SPAMCONTROL%%share/man/man8/qmail-recipients.8.gz
 scripts/enable-qmail
 scripts/mkaliasdir
 %%SPAMCONTROL%%scripts/qmail-alias2recipients