5 files changed, 2 insertions, 23 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 174a563f3a03..911325a964ed 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -396,15 +396,10 @@ EXTRA_PATCHES+=			${FILESDIR}/extra-patch-amd64
 DOCSDIR=	${PREFIX}/doc
 .endif
 
-.if ${OSVERSION} >= 900007
-SUB_LIST+=	MANPATH="@comment "
-. if defined(SLAVE_LDAP)
+.if defined(SLAVE_LDAP)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx-ldap
-. elif !defined(SLAVE_SPAMCONTROL)
+.elif !defined(SLAVE_SPAMCONTROL)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx
-. endif
-.else
-SUB_LIST+=	MANPATH=""
 .endif
 
 .if defined(SLAVE_TLS)
@@ -673,10 +668,6 @@ post-extract:
 # running a script) before PATCHFILES get applied.
 .if defined(SLAVE_SPAMCONTROL)
 pre-patch:
-.  if ${OSVERSION} < 900007
-# Prevent applying utmpx patch
-	@${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch
-.  endif
 	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
 		> ${WRKSRC}/conf-spamcontrol
diff --git a/mail/qmail/files/pkg-message-ldap.in b/mail/qmail/files/pkg-message-ldap.in
index 4ec5628ab251..30c83c7ffb86 100644
--- a/mail/qmail/files/pkg-message-ldap.in
+++ b/mail/qmail/files/pkg-message-ldap.in
@@ -1,8 +1,5 @@
 	ATTENTION:
 
-%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
-%%MANPATH%%or login.conf(5)).
-%%MANPATH%%
 Do not forget to read %%PREFIX%%/doc/QLDAPINSTALL. After all,
 this is NOT our old stock qmail. And, %%PREFIX%%/doc/ANTISPAM
 for some antispam control measures.
diff --git a/mail/qmail/files/pkg-message-mysql.in b/mail/qmail/files/pkg-message-mysql.in
index f93c92ea0ba4..a4c8eeeaa6b0 100644
--- a/mail/qmail/files/pkg-message-mysql.in
+++ b/mail/qmail/files/pkg-message-mysql.in
@@ -1,8 +1,5 @@
 	ATTENTION:
 
-%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
-%%MANPATH%%or login.conf(5)).
-%%MANPATH%%
 Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,
 this is NOT our old stock qmail.
 
diff --git a/mail/qmail/files/pkg-message-tls.in b/mail/qmail/files/pkg-message-tls.in
index d59be8dea289..f67bbb57c79c 100644
--- a/mail/qmail/files/pkg-message-tls.in
+++ b/mail/qmail/files/pkg-message-tls.in
@@ -1,8 +1,5 @@
 	ATTENTION:
 
-%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
-%%MANPATH%%or login.conf(5)).
-%%MANPATH%%
 Do not forget to read %%PREFIX%%/doc/TLS.readme. After all,
 this is NOT our old stock qmail.
 
diff --git a/mail/qmail/files/pkg-message.in b/mail/qmail/files/pkg-message.in
index d04a1554f839..d418350e543d 100644
--- a/mail/qmail/files/pkg-message.in
+++ b/mail/qmail/files/pkg-message.in
@@ -1,7 +1,4 @@
 	ATTENTION:
 
-%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
-%%MANPATH%%or login.conf(5)).
-%%MANPATH%%
 You can enable qmail as your default mailer executing:
 > %%PREFIX%%/scripts/enable-qmail