Exim is a drop-in replacement for sendmail. Since 4.1-RELEASE,

FreeBSD has shipped with mailwrapper(8), which facilitates the use of
drop-in replacements for sendmail.  Retire exim.sh in favour of the
mailwrapper(8) approach.

Requested by:	AMAKAWA Shuhei <sa264@cam.ac.uk>

9 files changed, 15 insertions, 60 deletions

diff --git a/mail/exim-devel/files/exim.sh b/mail/exim-devel/files/exim.sh
deleted file mode 100644
index 6e25c5a56d0..00000000000
--- a/mail/exim-devel/files/exim.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-args='-bd -q30m'
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
-	;;
-stop)
-	killall exim && echo -n ' exim'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/mail/exim-devel/pkg-message b/mail/exim-devel/pkg-message
index 4cd17b17362..710778898b6 100644
--- a/mail/exim-devel/pkg-message
+++ b/mail/exim-devel/pkg-message
@@ -9,7 +9,10 @@ as a comprehensive FAQ list, are available on the Exim web site:
 
 	http://www.exim.org/
 
-To activate Exim:
+To replace sendmail with Exim:
 
 1) Create exim/configure from exim/configure.default .
-2) Use the rc.d/exim/sh script to start the Exim daemon .
+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.
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
index 81a34967417..e5c97e42ac9 100644
--- a/mail/exim-devel/pkg-plist
+++ b/mail/exim-devel/pkg-plist
@@ -1,5 +1,4 @@
 etc/exim/configure.default
-etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
diff --git a/mail/exim-old/files/exim.sh b/mail/exim-old/files/exim.sh
deleted file mode 100644
index 6e25c5a56d0..00000000000
--- a/mail/exim-old/files/exim.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-args='-bd -q30m'
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
-	;;
-stop)
-	killall exim && echo -n ' exim'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/mail/exim-old/pkg-message b/mail/exim-old/pkg-message
index 4cd17b17362..710778898b6 100644
--- a/mail/exim-old/pkg-message
+++ b/mail/exim-old/pkg-message
@@ -9,7 +9,10 @@ as a comprehensive FAQ list, are available on the Exim web site:
 
 	http://www.exim.org/
 
-To activate Exim:
+To replace sendmail with Exim:
 
 1) Create exim/configure from exim/configure.default .
-2) Use the rc.d/exim/sh script to start the Exim daemon .
+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.
diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist
index 81a34967417..e5c97e42ac9 100644
--- a/mail/exim-old/pkg-plist
+++ b/mail/exim-old/pkg-plist
@@ -1,5 +1,4 @@
 etc/exim/configure.default
-etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
deleted file mode 100644
index 6e25c5a56d0..00000000000
--- a/mail/exim/files/exim.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-args='-bd -q30m'
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
-	;;
-stop)
-	killall exim && echo -n ' exim'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/mail/exim/pkg-message b/mail/exim/pkg-message
index 4cd17b17362..710778898b6 100644
--- a/mail/exim/pkg-message
+++ b/mail/exim/pkg-message
@@ -9,7 +9,10 @@ as a comprehensive FAQ list, are available on the Exim web site:
 
 	http://www.exim.org/
 
-To activate Exim:
+To replace sendmail with Exim:
 
 1) Create exim/configure from exim/configure.default .
-2) Use the rc.d/exim/sh script to start the Exim daemon .
+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.
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 81a34967417..e5c97e42ac9 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -1,5 +1,4 @@
 etc/exim/configure.default
-etc/rc.d/exim.sh
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info