3 files changed, 12 insertions, 54 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9aff424c39e7..cb036e5fac46 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -17,6 +17,10 @@ MAINTAINER=	sheldonh@FreeBSD.org
 
 USE_BZIP2=	yes
 
+.if defined(NOPORTDOCS)
+PKGMESSAGE=	${FILESDIR}/POST-INSTALL-NOTES
+.endif
+
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
 # If WITH_EXIMON is defined, the eximon monitor, which requires X,
@@ -80,20 +84,10 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500033
-PI_NOTES_FILE=	${FILESDIR}/POST-INSTALL-NOTES
-.else
-PI_NOTES_FILE=	${FILESDIR}/POST-INSTALL-NOTES.latest
-.endif
-
 .if ${OSVERSION} < 400014
 WITHOUT_IPV6=	yes
 .endif
 
-.if defined(NOPORTDOCS)
-PKGMESSAGE=	${PI_NOTES_FILE}
-.endif
-
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},'
 
 .if !defined(WITHOUT_TLS)
@@ -207,8 +201,7 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/exim
-	${INSTALL_DATA} ${PI_NOTES_FILE} \
-	    ${PREFIX}/share/doc/exim/POST-INSTALL-NOTES
+	${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim
 	${INSTALL_DATA} ${WRKSRC}/doc/filter.txt ${PREFIX}/share/doc/exim
 	${INSTALL_DATA} ${WRKSRC}/doc/oview.txt ${PREFIX}/share/doc/exim
 	${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim
diff --git a/mail/exim/files/POST-INSTALL-NOTES b/mail/exim/files/POST-INSTALL-NOTES
index 148fbf5613d9..66b0a80a5c7a 100644
--- a/mail/exim/files/POST-INSTALL-NOTES
+++ b/mail/exim/files/POST-INSTALL-NOTES
@@ -24,11 +24,13 @@ In addition, a comprehensive FAQ list is available at:
 
 To use Exim instead of sendmail:
 
-1) Create exim/configure from exim/configure.default .
-2) Stop the sendmail daemon.
-3) Adjust mailer.conf(5) as appropriate.
-4) Set the 'sendmail_enable' rc.conf(5) variable to 'NO'.
-5) Start exim with '${PREFIX}/etc/rc.d/exim.sh start'.
+*) Create exim/configure from exim/configure.default .
+*) Clear the sendmail queue and stop the sendmail daemon.
+*) Adjust mailer.conf(5) as appropriate.
+*) Set the 'sendmail_enable' rc.conf(5) variable to 'NO'.
+*) Set the 'daily_status_include_submit_mailq' periodic.conf(5) variable
+   to 'NO'.
+*) Start exim with '${PREFIX}/etc/rc.d/exim.sh start'.
 
 You may also want to configure newsyslog(8) to rotate Exim log files:
 
diff --git a/mail/exim/files/POST-INSTALL-NOTES.latest b/mail/exim/files/POST-INSTALL-NOTES.latest
deleted file mode 100644
index 148fbf5613d9..000000000000
--- a/mail/exim/files/POST-INSTALL-NOTES.latest
+++ /dev/null
@@ -1,37 +0,0 @@
-The following documentation has been installed:
-
-    info 'Exim Overview'	-> Overview of Exim
-    info Exim			-> Exim Specification (User Guide)
-    info 'Exim Filtering'	-> Exim Filter Specification (for end-users)
-
-In addition, plain text versions of these documents have been installed
-as:
-
-    ${PREFIX}/share/doc/exim/oview.txt
-    ${PREFIX}/share/doc/exim/filter.txt
-    ${PREFIX}/share/doc/exim/spec.txt
-
-Postscript, PDF and HTML versions of these documents are available in
-the ports tree as:
-
-    ports/mail/exim-doc-postscript
-    ports/mail/exim-doc-pdf
-    ports/mail/exim-doc-html
-
-In addition, a comprehensive FAQ list is available at:
-
-    http://www.exim.org/
-
-To use Exim instead of sendmail:
-
-1) Create exim/configure from exim/configure.default .
-2) Stop the sendmail daemon.
-3) Adjust mailer.conf(5) as appropriate.
-4) Set the 'sendmail_enable' rc.conf(5) variable to 'NO'.
-5) Start exim with '${PREFIX}/etc/rc.d/exim.sh start'.
-
-You may also want to configure newsyslog(8) to rotate Exim log files:
-
-/var/log/exim/mainlog	mailnull:mail 640 7 * @T00 Z
-/var/log/exim/rejectlog	mailnull:mail 640 7 * @T00 Z
-