diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index 8883929da06..06b8a7432e3 100644
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.34 2010/12/13 18:34:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2010/12/24 10:40:04 ajacoutot Exp $
 
 COMMENT =		Music Player Daemon
 DISTNAME =		mpd-0.15.12
-REVISION =		3
+REVISION =		4
 CATEGORIES =		audio
 HOMEPAGE =		http://www.musicpd.org/
 MAINTAINER =		Tobias Ulmer <tobiasu@tmux.org>
diff --git a/audio/mpd/pkg/mpd.rc b/audio/mpd/pkg/mpd.rc
index e8c7ae1d572..17dbe795cca 100644
--- a/audio/mpd/pkg/mpd.rc
+++ b/audio/mpd/pkg/mpd.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: mpd.rc,v 1.2 2010/10/29 12:54:43 ajacoutot Exp $
+# $OpenBSD: mpd.rc,v 1.3 2010/12/24 10:40:04 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/mpd"
 
+rc_conf
+
 rc_cmd $1
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index f0c52c84557..d0ee9f6dbb6 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.38 2010/12/11 08:05:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/12/24 10:40:04 ajacoutot Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
 DISTNAME=	conserver-8.1.16
-REVISION=	3
+REVISION=	4
 CATEGORIES=	comms
 
 MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
diff --git a/comms/conserver/pkg/conserver.rc b/comms/conserver/pkg/conserver.rc
index 4394a45697f..996b64c7142 100755
--- a/comms/conserver/pkg/conserver.rc
+++ b/comms/conserver/pkg/conserver.rc
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: conserver.rc,v 1.2 2010/12/11 08:05:38 ajacoutot Exp $
+# $OpenBSD: conserver.rc,v 1.3 2010/12/24 10:40:04 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/conserver"
 daemon_flags="-d -n"
 
+rc_conf
+
 rc_cmd $1
diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile
index 17bf502e222..b99256cc7ff 100644
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.181 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.182 2010/12/24 10:40:04 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
 
-REVISION-server=4
+REVISION-server=5
 
 VERSION=	5.1.53
 DISTNAME=	mysql-${VERSION}
diff --git a/databases/mysql/pkg/mysqld.rc b/databases/mysql/pkg/mysqld.rc
index 1cc24553475..5ab08db210c 100755
--- a/databases/mysql/pkg/mysqld.rc
+++ b/databases/mysql/pkg/mysqld.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: mysqld.rc,v 1.7 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: mysqld.rc,v 1.8 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/mysqld_safe"
+
+rc_conf
+
 rc_reload=NO
 
 rc_check() {
@@ -12,8 +15,8 @@ rc_check() {
 }
 
 rc_start() {
-	su -l -c ${daemon_class:-daemon} -s ${daemon_shell:-/bin/sh} \
-		${daemon_user:-root} -c "${daemon} ${daemon_flags}" >/dev/null 2>&1 &
+	su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${daemon} ${daemon_flags}" >/dev/null 2>&1 &
 }
 
 rc_stop() {
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 1aa1dfd569d..d1987c9beff 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.139 2010/12/24 09:07:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.140 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@@ -12,6 +12,7 @@ PKGNAME-server=	postgresql-server-${VERSION}
 PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 
+REVISION-server=0
 REVISION-contrib=0
 
 CATEGORIES=	databases
diff --git a/databases/postgresql/pkg/postgresql.rc b/databases/postgresql/pkg/postgresql.rc
index eaaaeb70485..676dd2b8b62 100644
--- a/databases/postgresql/pkg/postgresql.rc
+++ b/databases/postgresql/pkg/postgresql.rc
@@ -1,27 +1,26 @@
 #!/bin/sh
 #
-# $OpenBSD: postgresql.rc,v 1.3 2010/12/15 11:32:26 ajacoutot Exp $
+# $OpenBSD: postgresql.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/postgres"
 daemon_user="_postgresql"
 
+rc_conf
+
 bin="${TRUEPREFIX}/bin/pg_ctl"
 datadir="/var/postgresql/data"
 
 rc_start() {
 	rm -f ${datadir}/postmaster.pid
-	su -l -c ${daemon_class:-daemon} -s ${daemon_shell:-/bin/sh} \
-		${daemon_user:-root} -c \
-		"${bin} -D ${datadir} start -l /var/postgresql/logfile" \
-		>/dev/null
+	su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${bin} -D ${datadir} start -l /var/postgresql/logfile" >/dev/null
 }
 
 rc_stop() {
-	su -l -c ${daemon_class:-daemon} -s ${daemon_shell:-/bin/sh} \
-		${daemon_user:-root} -c \
-		"${bin} -D ${datadir} stop -m fast" >/dev/null
+	su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${bin} -D ${datadir} stop -m fast" >/dev/null
 }
 
 rc_cmd $1
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 2a85c991d35..e16041af241 100755
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2010/12/20 11:40:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	API for accessing scanners, backends
 
 DISTNAME=	sane-backends-1.0.21
-REVISION=	9
+REVISION=	10
 
 PATCHFILES=	sane-backends-1.0.21-i18n.patch
 PATCH_DIST_STRIP= -p1
diff --git a/graphics/sane-backends/pkg/saned.rc b/graphics/sane-backends/pkg/saned.rc
index b45f72e849b..b162b48b7ba 100755
--- a/graphics/sane-backends/pkg/saned.rc
+++ b/graphics/sane-backends/pkg/saned.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: saned.rc,v 1.5 2010/12/20 11:40:39 ajacoutot Exp $
+# $OpenBSD: saned.rc,v 1.6 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/saned"
 daemon_flags="-a _saned"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index ac09973510d..39ad983b683 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/23 18:15:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=		interface between mailer MTA and content checkers
 
 DISTNAME=		amavisd-new-2.6.4
-REVISION=		3
+REVISION=		4
 CATEGORIES=		mail security
 
 HOMEPAGE=		http://www.ijs.si/software/amavisd/
diff --git a/mail/amavisd-new/pkg/amavisd.rc b/mail/amavisd-new/pkg/amavisd.rc
index a34b23d2968..ccf5a298560 100644
--- a/mail/amavisd-new/pkg/amavisd.rc
+++ b/mail/amavisd-new/pkg/amavisd.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: amavisd.rc,v 1.2 2010/11/23 18:15:18 ajacoutot Exp $
+# $OpenBSD: amavisd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/amavisd"
+
+rc_conf
+
 pexp="perl: amavisd"
 
 rc_stop() {
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 0a15d27d819..56e4883344a 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/12/16 17:52:12 giovanni Exp $
+# $OpenBSD: Makefile,v 1.19 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -13,11 +13,11 @@ PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
 PKGNAME-pgsql=		${DISTNAME:S/lib-/lib-pgsql-/}
 PKGNAME-userdb=		${DISTNAME:S/lib-/lib-userdb-/}
 
-REVISION-main=		1
-REVISION-ldap=		0
-REVISION-mysql=		0
-REVISION-pgsql=		0
-REVISION-userdb=	0
+REVISION-main=		2
+REVISION-ldap=		1
+REVISION-mysql=		1
+REVISION-pgsql=		1
+REVISION-userdb=	1
 
 SHARED_LIBS +=  courierauth          1.0      # .0.0
 SHARED_LIBS +=  courierauthsasl      1.0      # .0.0
diff --git a/mail/courier-authlib/pkg/courier_authdaemond.rc b/mail/courier-authlib/pkg/courier_authdaemond.rc
index a67bafe5373..7d48d814513 100644
--- a/mail/courier-authlib/pkg/courier_authdaemond.rc
+++ b/mail/courier-authlib/pkg/courier_authdaemond.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_authdaemond.rc,v 1.1 2010/12/16 17:52:12 giovanni Exp $
+# $OpenBSD: courier_authdaemond.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/authdaemond"
+
+rc_conf
+
 pexp=".*courierlogger.*-start ${TRUEPREFIX}/libexec/courier-authlib/authdaemond"
 
 rc_start() {
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 259de91578d..ae27646207a 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2010/12/16 17:55:10 giovanni Exp $
+# $OpenBSD: Makefile,v 1.67 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
@@ -6,9 +6,9 @@ COMMENT-pop3=		pop3 server for maildir format mailboxes
 V=			4.8.0
 DISTNAME=		courier-imap-${V}
 PKGNAME-main=		${DISTNAME}
-REVISION-main=		2
+REVISION-main=		3
 FULLPKGNAME-pop3=	courier-pop3-${V}
-REVISION-pop3=		2
+REVISION-pop3=		3
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
 
 CATEGORIES=		mail
diff --git a/mail/courier-imap/pkg/courier_imap-ssl.rc b/mail/courier-imap/pkg/courier_imap-ssl.rc
index 64bb66a7c97..dafab0eb54a 100644
--- a/mail/courier-imap/pkg/courier_imap-ssl.rc
+++ b/mail/courier-imap/pkg/courier_imap-ssl.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_imap-ssl.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+# $OpenBSD: courier_imap-ssl.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
+
+rc_conf
+
 pexp=".*courierlogger.*imapd-ssl.pid"
 
 rc_start() {
diff --git a/mail/courier-imap/pkg/courier_imap.rc b/mail/courier-imap/pkg/courier_imap.rc
index 45e882abd7f..a5771567622 100644
--- a/mail/courier-imap/pkg/courier_imap.rc
+++ b/mail/courier-imap/pkg/courier_imap.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_imap.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+# $OpenBSD: courier_imap.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/imapd.rc"
+
+rc_conf
+
 pexp=".*courierlogger.*imapd.pid"
 
 rc_start() {
diff --git a/mail/courier-imap/pkg/courier_pop3-ssl.rc b/mail/courier-imap/pkg/courier_pop3-ssl.rc
index cf174e63060..8c2879453fd 100644
--- a/mail/courier-imap/pkg/courier_pop3-ssl.rc
+++ b/mail/courier-imap/pkg/courier_pop3-ssl.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_pop3-ssl.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+# $OpenBSD: courier_pop3-ssl.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
+
+rc_conf
+
 pexp=".*courierlogger.*pop3d-ssl.pid"
 
 rc_start() {
diff --git a/mail/courier-imap/pkg/courier_pop3.rc b/mail/courier-imap/pkg/courier_pop3.rc
index 1383afd876e..60a92cc00e3 100644
--- a/mail/courier-imap/pkg/courier_pop3.rc
+++ b/mail/courier-imap/pkg/courier_pop3.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_pop3.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+# $OpenBSD: courier_pop3.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/pop3d.rc"
+
+rc_conf
+
 pexp=".*courierlogger.*pop3d.pid"
 
 rc_start() {
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 726c03642de..daa82541efe 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2010/12/20 14:39:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
@@ -9,6 +9,8 @@ PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
 
+REVISION-main=	0
+
 CATEGORIES=	mail
 
 HOMEPAGE=	http://www.cyrusimap.org/
diff --git a/mail/cyrus-imapd/pkg/cyrus_imapd.rc b/mail/cyrus-imapd/pkg/cyrus_imapd.rc
index dd54eea042e..41259d4893a 100755
--- a/mail/cyrus-imapd/pkg/cyrus_imapd.rc
+++ b/mail/cyrus-imapd/pkg/cyrus_imapd.rc
@@ -1,12 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: cyrus_imapd.rc,v 1.5 2010/12/14 18:45:54 ajacoutot Exp $
+# $OpenBSD: cyrus_imapd.rc,v 1.6 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/cyrus-imapd/master"
 daemon_flags="-d"
 
+rc_conf
+
 # chdir needed when using the BerkeleyDB backend to prevent:
 # DBERROR db4: no absolute path for the current directory: No such file or directory
 rc_pre() {
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index ff5f9edf8a5..fe9bba858b5 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.62 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	mailing list manager with web interface
 
 DISTNAME=	mailman-2.1.14
-REVISION=	5
+REVISION=	6
 CATEGORIES=	mail www
 
 HOMEPAGE=	http://www.gnu.org/software/mailman/
diff --git a/mail/mailman/pkg/mailman.rc b/mail/mailman/pkg/mailman.rc
index 0fc362d2e9a..53dab49156d 100644
--- a/mail/mailman/pkg/mailman.rc
+++ b/mail/mailman/pkg/mailman.rc
@@ -1,16 +1,19 @@
 #!/bin/sh
 #
-# $OpenBSD: mailman.rc,v 1.5 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: mailman.rc,v 1.6 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/lib/mailman/bin/mailmanctl"
 daemon_flags="-s -q"
+
+rc_conf
+
 rc_reload=NO
 
 rc_start() {
-	su -l -c ${daemon_class:-daemon} -s ${daemon_shell:-/bin/sh} \
-		${daemon_user:-root} -c "${daemon} ${daemon_flags} start"
+	su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${daemon} ${daemon_flags} start"
 }
 
 rc_stop() {
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index c44e159ed78..beb4e08fe03 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	sendmail milter plugin for regular expression filtering
 
 DISTNAME=	milter-regex-1.8
-REVISION=	0
+REVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
diff --git a/mail/milter-regex/pkg/milter_regex.rc b/mail/milter-regex/pkg/milter_regex.rc
index 91f53907cfe..06aa23c8719 100644
--- a/mail/milter-regex/pkg/milter_regex.rc
+++ b/mail/milter-regex/pkg/milter_regex.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: milter_regex.rc,v 1.2 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: milter_regex.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/milter-regex"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/mail/milter-spamd/Makefile b/mail/milter-spamd/Makefile
index 26d9e765fba..18129f79bb2 100644
--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	sendmail milter plugin for SpamAssassin spamd
 
 DISTNAME=	milter-spamd-0.5
-REVISION =	2
+REVISION =	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
diff --git a/mail/milter-spamd/pkg/milter_spamd.rc b/mail/milter-spamd/pkg/milter_spamd.rc
index 3913aa3b023..088e037ceb1 100644
--- a/mail/milter-spamd/pkg/milter_spamd.rc
+++ b/mail/milter-spamd/pkg/milter_spamd.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: milter_spamd.rc,v 1.2 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: milter_spamd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/libexec/milter-spamd"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 27bd95b8b02..9b50d11b744 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	mailfilter to identify and mark spam
 
 DISTNAME=	mimedefang-2.71
-REVISION=	1
+REVISION=	2
 CATEGORIES=	mail
 
 HOMEPAGE=	http://www.mimedefang.org/
diff --git a/mail/mimedefang/pkg/mimedefang_daemon.rc b/mail/mimedefang/pkg/mimedefang_daemon.rc
index fa1cfbd9877..13ae6741c18 100755
--- a/mail/mimedefang/pkg/mimedefang_daemon.rc
+++ b/mail/mimedefang/pkg/mimedefang_daemon.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: mimedefang_daemon.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: mimedefang_daemon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/mimedefang"
 daemon_flags="-U _mdefang -p /var/run/mdefang/mimedefang.socket -m /var/run/mdefang/multiplexor.socket"
+
+rc_conf
+
 rc_reload=NO
 
 rc_pre() {
diff --git a/mail/mimedefang/pkg/mimedefang_multiplexor.rc b/mail/mimedefang/pkg/mimedefang_multiplexor.rc
index 4b3821137b8..fc9fe2d28d2 100755
--- a/mail/mimedefang/pkg/mimedefang_multiplexor.rc
+++ b/mail/mimedefang/pkg/mimedefang_multiplexor.rc
@@ -1,12 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: mimedefang_multiplexor.rc,v 1.2 2010/12/09 01:44:15 okan Exp $
+# $OpenBSD: mimedefang_multiplexor.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/mimedefang-multiplexor"
 daemon_flags="-U _mdefang -l -p /var/run/mdefang/multiplexor.pid -s /var/run/mdefang/multiplexor.socket"
 
+rc_conf
+
 rc_pre() {
 	install -d -o _mdefang -g _mdefang /var/run/mdefang
 }
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index a0bed208404..19a2cb0cf14 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.68 2010/11/30 08:34:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.69 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=		mailfilter to identify and mark spam
 
 VER=			3.3.1
 DISTNAME=		Mail-SpamAssassin-${VER}
 PKGNAME=		p5-${DISTNAME:S/-rc/rc/}
-REVISION=		4
+REVISION=		5
 RULESNAME=		Mail-SpamAssassin-rules-${VER}.r923114
 CATEGORIES=		mail perl5
 
diff --git a/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc b/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
index b4c1bf8a6f6..74249328dfc 100644
--- a/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
+++ b/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: spamassassin.rc,v 1.1 2010/11/04 12:07:09 sthen Exp $
+# $OpenBSD: spamassassin.rc,v 1.2 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/spamd"
 daemon_flags="-d -u _spamdaemon -P"
+
+rc_conf
+
 pexp="perl: ${daemon} ${daemon_flags}"
 
 rc_cmd $1
diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile
index a0574c7d43d..fe6eaa0c275 100644
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2010/11/19 07:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	sendmail milter to scan messages for viruses and spam
 
 DISTNAME=	smtp-vilter-1.3.6
-REVISION=	8
+REVISION=	9
 
 CATEGORIES=    	mail
 
diff --git a/mail/smtp-vilter/pkg/smtp_vilter.rc b/mail/smtp-vilter/pkg/smtp_vilter.rc
index f9ddf714263..8605d7727f0 100755
--- a/mail/smtp-vilter/pkg/smtp_vilter.rc
+++ b/mail/smtp-vilter/pkg/smtp_vilter.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: smtp_vilter.rc,v 1.3 2010/11/04 12:01:42 sthen Exp $
+# $OpenBSD: smtp_vilter.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/smtp-vilter"
+
+rc_conf
+
 pexp="smtp-vilter:"
 
 rc_cmd $1
diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile
index a5cbfbf1560..8a873e688a1 100644
--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2010/12/24 09:07:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.58 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP
@@ -7,7 +7,7 @@ PKGNAME=	zarafa-${V}
 PKGNAME-main=	zarafa-${V}
 PKGNAME-web=	zarafa-webaccess-${V}
 
-REVISION-main=	0
+REVISION-main=	1
 
 CATEGORIES=	mail www productivity
 
diff --git a/mail/zarafa/zarafa/pkg/zarafa.rc b/mail/zarafa/zarafa/pkg/zarafa.rc
index ddee251447c..f04cef0f4fd 100755
--- a/mail/zarafa/zarafa/pkg/zarafa.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa.rc,v 1.4 2010/11/17 14:00:04 ajacoutot Exp $
+# $OpenBSD: zarafa.rc,v 1.5 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="/bin/true"
+
+rc_conf
+
 _zarafa_daemons="server spooler monitor gateway ical"
 
 rc_start() {
diff --git a/mail/zarafa/zarafa/pkg/zarafa_gateway.rc b/mail/zarafa/zarafa/pkg/zarafa_gateway.rc
index 505a5115a05..a2a1bf47ed8 100755
--- a/mail/zarafa/zarafa/pkg/zarafa_gateway.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_gateway.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_gateway.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: zarafa_gateway.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/zarafa-gateway"
 
+rc_conf
+
 rc_cmd $1
diff --git a/mail/zarafa/zarafa/pkg/zarafa_ical.rc b/mail/zarafa/zarafa/pkg/zarafa_ical.rc
index c3615015597..b56afa08a06 100755
--- a/mail/zarafa/zarafa/pkg/zarafa_ical.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_ical.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_ical.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: zarafa_ical.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/zarafa-ical"
 
+rc_conf
+
 rc_cmd $1
diff --git a/mail/zarafa/zarafa/pkg/zarafa_monitor.rc b/mail/zarafa/zarafa/pkg/zarafa_monitor.rc
index c210f3a9f25..c65b66f38be 100755
--- a/mail/zarafa/zarafa/pkg/zarafa_monitor.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_monitor.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_monitor.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: zarafa_monitor.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/zarafa-monitor"
 
+rc_conf
+
 rc_cmd $1
diff --git a/mail/zarafa/zarafa/pkg/zarafa_server.rc b/mail/zarafa/zarafa/pkg/zarafa_server.rc
index 29127e4f137..f612452ce12 100755
--- a/mail/zarafa/zarafa/pkg/zarafa_server.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_server.rc
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_server.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: zarafa_server.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/zarafa-server"
 
+rc_conf
+
 rc_pre() {
 	i=1
 	while [ $i -lt 10 ]; do
diff --git a/mail/zarafa/zarafa/pkg/zarafa_spooler.rc b/mail/zarafa/zarafa/pkg/zarafa_spooler.rc
index a836704acde..a0fd5159c5c 100755
--- a/mail/zarafa/zarafa/pkg/zarafa_spooler.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_spooler.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_spooler.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: zarafa_spooler.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/zarafa-spooler"
 
+rc_conf
+
 rc_cmd $1
diff --git a/misc/srcpd/Makefile b/misc/srcpd/Makefile
index c65fa90d946..46306074334 100644
--- a/misc/srcpd/Makefile
+++ b/misc/srcpd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2010/12/13 15:47:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT =	daemon to control digital model railroad systems
 
 DISTNAME =	srcpd-2.1.1
 CATEGORIES =	misc net
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://srcpd.sourceforge.net/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=srcpd/}
diff --git a/misc/srcpd/pkg/srcpd.rc b/misc/srcpd/pkg/srcpd.rc
index 01fed9cb91e..30f03ed4d0d 100644
--- a/misc/srcpd/pkg/srcpd.rc
+++ b/misc/srcpd/pkg/srcpd.rc
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: srcpd.rc,v 1.2 2010/12/13 15:47:48 ajacoutot Exp $
+# $OpenBSD: srcpd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/srcpd"
 
+rc_conf
+
 rc_stop() {
 	pkill -9 -f "^${pexp}"
 }
diff --git a/net/argus/Makefile b/net/argus/Makefile
index bf4a4315683..f725af9e88c 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT =	Audit Record Generation and Utilization System
 
 DISTNAME =	argus-3.0.2
-REVISION =	2
+REVISION =	3
 CATEGORIES =	net
 
 HOMEPAGE =	http://qosient.com/argus/
diff --git a/net/argus/pkg/argus.rc b/net/argus/pkg/argus.rc
index 308c9b9fb5b..887702ab47c 100755
--- a/net/argus/pkg/argus.rc
+++ b/net/argus/pkg/argus.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: argus.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: argus.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/argus"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 61290010da9..704eac4e09a 100755
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2010/12/14 14:55:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.46 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main=	framework for Multicast DNS Service Discovery
 COMMENT-gtk=	GUI client utilities for avahi
@@ -16,6 +16,8 @@ PKGNAME-mono=	mono-avahi-${V}
 PKGNAME-qt3=	avahi-qt3-${V}
 PKGNAME-qt4=	avahi-qt4-${V}
 
+REVISION-main=	0
+
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 SHARED_LIBS +=  avahi-common         0.0      # .8.0
diff --git a/net/avahi/pkg/avahi_daemon.rc b/net/avahi/pkg/avahi_daemon.rc
index f15c1199943..3e5310d57d8 100644
--- a/net/avahi/pkg/avahi_daemon.rc
+++ b/net/avahi/pkg/avahi_daemon.rc
@@ -1,12 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: avahi_daemon.rc,v 1.3 2010/11/30 16:37:21 ajacoutot Exp $
+# $OpenBSD: avahi_daemon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/avahi-daemon"
 daemon_flags="-D"
 
+rc_conf
+
 rc_check() {
 	${daemon} --check
 }
diff --git a/net/avahi/pkg/avahi_dnsconfd.rc b/net/avahi/pkg/avahi_dnsconfd.rc
index cd82cca39df..c409063c9d5 100644
--- a/net/avahi/pkg/avahi_dnsconfd.rc
+++ b/net/avahi/pkg/avahi_dnsconfd.rc
@@ -1,12 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: avahi_dnsconfd.rc,v 1.3 2010/11/30 16:37:21 ajacoutot Exp $
+# $OpenBSD: avahi_dnsconfd.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/avahi-dnsconfd"
 daemon_flags="-D"
 
+rc_conf
+
 rc_check() {
 	${daemon} --check
 }
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 4949c238fca..fc02c07770c 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2010/12/01 09:58:43 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.13 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=		Dynamic DNS service update client
 
-REVISION=		1
+REVISION=		2
 DISTNAME=		ddclient-3.8.0
 CATEGORIES=		net
 
diff --git a/net/ddclient/pkg/ddclient.rc b/net/ddclient/pkg/ddclient.rc
index 7db449af564..8a484ae8413 100644
--- a/net/ddclient/pkg/ddclient.rc
+++ b/net/ddclient/pkg/ddclient.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: ddclient.rc,v 1.1 2010/12/01 09:58:43 dcoppa Exp $
+# $OpenBSD: ddclient.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/ddclient"
+
+rc_conf
+
 pexp="perl: ddclient"
 
 rc_cmd $1
diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 10d33a075c4..be9fa1bc9ad 100644
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.41 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	server for streaming various media formats
 
 DISTNAME=	icecast-2.3.2
-REVISION =	2
+REVISION =	3
 CATEGORIES=	net audio
 
 HOMEPAGE=	http://www.icecast.org/
diff --git a/net/icecast/pkg/icecast.rc b/net/icecast/pkg/icecast.rc
index 49da8d6196f..a2a240091aa 100644
--- a/net/icecast/pkg/icecast.rc
+++ b/net/icecast/pkg/icecast.rc
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: icecast.rc,v 1.2 2010/11/11 10:38:47 ajacoutot Exp $
+# $OpenBSD: icecast.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/icecast"
 daemon_flags="-b -c /var/icecast/icecast.xml"
 
+rc_conf
+
 rc_cmd $1
diff --git a/net/ircd-hybrid/Makefile b/net/ircd-hybrid/Makefile
index 3e61489b4f1..926ce249f82 100644
--- a/net/ircd-hybrid/Makefile
+++ b/net/ircd-hybrid/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2010/12/24 10:40:05 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	Internet Relay Chat server
 
 DISTNAME =	ircd-hybrid-7.2.3
-REVISION =	8
+REVISION =	9
 CATEGORIES =	net
 
 HOMEPAGE =	http://ircd-hybrid.com/
diff --git a/net/ircd-hybrid/pkg/ircd_hybrid.rc b/net/ircd-hybrid/pkg/ircd_hybrid.rc
index 9f2bffadbff..5a62cad1bc3 100644
--- a/net/ircd-hybrid/pkg/ircd_hybrid.rc
+++ b/net/ircd-hybrid/pkg/ircd_hybrid.rc
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: ircd_hybrid.rc,v 1.1 2010/11/13 06:52:41 ajacoutot Exp $
+# $OpenBSD: ircd_hybrid.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/ircd"
 
+rc_conf
+
 rc_pre() {
 	install -d -o _ircd-hybrid -g _ircd-hybrid /var/run/ircd
 }
diff --git a/net/ircd-ratbox/Makefile b/net/ircd-ratbox/Makefile
index 3bf395b2ce4..7afbc3424ed 100644
--- a/net/ircd-ratbox/Makefile
+++ b/net/ircd-ratbox/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/12/24 10:40:05 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 COMMENT =	advanced, stable and fast irc server
 
 DISTNAME =	ircd-ratbox-3.0.6
 CATEGORIES =	net
-REVISION =	2
+REVISION =	3
 
 EXTRACT_SUFX =	.tar.bz2
 
diff --git a/net/ircd-ratbox/pkg/ircd_ratbox.rc b/net/ircd-ratbox/pkg/ircd_ratbox.rc
index 74473371fb2..3fe4fb46699 100644
--- a/net/ircd-ratbox/pkg/ircd_ratbox.rc
+++ b/net/ircd-ratbox/pkg/ircd_ratbox.rc
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: ircd_ratbox.rc,v 1.1 2010/11/09 11:56:17 jasper Exp $
+# $OpenBSD: ircd_ratbox.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/ircd"
 
+rc_conf
+
 rc_pre() {
 	install -d -o _ircd-ratbox -g _ircd-ratbox /var/run/ircd-ratbox
 }
diff --git a/net/mon/server/Makefile b/net/mon/server/Makefile
index d8c131e2c41..3bd5ca39830 100644
--- a/net/mon/server/Makefile
+++ b/net/mon/server/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT =	service monitoring daemon
 
 DISTNAME = 	mon-${V}
-REVISION =	3
+REVISION =	4
 
 WANTLIB = 	c
 
diff --git a/net/mon/server/pkg/mon.rc b/net/mon/server/pkg/mon.rc
index ab23248a312..e6fc6ff2f5b 100644
--- a/net/mon/server/pkg/mon.rc
+++ b/net/mon/server/pkg/mon.rc
@@ -1,13 +1,16 @@
 #!/bin/sh
 #
-# $OpenBSD: mon.rc,v 1.3 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: mon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/mon"
 daemon_flags="-c ${SYSCONFDIR}/mon/mon.cf -f -P /var/run/mon/mon.pid"
 daemon_user="_mon"
-pexp="/usr/bin/perl ${daemon}${daemon_flags:+ ${daemon_flags}}"
+
+rc_conf
+
+pexp="/usr/bin/perl ${daemon}${daemon_flags}"
 rc_reload=NO
 
 rc_pre() {
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index a8e019127a8..c4aa704c5f7 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.72 2010/12/21 12:57:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	multi-router traffic grapher
 
 DISTNAME=	mrtg-2.17.0
 CATEGORIES=	net
 
+REVISION=	0
+
 HOMEPAGE=	http://oss.oetiker.ch/mrtg/
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/net/mrtg/pkg/mrtg.rc b/net/mrtg/pkg/mrtg.rc
index 3cc06b1fd49..6481de6044d 100644
--- a/net/mrtg/pkg/mrtg.rc
+++ b/net/mrtg/pkg/mrtg.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: mrtg.rc,v 1.1 2010/12/03 00:10:09 ian Exp $
+# $OpenBSD: mrtg.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/mrtg"
 daemon_flags="--daemon --user _mrtg --group _mrtg --confcache-file /tmp/mrtg.ok --lock-file /tmp/mrtg_lock --pid-file /var/run/mrtg.pid"
+
+rc_conf
+
 pexp="/usr/bin/perl -w ${daemon} ${daemon_flags}"
 
 rc_cmd $1
diff --git a/net/munin/Makefile b/net/munin/Makefile
index 3a630b7a0b7..8e10ae8d628 100644
--- a/net/munin/Makefile
+++ b/net/munin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:34 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main =	flexible network host monitoring, client
 COMMENT-server =flexible network host monitoring, server
@@ -7,7 +7,8 @@ V =		1.4.5
 DISTNAME =	munin-$V
 PKGNAME-main =	munin-node-$V
 PKGNAME-server =munin-server-$V
-REVISION-main = 2
+REVISION-main = 3
+REVISION-server = 0
 CATEGORIES =	net
 
 HOMEPAGE =	http://munin-monitoring.org/
diff --git a/net/munin/pkg/munin_node.rc b/net/munin/pkg/munin_node.rc
index 9efddc4600a..7a7ec207405 100644
--- a/net/munin/pkg/munin_node.rc
+++ b/net/munin/pkg/munin_node.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: munin_node.rc,v 1.2 2010/10/29 12:54:43 ajacoutot Exp $
+# $OpenBSD: munin_node.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/munin-node"
+
+rc_conf
+
 pexp="perl: ${daemon}"
 
 rc_pre() {
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index b1b32625e9f..2da575813f4 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	Network Time Protocol reference implementation
 
@@ -9,7 +9,7 @@ COMMENT=	Network Time Protocol reference implementation
 VERSION=	4.2.6p2
 DISTNAME=	ntp-${VERSION}
 PKGNAME=	ntp-${VERSION:S/p/pl/}
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://archive.ntp.org/ntp4/ntp-4.2/
 
diff --git a/net/ntp/pkg/ntpd.rc b/net/ntp/pkg/ntpd.rc
index 00d3b2a514e..b81676062ac 100644
--- a/net/ntp/pkg/ntpd.rc
+++ b/net/ntp/pkg/ntpd.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: ntpd.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: ntpd.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/ntpd"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
index 772880b0584..80d03bdb57d 100755
--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:39 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT=	UPnP A/V media server
 
 DISTNAME=	ushare-1.1a
-REVISION=	1
+REVISION=	2
 EXTRACT_SUFX=	.tar.bz2
 
 CATEGORIES=	net multimedia
diff --git a/net/ushare/pkg/ushare.rc b/net/ushare/pkg/ushare.rc
index 0bd34077e21..ee4edfc7010 100644
--- a/net/ushare/pkg/ushare.rc
+++ b/net/ushare/pkg/ushare.rc
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: ushare.rc,v 1.2 2010/11/03 10:55:30 ajacoutot Exp $
+# $OpenBSD: ushare.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/ushare"
 daemon_flags="-D"
 
+rc_conf
+
 rc_cmd $1
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 50f23559be3..2d9bb27e5b1 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2010/12/13 16:14:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT = 	network traffic monitor
 
 DISTNAME = 	vnstat-1.10
 CATEGORIES = 	net sysutils
 
-REVISION = 	1
+REVISION = 	2
 
 HOMEPAGE = 	http://humdi.net/vnstat/
 
diff --git a/net/vnstat/pkg/vnstatd.rc b/net/vnstat/pkg/vnstatd.rc
index d56c1adb82e..75248a8623e 100644
--- a/net/vnstat/pkg/vnstatd.rc
+++ b/net/vnstat/pkg/vnstatd.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: vnstatd.rc,v 1.2 2010/12/13 16:14:38 ajacoutot Exp $
+# $OpenBSD: vnstatd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
@@ -8,6 +8,8 @@ daemon="${TRUEPREFIX}/sbin/vnstatd"
 daemon_flags="-d"
 daemon_user="_vnstat"
 
+rc_conf
+
 rc_pre() {
 	/usr/bin/install -d -o _vnstat /var/run/vnstat
 }
diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index 3d6d04ccafd..406edacc942 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2010/12/13 10:40:52 robert Exp $
+# $OpenBSD: Makefile,v 1.43 2010/12/24 10:40:05 ajacoutot Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -13,9 +13,9 @@ FULLPKGNAME-web =	zabbix-web-${VERSION}
 FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
 
-REVISION-main =		8
-REVISION-server =	7
-REVISION-web =		2
+REVISION-main =		9
+REVISION-server =	8
+REVISION-web =		3
 
 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
diff --git a/net/zabbix/pkg/zabbix_agentd.rc b/net/zabbix/pkg/zabbix_agentd.rc
index 0987fb6af51..8aee9a6746c 100644
--- a/net/zabbix/pkg/zabbix_agentd.rc
+++ b/net/zabbix/pkg/zabbix_agentd.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_agentd.rc,v 1.2 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: zabbix_agentd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/zabbix_agentd"
+
+rc_conf
+
 pexp="zabbix_agentd: main process"
 rc_reload=NO
 
diff --git a/net/zabbix/pkg/zabbix_proxy.rc b/net/zabbix/pkg/zabbix_proxy.rc
index f22c0331c46..d01180c2501 100644
--- a/net/zabbix/pkg/zabbix_proxy.rc
+++ b/net/zabbix/pkg/zabbix_proxy.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_proxy.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: zabbix_proxy.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/zabbix_proxy"
+
+rc_conf
+
 pexp="zabbix_proxy: heartbeat sender"
 rc_reload=NO
 
diff --git a/net/zabbix/pkg/zabbix_server.rc b/net/zabbix/pkg/zabbix_server.rc
index 7e5be9babbe..2a8be48b6ea 100644
--- a/net/zabbix/pkg/zabbix_server.rc
+++ b/net/zabbix/pkg/zabbix_server.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_server.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: zabbix_server.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/zabbix_server"
+
+rc_conf
+
 pexp="zabbix_server: main process"
 rc_reload=NO
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ad90ede88d2..91ff18ae20c 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2010/12/20 14:43:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.91 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	Common Unix Printing System
 
@@ -6,7 +6,7 @@ VERSION=	1.4.5
 DISTNAME=	cups-${VERSION}-source
 PKGNAME=	cups-${VERSION}
 
-REVISION=	2
+REVISION=	3
 
 # Allow both ulpt(4) and libusb based backends to work together.
 # See http://www.cups.org/str.php?L3357
diff --git a/print/cups/pkg/cupsd.rc b/print/cups/pkg/cupsd.rc
index b20ec3acf80..25937e93ef5 100755
--- a/print/cups/pkg/cupsd.rc
+++ b/print/cups/pkg/cupsd.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: cupsd.rc,v 1.4 2010/11/30 08:09:09 ajacoutot Exp $
+# $OpenBSD: cupsd.rc,v 1.5 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/cupsd"
+
+rc_conf
+
 pexp="${daemon} -C ${SYSCONFDIR}/cups/cupsd.conf"
 
 _lpfiles="/usr/bin/lpq /usr/bin/lpr /usr/bin/lprm /usr/sbin/lpc \
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index dcdb4bfffda..2a66fb5977a 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.62 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=		virus scanner
 DISTNAME=		clamav-0.96.5
 
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		security
 SHARED_LIBS=		clamav 17.0 \
diff --git a/security/clamav/pkg/clamav_daemon.rc b/security/clamav/pkg/clamav_daemon.rc
index df6fd63746b..fc03fd02dbb 100644
--- a/security/clamav/pkg/clamav_daemon.rc
+++ b/security/clamav/pkg/clamav_daemon.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_daemon.rc,v 1.2 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: clamav_daemon.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/clamd"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/security/clamav/pkg/clamav_freshclam.rc b/security/clamav/pkg/clamav_freshclam.rc
index a24300bb5e5..466f870332b 100644
--- a/security/clamav/pkg/clamav_freshclam.rc
+++ b/security/clamav/pkg/clamav_freshclam.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_freshclam.rc,v 1.2 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: clamav_freshclam.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/freshclam"
 daemon_flags="-d"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 47c40cd88ba..7d1f3abb585 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=	cyrus-sasl-2.1.23
-REVISION=	3
+REVISION=	4
 
 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
diff --git a/security/cyrus-sasl2/pkg/saslauthd.rc b/security/cyrus-sasl2/pkg/saslauthd.rc
index 571ebb1ea7a..9a77f8d633b 100755
--- a/security/cyrus-sasl2/pkg/saslauthd.rc
+++ b/security/cyrus-sasl2/pkg/saslauthd.rc
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: saslauthd.rc,v 1.2 2010/10/29 12:54:44 ajacoutot Exp $
+# $OpenBSD: saslauthd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/saslauthd"
 daemon_flags="-a getpwent"
 
+rc_conf
+
 rc_cmd $1
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 5864a20511c..6129f73dc90 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/23 18:53:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=		amd64 i386 powerpc
 
@@ -7,7 +7,7 @@ COMMENT=		control and monitor storage systems using SMART
 DISTNAME=		smartmontools-5.40
 CATEGORIES=		sysutils
 
-REVISION=		0
+REVISION=		1
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}	
 HOMEPAGE=		http://smartmontools.sourceforge.net/ 
diff --git a/sysutils/smartmontools/pkg/smartd.rc b/sysutils/smartmontools/pkg/smartd.rc
index 594ffb0d0d4..dc97c038603 100644
--- a/sysutils/smartmontools/pkg/smartd.rc
+++ b/sysutils/smartmontools/pkg/smartd.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: smartd.rc,v 1.2 2010/11/23 18:53:46 ajacoutot Exp $
+# $OpenBSD: smartd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/smartd"
 
+rc_conf
+
 rc_cmd $1
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index afe3ada1657..6c22cc331d8 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/12/22 07:28:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/12/24 10:40:06 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -18,7 +18,7 @@ PKGNAME-mysql =	cherokee-mysql-${VERSION}
 PKGNAME-geoip =	cherokee-geoip-${VERSION}
 PKGNAME-streaming = cherokee-streaming-${VERSION}
 
-REVISION-main=	0
+REVISION-main=	1
 
 SHARED_LIBS =	cherokee-base		0.0 \
 		cherokee-client		0.0 \
diff --git a/www/cherokee/pkg/cherokee.rc b/www/cherokee/pkg/cherokee.rc
index aa6b2192e66..c0f7c3370f3 100755
--- a/www/cherokee/pkg/cherokee.rc
+++ b/www/cherokee/pkg/cherokee.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: cherokee.rc,v 1.1 2010/12/20 07:51:58 ajacoutot Exp $
+# $OpenBSD: cherokee.rc,v 1.2 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/cherokee"
 daemon_flags="-d"
+
+rc_conf
+
 pexp="${daemon}[^-]"
 
 rc_cmd $1
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 8f21adecf81..8993bf0ef67 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.35 2010/12/11 08:05:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	robust and small HTTP server and mail proxy server
 
 DISTNAME=	nginx-0.8.53
 CATEGORIES=	www
 
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://nginx.net/
 
diff --git a/www/nginx/pkg/nginx.rc b/www/nginx/pkg/nginx.rc
index 23789e13060..9ecfb3ccfc4 100755
--- a/www/nginx/pkg/nginx.rc
+++ b/www/nginx/pkg/nginx.rc
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: nginx.rc,v 1.3 2010/12/11 08:05:38 ajacoutot Exp $
+# $OpenBSD: nginx.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/nginx"
+
+rc_conf
+
 pexp="nginx:.*master.*process"
 
 rc_reload() {
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index 0e0fa7e20d8..04aebdc921e 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	HTTP caching proxy
 
 DISTNAME=	polipo-1.0.4.1
 CATEGORIES=	www
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://www.pps.jussieu.fr/~jch/software/polipo/
 
diff --git a/www/polipo/pkg/polipo.rc b/www/polipo/pkg/polipo.rc
index 71b1b26b7f6..ef70ebcce0f 100644
--- a/www/polipo/pkg/polipo.rc
+++ b/www/polipo/pkg/polipo.rc
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: polipo.rc,v 1.3 2010/12/11 12:57:37 ajacoutot Exp $
+# $OpenBSD: polipo.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/polipo"
 daemon_flags="daemonise=yes"
+
+rc_conf
+
 rc_reload=NO
 
 rc_cmd $1
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index a8f2e9baab1..facf2ee8f83 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/12/22 09:23:01 sebastia Exp $
+# $OpenBSD: Makefile,v 1.6 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT = 	web based groupware server
 
-REVISION =	1
+REVISION =	2
 VERSION =	1.3.4
 DISTNAME =	SOGo-${VERSION}
 PKGNAME =	sogo-${VERSION}
diff --git a/www/sogo/pkg/sogod.rc b/www/sogo/pkg/sogod.rc
index c797005d3aa..6046b814681 100644
--- a/www/sogo/pkg/sogod.rc
+++ b/www/sogo/pkg/sogod.rc
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: sogod.rc,v 1.2 2010/12/11 14:21:08 sebastia Exp $
+# $OpenBSD: sogod.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/sogod"
 daemon_user="_sogo"
 
+rc_conf
+
 rc_cmd $1
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8409b72e59f..9e4f4c6e056 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.112 2010/12/12 18:58:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.113 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT=	WWW and FTP proxy cache and accelerator
 
 DISTNAME=	squid-2.7.STABLE9
-REVISION=	3
+REVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/Versions/v2/2.7/
 DIST_SUBDIR=	squid
diff --git a/www/squid/pkg/squid.rc b/www/squid/pkg/squid.rc
index 6113050919f..e0df17ab630 100644
--- a/www/squid/pkg/squid.rc
+++ b/www/squid/pkg/squid.rc
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: squid.rc,v 1.2 2010/11/26 15:44:33 dcoppa Exp $
+# $OpenBSD: squid.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/sbin/squid"
 
+rc_conf
+
 rc_stop() {
 	${daemon} -k shutdown
 }
diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 6e846299fe5..a128fc41acc 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2010/12/21 14:59:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2010/12/24 10:40:06 ajacoutot Exp $
 
 # XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a
 # temporary workaround until PIE works.
@@ -8,6 +8,8 @@ COMMENT=	message bus system
 DISTNAME=	dbus-1.4.1
 EPOCH=		0
 
+REVISION=	0
+
 SHARED_LIBS +=	dbus-1	9.0 # .8.2
 CATEGORIES=	x11
 
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index 72deed2e462..0dfa3232015 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.96 2010/12/24 10:40:06 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		GNOME display manager
 GNOME_PROJECT=		gdm
 GNOME_VERSION=		2.20.11
 
-REVISION=		15
+REVISION=		16
 
 HOMEPAGE=		http://projects.gnome.org/gdm/
 
diff --git a/x11/gnome/gdm/pkg/gdm.rc b/x11/gnome/gdm/pkg/gdm.rc
index 798a2645c77..478683aec03 100755
--- a/x11/gnome/gdm/pkg/gdm.rc
+++ b/x11/gnome/gdm/pkg/gdm.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: gdm.rc,v 1.7 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: gdm.rc,v 1.8 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
@@ -9,8 +9,8 @@ pexp="${TRUEPREFIX}/sbin/gdm-binary"
 rc_reload=NO
 
 rc_start() {
-	(sleep 5; su -l -c ${daemon_class:-daemon} -s ${daemon_shell:-/bin/sh} \
-		${daemon_user:-root} -c "${daemon} ${daemon_flags}" >/dev/null)&
+	(sleep 5; su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${daemon} ${daemon_flags}" >/dev/null)&
 }
 
 rc_cmd $1
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index fc4d95d27bf..6cceafc6601 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/12/24 10:40:06 ajacoutot Exp $
 
 COMMENT =		VNC server for real X displays
 
 DISTNAME =		x11vnc-0.9.12
 
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		x11
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/
diff --git a/x11/x11vnc/pkg/x11vnc.rc b/x11/x11vnc/pkg/x11vnc.rc
index 30083d750d2..f1d82ba2535 100755
--- a/x11/x11vnc/pkg/x11vnc.rc
+++ b/x11/x11vnc/pkg/x11vnc.rc
@@ -1,17 +1,20 @@
 #!/bin/sh
 #
-# $OpenBSD: x11vnc.rc,v 1.3 2010/12/13 16:13:04 ajacoutot Exp $
+# $OpenBSD: x11vnc.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
 daemon="${TRUEPREFIX}/bin/x11vnc"
 daemon_flags="-localhost -logfile /var/log/x11vnc -ncache 0 -display :0 -forever -loop100 -auth /etc/X11/xdm/authdir/authfiles/A:0-*"
+
+rc_conf
+
 rc_reload=NO
 
 rc_start() {
 	type rc_pre >/dev/null && rc_pre
-	su -l -c ${_rcclass:-daemon} -s ${_rcshell:-/bin/sh} \
-		${_rcuser:-root} -c "${daemon} ${daemon_flags}" >/dev/null 2>&1 &
+	su -l -c ${daemon_class} -s ${daemon_shell} ${daemon_user} \
+		-c "${daemon} ${daemon_flags}" >/dev/null 2>&1 &
 }
 
 rc_cmd $1