10 files changed, 14 insertions, 121 deletions
diff --git a/net-mail/sendmail/Manifest b/net-mail/sendmail/Manifest
index 97d25765f0e7..b46334851684 100644
--- a/net-mail/sendmail/Manifest
+++ b/net-mail/sendmail/Manifest
@@ -1,9 +1,9 @@
-MD5 c849be7b2fd91aa94ffd18bb21e62127 sendmail-8.12.8.ebuild 5141
-MD5 3b086855bee301cc76638d52c3991dc8 sendmail-8.12.9-r2.ebuild 5354
-MD5 af8f4908ae353d2c62b644093ba9566b sendmail-8.12.9.ebuild 5141
-MD5 5a0f0fdac822a4f6762554bb3ebfa743 sendmail-8.12.9-r1.ebuild 5348
+MD5 d9643e58665e5eccc1136fbf5625af03 sendmail-8.12.8.ebuild 5141
+MD5 1cd7008752d0360ab5f889a2dbdf9f0c sendmail-8.12.9-r2.ebuild 5354
+MD5 2351fe7d3056270638ecc1fc8bf96db0 sendmail-8.12.9.ebuild 5141
+MD5 6e4fe3355ebac8db742ec587f1ecebd8 sendmail-8.12.9-r1.ebuild 5348
 MD5 9e657eae6ea2a99e97390fe1ee98cbd9 ChangeLog 5316
-MD5 f80fe977be431e8b85c42dd5f16b46f1 files/sendmail 606
+MD5 77fbd4fa5e8a30c449d829541c29939f files/sendmail 603
 MD5 0a63a2d919ba41dba080aeb57bb66841 files/digest-sendmail-8.12.8 68
 MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9 68
 MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9-r1 68
diff --git a/net-mail/sendmail/files/sendmail-r5 b/net-mail/sendmail/files/sendmail
index 4cc2d9da99e7..c66237456984 100644
--- a/net-mail/sendmail/files/sendmail-r5
+++ b/net-mail/sendmail/files/sendmail
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail-r5,v 1.3 2003/05/13 02:35:42 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail,v 1.8 2003/05/13 03:11:16 tberman Exp $
 
 depend() {
 	need net
diff --git a/net-mail/sendmail/files/sendmail-r1 b/net-mail/sendmail/files/sendmail-r1
deleted file mode 100644
index 98bfe2e789b7..000000000000
--- a/net-mail/sendmail/files/sendmail-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail-r1,v 1.3 2003/02/14 23:04:23 vapier Exp $
-
-. /etc/conf.d/sendmail
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting sendmail"
-	/usr/bin/newaliases > /dev/null 2>&1
-	(cd /var/spool/mqueue; rm -f xf*)
-	/usr/sbin/sendmail ${SENDMAIL_OPTS} > /dev/null 2>&1
-	/usr/sbin/sendmail ${CLIENTMQUEUE_OPTS} > /dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sendmail"
-	kill -9 `sed -n -e '1p' ${PIDFILE}`
-	kill -9 `sed -n -e '1p' ${CM_PIDFILE}`
-	eend $?
-}
diff --git a/net-mail/sendmail/files/sendmail-r2 b/net-mail/sendmail/files/sendmail-r2
deleted file mode 100644
index eea6860068d3..000000000000
--- a/net-mail/sendmail/files/sendmail-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail-r2,v 1.2 2003/02/14 23:04:29 vapier Exp $
-
-. /etc/conf.d/sendmail
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting sendmail"
-	/usr/bin/newaliases > /dev/null 2>&1
-	(cd /var/spool/mqueue; rm -f xf*)
-	/usr/sbin/sendmail ${SENDMAIL_OPTS} > /dev/null 2>&1
-	/usr/sbin/sendmail ${CLIENTMQUEUE_OPTS} > /dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sendmail"
-	kill -9 `sed -n -e '1p' ${PIDFILE}`
-	kill -9 `sed -n -e '1p' ${CM_PIDFILE}`
-	eend $?
-}
diff --git a/net-mail/sendmail/files/sendmail-r3 b/net-mail/sendmail/files/sendmail-r3
deleted file mode 100644
index d8e6285961ba..000000000000
--- a/net-mail/sendmail/files/sendmail-r3
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail-r3,v 1.2 2003/02/14 23:04:35 vapier Exp $
-
-. /etc/conf.d/sendmail
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting sendmail"
-	/usr/bin/newaliases > /dev/null 2>&1
-	(cd /var/spool/mqueue; rm -f xf*)
-	/usr/sbin/sendmail ${SENDMAIL_OPTS} > /dev/null 2>&1
-	/usr/sbin/sendmail ${CLIENTMQUEUE_OPTS} > /dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sendmail"
-	kill ${KILL_OPTS} `sed -n -e '1p' ${PIDFILE}`
-	kill ${KILL_OPTS} `sed -n -e '1p' ${CM_PIDFILE}`
-	eend $?
-}
diff --git a/net-mail/sendmail/files/sendmail-r4 b/net-mail/sendmail/files/sendmail-r4
deleted file mode 100644
index c1baab3c98eb..000000000000
--- a/net-mail/sendmail/files/sendmail-r4
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail-r4,v 1.2 2003/02/14 23:04:41 vapier Exp $
-
-. /etc/conf.d/sendmail
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting sendmail"
-	/usr/bin/newaliases > /dev/null 2>&1
-	(cd /var/spool/mqueue; rm -f xf*)
-	/usr/sbin/sendmail ${SENDMAIL_OPTS} > /dev/null 2>&1
-	/usr/sbin/sendmail ${CLIENTMQUEUE_OPTS} > /dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sendmail"
-	killall ${KILL_OPTS} /usr/sbin/sendmail
-	eend $?
-}
diff --git a/net-mail/sendmail/sendmail-8.12.8.ebuild b/net-mail/sendmail/sendmail-8.12.8.ebuild
index 2e20c2ea336c..6129df821ef6 100644
--- a/net-mail/sendmail/sendmail-8.12.8.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.8.ebuild,v 1.3 2003/05/11 17:53:17 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.8.ebuild,v 1.4 2003/05/13 03:11:16 tberman Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm"
 
@@ -155,5 +155,5 @@ KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
 
 EOF
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/sendmail-r5 sendmail
+	doexe ${FILESDIR}/sendmail
 }
diff --git a/net-mail/sendmail/sendmail-8.12.9-r1.ebuild b/net-mail/sendmail/sendmail-8.12.9-r1.ebuild
index 4628fdc523ac..cf71e1018ac5 100644
--- a/net-mail/sendmail/sendmail-8.12.9-r1.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r1.ebuild,v 1.2 2003/05/11 17:53:17 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r1.ebuild,v 1.3 2003/05/13 03:11:16 tberman Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm mbox"
 
@@ -165,5 +165,5 @@ KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
 
 EOF
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/sendmail-r5 sendmail
+	doexe ${FILESDIR}/sendmail
 }
diff --git a/net-mail/sendmail/sendmail-8.12.9-r2.ebuild b/net-mail/sendmail/sendmail-8.12.9-r2.ebuild
index 7b180df8f0ad..4f4c5fb6edf6 100644
--- a/net-mail/sendmail/sendmail-8.12.9-r2.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r2.ebuild,v 1.2 2003/05/11 17:53:17 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r2.ebuild,v 1.3 2003/05/13 03:11:16 tberman Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm mbox"
 
@@ -165,5 +165,5 @@ KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
 
 EOF
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/sendmail-r5 sendmail
+	doexe ${FILESDIR}/sendmail
 }
diff --git a/net-mail/sendmail/sendmail-8.12.9.ebuild b/net-mail/sendmail/sendmail-8.12.9.ebuild
index 353ff2a13cbf..0fcbe1e1abe7 100644
--- a/net-mail/sendmail/sendmail-8.12.9.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9.ebuild,v 1.3 2003/05/11 17:53:17 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9.ebuild,v 1.4 2003/05/13 03:11:16 tberman Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm"
 
@@ -155,5 +155,5 @@ KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
 
 EOF
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/sendmail-r5 sendmail
+	doexe ${FILESDIR}/sendmail
 }