Cope with -CURRENT's new tri-state sendmail_enable rc.conf(5) variable

by using an rc.d script to launch Exim, as was done before I took over
this port.

This seems to be the most popular approach, and is arguably the
simplest.  Folks like me who attach some aesthetic value to using rc(8)
and mailer.conf(8) to launch Exim at startup time should know enough to
blow away the rc.d script and do things any way they please.

For now, use two versions of the POST-INSTALL-NOTES, the only
difference being that the one given to -CURRENT users suggests setting
sendmail_enable to 'NONE', while the one for -STABLE users suggests
'NO'.

5 files changed, 80 insertions, 47 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index cc9229cc25ee..c64d70d9cc0f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -17,10 +17,6 @@ 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,
@@ -84,10 +80,20 @@ 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)
@@ -201,7 +207,8 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh.sample ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/exim
-	${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim
+	${INSTALL_DATA} ${PI_NOTES_FILE} \
+	    ${PREFIX}/share/doc/exim/POST-INSTALL-NOTES
 	${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 447d56e0b501..148fbf5613d9 100644
--- a/mail/exim/files/POST-INSTALL-NOTES
+++ b/mail/exim/files/POST-INSTALL-NOTES
@@ -22,19 +22,13 @@ In addition, a comprehensive FAQ list is available at:
 
     http://www.exim.org/
 
-To run Exim instead of sendmail on startup:
+To use Exim instead of sendmail:
 
 1) Create exim/configure from exim/configure.default .
 2) Stop the sendmail daemon.
-3) Adjust mailer.conf(5) and set 'sendmail_enable' and 'sendmail_flags'
-   as appropriate in rc.conf(5).
-4) Start exim with appropriate command-line options.
-
-However, if Exim is linked against 3rd-party libraries that are not in
-the standard library search path (such as MySQL), then it should be
-started with ${PREFIX}/etc/rc.d/exim.sh, after said library support is
-enabled through its own startup script.  Alternatively, you can add
-the library path of the problem package to ldconfig_paths in rc.conf(5).
+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:
 
diff --git a/mail/exim/files/POST-INSTALL-NOTES.latest b/mail/exim/files/POST-INSTALL-NOTES.latest
new file mode 100644
index 000000000000..148fbf5613d9
--- /dev/null
+++ b/mail/exim/files/POST-INSTALL-NOTES.latest
@@ -0,0 +1,37 @@
+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
+
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
new file mode 100644
index 000000000000..09e3e6ef9eb6
--- /dev/null
+++ b/mail/exim/files/exim.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $Id$
+#
+# Note that 'pidfile' may need to be changed if 'args' is altered; see
+# the description of the 'pid_file_path' Exim configuration option in
+# the Exim Specification.
+#
+args='-bd -q30m'
+pidfile='/var/run/exim.pid'
+
+case "$1" in
+start)
+        [ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim ${args} && \
+	    echo -n ' exim'
+        ;;
+stop)
+        kill `cat ${pidfile}` && echo -n ' exim'
+        ;;
+*)
+        echo "Usage: `basename $0` {start|stop}" >&2
+        exit 64
+        ;;
+esac
+
+exit 0
+
diff --git a/mail/exim/files/exim.sh.sample b/mail/exim/files/exim.sh.sample
deleted file mode 100644
index 4c2f53fe1c14..000000000000
--- a/mail/exim/files/exim.sh.sample
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# This script can be used as an alternative method of starting up Exim.
-# Most installations should simply edit /etc/mail/mailer.conf and then
-# allow the system startup scripts to start Exim as sendmail.
-#
-# However, if Exim is linked against 3rd-party libraries that are not in
-# the standard library search path (such as MySQL), then it should be
-# started here, after said library support is enabled through its own
-# startup script.  Alternatively, you can add the library path of the
-# problem package to ldconfig_paths in rc.conf(5).
-#
-# $Id$
-#
-args='-bd -q30m'
-
-case "$1" in
-start)
-        [ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' e
-xim'
-        ;;
-stop)
-        kill `cat /var/run/exim.pid` && echo -n ' exim'
-        ;;
-*)
-        echo "Usage: `basename $0` {start|stop}" >&2
-        exit 64
-        ;;
-esac
-
-exit 0
-