5 files changed, 9 insertions, 38 deletions
diff --git a/mail/dbmail/files/dbmail-imapd.sh.in b/mail/dbmail/files/dbmail-imapd.in
index 7d1ca96ea7d0..2115c39cf9cf 100644
--- a/mail/dbmail/files/dbmail-imapd.sh.in
+++ b/mail/dbmail/files/dbmail-imapd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-imapd.in,v 1.1 2012-03-18 19:17:12 rm Exp $
 #
 
 # PROVIDE: dbmail-imapd
@@ -22,7 +22,7 @@ name=dbmail_imapd
 rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
+pidfile=/var/run/dbmail/dbmail-imapd.pid
 required_files=%%PREFIX%%/etc/dbmail.conf
 
 # read settings, set default values
diff --git a/mail/dbmail/files/dbmail-lmtpd.sh.in b/mail/dbmail/files/dbmail-lmtpd.in
index f1805db488b1..28f81d5f375b 100644
--- a/mail/dbmail/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail/files/dbmail-lmtpd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-lmtpd.in,v 1.1 2012-03-18 19:17:12 rm Exp $
 #
 
 # PROVIDE: dbmail-lmtpd
@@ -22,7 +22,7 @@ name=dbmail_lmtpd
 rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
+pidfile=/var/run/dbmail/dbmail-lmtpd.pid
 required_files=%%PREFIX%%/etc/dbmail.conf
 
 # read settings, set default values
diff --git a/mail/dbmail/files/dbmail-pop3d.sh.in b/mail/dbmail/files/dbmail-pop3d.in
index 71a567fbd393..98e6f99fd013 100644
--- a/mail/dbmail/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail/files/dbmail-pop3d.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-pop3d.in,v 1.1 2012-03-18 19:17:12 rm Exp $
 #
 
 # PROVIDE: dbmail-pop3d
@@ -22,7 +22,7 @@ name=dbmail_pop3d
 rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
+pidfile=/var/run/dbmail/dbmail-pop3d.pid
 required_files=%%PREFIX%%/etc/dbmail.conf
 
 # read settings, set default values
diff --git a/mail/dbmail/files/dbmail-timsieved.sh.in b/mail/dbmail/files/dbmail-timsieved.in
index 27eb49540333..25b35e19fba1 100644
--- a/mail/dbmail/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail/files/dbmail-timsieved.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-timsieved.in,v 1.1 2012-03-18 19:17:12 rm Exp $
 #
 
 # PROVIDE: dbmail-timsieved
@@ -19,10 +19,10 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=dbmail_timsieved_enable
+rcvar=dbmail-timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
-pidfile=/var/run/dbmail-timsieved.pid
+pidfile=/var/run/dbmail/dbmail-timsieved.pid
 required_files=%%PREFIX%%/etc/dbmail.conf
 
 # read settings, set default values
diff --git a/mail/dbmail/files/pkg-message.in b/mail/dbmail/files/pkg-message.in
deleted file mode 100644
index 8e9dfc1a7650..000000000000
--- a/mail/dbmail/files/pkg-message.in
+++ /dev/null
@@ -1,29 +0,0 @@
-
-IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!
-
-	*) Don't forget to update the database using a script from
-	   %%DATADIR%%/
-	*) Many programs have been renamed and their arguments changed.
-	*) Read the upgrading notes.
-	*) Don't be careless with this upgrade or mail will be lost!
-	*) dbmail can be controled by setting dbmail_imapd_enable,
-	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in
-	   /etc/rc.conf.
-
-
-NOTE FOR ADMINS UPGRADING FROM 2.0.X -> 2.2.X :
-	*) Update database using a script
-	   %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql or
-	   %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
-	*) Run `dbmail-util -by'
-	*) Edit configuration file
-	   `[DBMAIL]' section must have `driver=mysql/pgsql' and
-	   `authdriver=sql/ldap'.
-
-NOTE FOR ADMINS UPGRADING FROM 2.1.X -> 2.2 :
-
-	*) Update database using a script
-	   %%DATADIR%%/mysql/2_1_7-2_2_0.mysql (if you're using MySQL)
-	   %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql (PostgreSQL)
-	   %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite (SQLite3)
-	*) Run `dbmail-util -by'