13 files changed, 80 insertions, 91 deletions
diff --git a/net-mail/pop-before-smtp/files/pop-before-smtp.init b/net-mail/pop-before-smtp/files/pop-before-smtp.init
index 9010eba21dd9..c5475179fd29 100644
--- a/net-mail/pop-before-smtp/files/pop-before-smtp.init
+++ b/net-mail/pop-before-smtp/files/pop-before-smtp.init
@@ -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/pop-before-smtp/files/pop-before-smtp.init,v 1.1 2004/02/05 12:37:20 aliz Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/files/pop-before-smtp.init,v 1.2 2004/03/06 03:24:04 vapier Exp $
 
 opts="reload"
 
diff --git a/net-mail/sendmail/files/sendmail b/net-mail/sendmail/files/sendmail
index a3ff85bfad03..97e53c85b1e1 100644
--- a/net-mail/sendmail/files/sendmail
+++ 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,v 1.9 2003/07/25 23:28:58 mholzer Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/files/sendmail,v 1.10 2004/03/06 03:24:04 vapier Exp $
 
 depend() {
 	need net
diff --git a/net-mail/spamass-milter/files/spamass-milter.conf b/net-mail/spamass-milter/files/spamass-milter.conf
index d36316c7f866..5b9d487e4e81 100644
--- a/net-mail/spamass-milter/files/spamass-milter.conf
+++ b/net-mail/spamass-milter/files/spamass-milter.conf
@@ -1,10 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Config file for /etc/init.d/spamass-milter
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spamass-milter/files/spamass-milter.conf,v 1.1 2003/07/16 22:03:20 raker Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spamass-milter/files/spamass-milter.conf,v 1.2 2004/03/06 03:24:04 vapier Exp $
 
 DAEMON=/usr/sbin/spamass-milter
 SOCKET=/var/run/spamass-milter.sock
 PIDFILE=/var/run/spamass-milter.pid
 DESC="Sendmail milter plugin for SpamAssassin"
-
diff --git a/net-mail/spamass-milter/files/spamass-milter.rc b/net-mail/spamass-milter/files/spamass-milter.rc
index cbb51484e391..8e1fef68f269 100644
--- a/net-mail/spamass-milter/files/spamass-milter.rc
+++ b/net-mail/spamass-milter/files/spamass-milter.rc
@@ -1,37 +1,30 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Sample init script for Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spamass-milter/files/spamass-milter.rc,v 1.2 2004/01/19 02:59:31 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spamass-milter/files/spamass-milter.rc,v 1.3 2004/03/06 03:24:04 vapier Exp $
 
 # NB: Config is in /etc/conf.d/spamass-milter
-#DAEMON=/usr/sbin/spamass-milter
-#SOCKET=/var/run/spamass-milter.sock
-#PIDFILE=/var/run/spamass-milter.pid
-#DESC="Sendmail milter plugin for SpamAssassin"
 
 depend() {
-    need net spamd
-    use logger
-    before sendmail
+	need net spamd
+	use logger
+	before sendmail
 }
 
 start() {
-    ebegin "Starting $DESC"
-    start-stop-daemon --start --quiet --make-pidfile --pidfile ${PIDFILE}\
-    	--exec ${DAEMON} -- -p ${SOCKET} -f
-    eend $? "Failed to start ${DAEMON}"
+	ebegin "Starting $DESC"
+	start-stop-daemon --start --quiet --make-pidfile --pidfile ${PIDFILE}\
+		--exec ${DAEMON} -- -p ${SOCKET} -f
+	eend $? "Failed to start ${DAEMON}"
 }
 
 stop() {
-    ebegin "Stopping $DESC"
-    {
-	killall ${DAEMON}
-	/bin/sleep 5s
-	/bin/rm -f ${SOCKET}
-	/bin/rm -f ${PIDFILE}
-    } \
-    && kill -1 `head -n 1 /var/run/sendmail.pid`
-    eend $? "Failed to stop ${DAEMON}"
+	ebegin "Stopping $DESC"
+	{
+		killall ${DAEMON}
+		/bin/sleep 5s
+		/bin/rm -f ${SOCKET}
+		/bin/rm -f ${PIDFILE}
+	} && kill -1 `head -n 1 /var/run/sendmail.pid`
+	eend $? "Failed to stop ${DAEMON}"
 }
-
diff --git a/net-mail/spampd/files/init b/net-mail/spampd/files/init
index 10ed1f271697..e79fec4a1d95 100644
--- a/net-mail/spampd/files/init
+++ b/net-mail/spampd/files/init
@@ -1,6 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spampd/files/init,v 1.3 2004/03/06 03:24:04 vapier Exp $
 
 # Note: spampd configuration file is /etc/conf.d/spampd
 
diff --git a/net-mail/teapop/files/teapop-init b/net-mail/teapop/files/teapop-init
index 31b6facb17b5..c64188913a12 100644
--- a/net-mail/teapop/files/teapop-init
+++ b/net-mail/teapop/files/teapop-init
@@ -1,34 +1,34 @@
 #!/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/teapop/files/teapop-init,v 1.1 2003/08/10 15:20:48 iggy Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/teapop/files/teapop-init,v 1.2 2004/03/06 03:24:04 vapier Exp $
 
 depend() {
-        need net
-        use logger
-        after *
+	need net
+	use logger
+	after *
 }
 
 checkconfig() {
-        if [ ! -e /etc/teapop.passwd ] ; then
-                eerror "You need an /etc/teapop.passwd file to run teapop"
-                return 1
-        fi
+	if [ ! -e /etc/teapop.passwd ] ; then
+		eerror "You need an /etc/teapop.passwd file to run teapop"
+		return 1
+	fi
 }
 
 start() {
-        checkconfig || return 1
-        ebegin "Starting teapop"
-        start-stop-daemon --start --quiet \
-                --pidfile /var/run/teapop.pid --exec /usr/sbin/teapop -- ${TEAPOP_OPTS}
-        eend $?
+	checkconfig || return 1
+	ebegin "Starting teapop"
+	start-stop-daemon --start --quiet \
+		--pidfile /var/run/teapop.pid --exec /usr/sbin/teapop -- ${TEAPOP_OPTS}
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping teapop"
-        start-stop-daemon --stop --quiet \
-                --pidfile /var/run/teapop.pid --exec /usr/sbin/teapop
-        eend $?
+	ebegin "Stopping teapop"
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/teapop.pid --exec /usr/sbin/teapop
+	eend $?
 }
 
 restart() {
diff --git a/net-mail/vm-pop3d/files/vm-pop3d.rc3 b/net-mail/vm-pop3d/files/vm-pop3d.rc3
index c042118e1b94..6f7eb0150893 100644
--- a/net-mail/vm-pop3d/files/vm-pop3d.rc3
+++ b/net-mail/vm-pop3d/files/vm-pop3d.rc3
@@ -1,25 +1,23 @@
 #!/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/vm-pop3d/files/vm-pop3d.rc3,v 1.3 2003/02/14 23:04:55 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/files/vm-pop3d.rc3,v 1.4 2004/03/06 03:24:04 vapier Exp $
 
 SERVICE=vm-pop3d
 
 opts="start stop restart"
 
-
 start() {
-		ebegin "Starting $SERVICE..."
-     		/usr/sbin/vm-pop3d $OPTS
+	ebegin "Starting $SERVICE"
+	/usr/sbin/vm-pop3d $OPTS
 }
 
 stop() {
-		ebegin "Stopping $SERVICE..."
-		killall -15 /usr/sbin/vm-pop3d
+	ebegin "Stopping $SERVICE"
+	killall -15 /usr/sbin/vm-pop3d
 }
 
 restart() {
-		stop
-		start
+	stop
+	start
 }
-
diff --git a/net-mail/vpopmail/files/vpopmail.conf b/net-mail/vpopmail/files/vpopmail.conf
index 86353a1ed0b7..810244dcd19f 100644
--- a/net-mail/vpopmail/files/vpopmail.conf
+++ b/net-mail/vpopmail/files/vpopmail.conf
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nicholas Jones <carpaski@gentoo.org>
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/files/vpopmail.conf,v 1.2 2004/03/06 03:24:04 vapier Exp $
 
 # Spaces and tabs are fine. Just don't use them
 # In the password or usernames
@@ -12,4 +12,3 @@ MYSQL_UPDATE_PASSWD	secret
 MYSQL_READ_SERVER	localhost
 MYSQL_READ_USER		vpopmail
 MYSQL_READ_PASSWD	secret
-
diff --git a/net-mail/xmail/files/xmail.initd b/net-mail/xmail/files/xmail.initd
index 6b475a9954bc..38592e826516 100644
--- a/net-mail/xmail/files/xmail.initd
+++ b/net-mail/xmail/files/xmail.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmail.initd,v 1.4 2003/12/14 23:09:41 spider Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmail.initd,v 1.5 2004/03/06 03:24:16 vapier Exp $
 
 depend() {
 	need net logger
diff --git a/net-misc/asterisk/files/0.5.0/asterisk.confd b/net-misc/asterisk/files/0.5.0/asterisk.confd
index 652ba89b45c4..30b42435f797 100644
--- a/net-misc/asterisk/files/0.5.0/asterisk.confd
+++ b/net-misc/asterisk/files/0.5.0/asterisk.confd
@@ -1,10 +1,10 @@
-# 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-misc/asterisk/files/0.5.0/asterisk.confd,v 1.1 2004/01/04 00:25:22 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/0.5.0/asterisk.confd,v 1.2 2004/03/06 03:27:48 vapier Exp $
 
 #
 # see "asterisk -h" for a list of options
-# 
+#
 #
 
 #OPTIONS=""
diff --git a/net-misc/asterisk/files/0.5.0/asterisk.rc6 b/net-misc/asterisk/files/0.5.0/asterisk.rc6
index ad3a91d1108a..dbc1a4688b79 100644
--- a/net-misc/asterisk/files/0.5.0/asterisk.rc6
+++ b/net-misc/asterisk/files/0.5.0/asterisk.rc6
@@ -1,10 +1,10 @@
 #!/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-misc/asterisk/files/0.5.0/asterisk.rc6,v 1.1 2004/01/04 00:25:22 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/0.5.0/asterisk.rc6,v 1.2 2004/03/06 03:27:48 vapier Exp $
 
 depend() {
-	need net	
+	need net
 }
 
 start() {
diff --git a/net-misc/asterisk/files/0.7.2/asterisk.confd b/net-misc/asterisk/files/0.7.2/asterisk.confd
index 0440b23cc33a..0340fe5df6e9 100644
--- a/net-misc/asterisk/files/0.7.2/asterisk.confd
+++ b/net-misc/asterisk/files/0.7.2/asterisk.confd
@@ -1,10 +1,10 @@
-# 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-misc/asterisk/files/0.7.2/asterisk.confd,v 1.1 2004/02/13 01:00:20 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/0.7.2/asterisk.confd,v 1.2 2004/03/06 03:27:48 vapier Exp $
 
 #
 # see "asterisk -h" for a list of options
-# 
+#
 #
 
 #OPTIONS=""
diff --git a/net-misc/asterisk/files/0.7.2/asterisk.rc6 b/net-misc/asterisk/files/0.7.2/asterisk.rc6
index 1faab16aa388..7d99ecde2159 100644
--- a/net-misc/asterisk/files/0.7.2/asterisk.rc6
+++ b/net-misc/asterisk/files/0.7.2/asterisk.rc6
@@ -1,10 +1,10 @@
 #!/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-misc/asterisk/files/0.7.2/asterisk.rc6,v 1.1 2004/02/13 01:00:20 stkn Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/0.7.2/asterisk.rc6,v 1.2 2004/03/06 03:27:48 vapier Exp $
 
 depend() {
-	need net	
+	need net
 }
 
 start() {