Simplify after recent rc.subr change.

The framework is now stable and we will start documenting it (at last).
2010-12-27 14:50:22 +00:00 · 2010-12-27 14:50:22 +00:00 · 4ec44530ca
commit 4ec44530ca
parent 6fd6fc2c45
97 changed files with 199 additions and 302 deletions
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2010/12/24 10:40:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT =		Music Player Daemon
 DISTNAME =		mpd-0.15.12
-REVISION =		4
+REVISION =		5
 CATEGORIES =		audio
 HOMEPAGE =		http://www.musicpd.org/
 MAINTAINER =		Tobias Ulmer <tobiasu@tmux.org>
--- a/audio/mpd/pkg/mpd.rc
+++ b/audio/mpd/pkg/mpd.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: mpd.rc,v 1.3 2010/12/24 10:40:04 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mpd.rc,v 1.4 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/mpd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2010/12/24 10:40:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT=	manage remote serial consoles via TCP/IP

 DISTNAME=	conserver-8.1.16
-REVISION=	4
+REVISION=	5
 CATEGORIES=	comms

 MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
--- a/comms/conserver/pkg/conserver.rc
+++ b/comms/conserver/pkg/conserver.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: conserver.rc,v 1.3 2010/12/24 10:40:04 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: conserver.rc,v 1.4 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/conserver"
 daemon_flags="-d -n"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.183 2010/12/26 08:23:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.184 2010/12/27 14:50:22 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -15,6 +15,8 @@ CATEGORIES=	databases
 V=		MySQL-5.1
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Downloads/$V/}

+REVISION-server=0
+
 SHARED_LIBS=	mysqlclient_r		20.0 \
 		mysqlclient		20.0

--- a/databases/mysql/pkg/mysqld.rc
+++ b/databases/mysql/pkg/mysqld.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: mysqld.rc,v 1.8 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mysqld.rc,v 1.9 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/mysqld_safe"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.140 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.141 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@ -12,7 +12,7 @@ PKGNAME-server=	postgresql-server-${VERSION}
 PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}

-REVISION-server=0
+REVISION-server=1
 REVISION-contrib=0

 CATEGORIES=	databases
--- a/databases/postgresql/pkg/postgresql.rc
+++ b/databases/postgresql/pkg/postgresql.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: postgresql.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: postgresql.rc,v 1.5 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/postgres"
 daemon_user="_postgresql"

-rc_conf
+. /etc/rc.d/rc.subr

 bin="${TRUEPREFIX}/bin/pg_ctl"
 datadir="/var/postgresql/data"
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT=	API for accessing scanners, backends

 DISTNAME=	sane-backends-1.0.21
-REVISION=	10
+REVISION=	11

 PATCHFILES=	sane-backends-1.0.21-i18n.patch
 PATCH_DIST_STRIP= -p1
--- a/graphics/sane-backends/pkg/saned.rc
+++ b/graphics/sane-backends/pkg/saned.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: saned.rc,v 1.6 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: saned.rc,v 1.7 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/saned"
 daemon_flags="-a _saned"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=		interface between mailer MTA and content checkers

 DISTNAME=		amavisd-new-2.6.4
-REVISION=		4
+REVISION=		5
 CATEGORIES=		mail security

 HOMEPAGE=		http://www.ijs.si/software/amavisd/
--- a/mail/amavisd-new/pkg/amavisd.rc
+++ b/mail/amavisd-new/pkg/amavisd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: amavisd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: amavisd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/amavisd"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="perl: amavisd"

--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@ -13,7 +13,7 @@ PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
 PKGNAME-pgsql=		${DISTNAME:S/lib-/lib-pgsql-/}
 PKGNAME-userdb=		${DISTNAME:S/lib-/lib-userdb-/}

-REVISION-main=		2
+REVISION-main=		3
 REVISION-ldap=		1
 REVISION-mysql=		1
 REVISION-pgsql=		1
--- a/mail/courier-authlib/pkg/courier_authdaemond.rc
+++ b/mail/courier-authlib/pkg/courier_authdaemond.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_authdaemond.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: courier_authdaemond.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/authdaemond"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp=".*courierlogger.*-start ${TRUEPREFIX}/libexec/courier-authlib/authdaemond"

--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.68 2010/12/27 14:50:23 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=		3
+REVISION-main=		4
 FULLPKGNAME-pop3=	courier-pop3-${V}
-REVISION-pop3=		3
+REVISION-pop3=		4
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3

 CATEGORIES=		mail
--- a/mail/courier-imap/pkg/courier_imap-ssl.rc
+++ b/mail/courier-imap/pkg/courier_imap-ssl.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_imap-ssl.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: courier_imap-ssl.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp=".*courierlogger.*imapd-ssl.pid"

--- a/mail/courier-imap/pkg/courier_imap.rc
+++ b/mail/courier-imap/pkg/courier_imap.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_imap.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: courier_imap.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/imapd.rc"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp=".*courierlogger.*imapd.pid"

--- a/mail/courier-imap/pkg/courier_pop3-ssl.rc
+++ b/mail/courier-imap/pkg/courier_pop3-ssl.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_pop3-ssl.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: courier_pop3-ssl.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp=".*courierlogger.*pop3d-ssl.pid"

--- a/mail/courier-imap/pkg/courier_pop3.rc
+++ b/mail/courier-imap/pkg/courier_pop3.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: courier_pop3.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: courier_pop3.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/pop3d.rc"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp=".*courierlogger.*pop3d.pid"

--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.54 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
@ -9,7 +9,7 @@ PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl

-REVISION-main=	0
+REVISION-main=	1

 CATEGORIES=	mail

--- a/mail/cyrus-imapd/pkg/cyrus_imapd.rc
+++ b/mail/cyrus-imapd/pkg/cyrus_imapd.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: cyrus_imapd.rc,v 1.6 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: cyrus_imapd.rc,v 1.7 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/cyrus-imapd/master"
 daemon_flags="-d"

-rc_conf
+. /etc/rc.d/rc.subr

 # chdir needed when using the BerkeleyDB backend to prevent:
 # DBERROR db4: no absolute path for the current directory: No such file or directory
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.63 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.64 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	mailing list manager with web interface

 DISTNAME=	mailman-2.1.14
-REVISION=	6
+REVISION=	7
 CATEGORIES=	mail www

 HOMEPAGE=	http://www.gnu.org/software/mailman/
--- a/mail/mailman/pkg/mailman.rc
+++ b/mail/mailman/pkg/mailman.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: mailman.rc,v 1.6 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mailman.rc,v 1.7 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/lib/mailman/bin/mailmanctl"
 daemon_flags="-s -q"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	sendmail milter plugin for regular expression filtering

 DISTNAME=	milter-regex-1.8
-REVISION=	1
+REVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/

--- a/mail/milter-regex/pkg/milter_regex.rc
+++ b/mail/milter-regex/pkg/milter_regex.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: milter_regex.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: milter_regex.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/milter-regex"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	sendmail milter plugin for SpamAssassin spamd

 DISTNAME=	milter-spamd-0.5
-REVISION =	3
+REVISION =	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/

--- a/mail/milter-spamd/pkg/milter_spamd.rc
+++ b/mail/milter-spamd/pkg/milter_spamd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: milter_spamd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: milter_spamd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/libexec/milter-spamd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	mailfilter to identify and mark spam

 DISTNAME=	mimedefang-2.71
-REVISION=	2
+REVISION=	3
 CATEGORIES=	mail

 HOMEPAGE=	http://www.mimedefang.org/
--- a/mail/mimedefang/pkg/mimedefang_daemon.rc
+++ b/mail/mimedefang/pkg/mimedefang_daemon.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: mimedefang_daemon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mimedefang_daemon.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/mimedefang"
 daemon_flags="-U _mdefang -p /var/run/mdefang/mimedefang.socket -m /var/run/mdefang/multiplexor.socket"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/mail/mimedefang/pkg/mimedefang_multiplexor.rc
+++ b/mail/mimedefang/pkg/mimedefang_multiplexor.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: mimedefang_multiplexor.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mimedefang_multiplexor.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/mimedefang-multiplexor"
 daemon_flags="-U _mdefang -l -p /var/run/mdefang/multiplexor.pid -s /var/run/mdefang/multiplexor.socket"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_pre() {
 	install -d -o _mdefang -g _mdefang /var/run/mdefang
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.69 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.70 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=		mailfilter to identify and mark spam

 VER=			3.3.1
 DISTNAME=		Mail-SpamAssassin-${VER}
 PKGNAME=		p5-${DISTNAME:S/-rc/rc/}
-REVISION=		5
+REVISION=		6
 RULESNAME=		Mail-SpamAssassin-rules-${VER}.r923114
 CATEGORIES=		mail perl5

--- a/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
+++ b/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: spamassassin.rc,v 1.2 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: spamassassin.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/spamd"
 daemon_flags="-d -u _spamdaemon -P"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="perl: ${daemon} ${daemon_flags}"

--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.44 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	sendmail milter to scan messages for viruses and spam

 DISTNAME=	smtp-vilter-1.3.6
-REVISION=	9
+REVISION=	10

 CATEGORIES=    	mail

--- a/mail/smtp-vilter/pkg/smtp_vilter.rc
+++ b/mail/smtp-vilter/pkg/smtp_vilter.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: smtp_vilter.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: smtp_vilter.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/smtp-vilter"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="smtp-vilter:"

--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/12/27 14:50:23 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=	1
+REVISION-main=	2

 CATEGORIES=	mail www productivity

--- a/mail/zarafa/zarafa/pkg/zarafa.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa.rc,v 1.5 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa.rc,v 1.6 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="/bin/true"

-rc_conf
+. /etc/rc.d/rc.subr

 _zarafa_daemons="server spooler monitor gateway ical"

--- a/mail/zarafa/zarafa/pkg/zarafa_gateway.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_gateway.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_gateway.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa_gateway.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/zarafa-gateway"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/mail/zarafa/zarafa/pkg/zarafa_ical.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_ical.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_ical.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa_ical.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/zarafa-ical"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/mail/zarafa/zarafa/pkg/zarafa_monitor.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_monitor.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_monitor.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa_monitor.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/zarafa-monitor"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/mail/zarafa/zarafa/pkg/zarafa_server.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_server.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_server.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa_server.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/zarafa-server"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_pre() {
 	i=1
--- a/mail/zarafa/zarafa/pkg/zarafa_spooler.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa_spooler.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa_spooler.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zarafa_spooler.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/zarafa-spooler"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/misc/srcpd/Makefile
+++ b/misc/srcpd/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT =	daemon to control digital model railroad systems

 DISTNAME =	srcpd-2.1.1
 CATEGORIES =	misc net
-REVISION =	1
+REVISION =	2

 HOMEPAGE =	http://srcpd.sourceforge.net/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=srcpd/}
--- a/misc/srcpd/pkg/srcpd.rc
+++ b/misc/srcpd/pkg/srcpd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: srcpd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: srcpd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/srcpd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_stop() {
 	pkill -9 -f "^${pexp}"
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT =	Audit Record Generation and Utilization System

 DISTNAME =	argus-3.0.2
-REVISION =	3
+REVISION =	4
 CATEGORIES =	net

 HOMEPAGE =	http://qosient.com/argus/
--- a/net/argus/pkg/argus.rc
+++ b/net/argus/pkg/argus.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: argus.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: argus.rc,v 1.5 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/argus"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.47 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT-main=	framework for Multicast DNS Service Discovery
 COMMENT-gtk=	GUI client utilities for avahi
@ -16,7 +16,7 @@ PKGNAME-mono=	mono-avahi-${V}
 PKGNAME-qt3=	avahi-qt3-${V}
 PKGNAME-qt4=	avahi-qt4-${V}

-REVISION-main=	0
+REVISION-main=	1

 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>

--- a/net/avahi/pkg/avahi_daemon.rc
+++ b/net/avahi/pkg/avahi_daemon.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: avahi_daemon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: avahi_daemon.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/avahi-daemon"
 daemon_flags="-D"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_check() {
 	${daemon} --check
--- a/net/avahi/pkg/avahi_dnsconfd.rc
+++ b/net/avahi/pkg/avahi_dnsconfd.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: avahi_dnsconfd.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: avahi_dnsconfd.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/avahi-dnsconfd"
 daemon_flags="-D"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_check() {
 	${daemon} --check
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT=		Dynamic DNS service update client

-REVISION=		2
+REVISION=		3
 DISTNAME=		ddclient-3.8.0
 CATEGORIES=		net

--- a/net/ddclient/pkg/ddclient.rc
+++ b/net/ddclient/pkg/ddclient.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: ddclient.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: ddclient.rc,v 1.3 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/ddclient"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="perl: ddclient"

--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT=	server for streaming various media formats

 DISTNAME=	icecast-2.3.2
-REVISION =	3
+REVISION =	4
 CATEGORIES=	net audio

 HOMEPAGE=	http://www.icecast.org/
--- a/net/icecast/pkg/icecast.rc
+++ b/net/icecast/pkg/icecast.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: icecast.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: icecast.rc,v 1.4 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/icecast"
 daemon_flags="-b -c /var/icecast/icecast.xml"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/net/ircd-hybrid/Makefile
+++ b/net/ircd-hybrid/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/12/27 14:50:22 ajacoutot Exp $

 SHARED_ONLY =	Yes

 COMMENT =	Internet Relay Chat server

 DISTNAME =	ircd-hybrid-7.2.3
-REVISION =	9
+REVISION =	10
 CATEGORIES =	net

 HOMEPAGE =	http://ircd-hybrid.com/
--- a/net/ircd-hybrid/pkg/ircd_hybrid.rc
+++ b/net/ircd-hybrid/pkg/ircd_hybrid.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: ircd_hybrid.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: ircd_hybrid.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/ircd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_pre() {
 	install -d -o _ircd-hybrid -g _ircd-hybrid /var/run/ircd
--- a/net/ircd-ratbox/Makefile
+++ b/net/ircd-ratbox/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/12/27 14:50:23 ajacoutot Exp $

 SHARED_ONLY =	Yes
 COMMENT =	advanced, stable and fast irc server

 DISTNAME =	ircd-ratbox-3.0.6
 CATEGORIES =	net
-REVISION =	3
+REVISION =	4

 EXTRACT_SUFX =	.tar.bz2

--- a/net/ircd-ratbox/pkg/ircd_ratbox.rc
+++ b/net/ircd-ratbox/pkg/ircd_ratbox.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: ircd_ratbox.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: ircd_ratbox.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/ircd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_pre() {
 	install -d -o _ircd-ratbox -g _ircd-ratbox /var/run/ircd-ratbox
--- a/net/mon/server/Makefile
+++ b/net/mon/server/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT =	service monitoring daemon

 DISTNAME = 	mon-${V}
-REVISION =	4
+REVISION =	5

 WANTLIB = 	c

--- a/net/mon/server/pkg/mon.rc
+++ b/net/mon/server/pkg/mon.rc
@ -1,14 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: mon.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mon.rc,v 1.5 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/mon"
 daemon_flags="-c ${SYSCONFDIR}/mon/mon.cf -f -P /var/run/mon/mon.pid"
 daemon_user="_mon"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="/usr/bin/perl ${daemon}${daemon_flags}"
 rc_reload=NO
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.73 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.74 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	multi-router traffic grapher

 DISTNAME=	mrtg-2.17.0
 CATEGORIES=	net

-REVISION=	0
+REVISION=	1

 HOMEPAGE=	http://oss.oetiker.ch/mrtg/

--- a/net/mrtg/pkg/mrtg.rc
+++ b/net/mrtg/pkg/mrtg.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: mrtg.rc,v 1.2 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: mrtg.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $

 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
+. /etc/rc.d/rc.subr

 pexp="/usr/bin/perl -w ${daemon} ${daemon_flags}"

--- a/net/munin/Makefile
+++ b/net/munin/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2010/12/27 14:50:22 ajacoutot Exp $

 COMMENT-main =	flexible network host monitoring, client
 COMMENT-server =flexible network host monitoring, server
@ -7,7 +7,7 @@ V =		1.4.5
 DISTNAME =	munin-$V
 PKGNAME-main =	munin-node-$V
 PKGNAME-server =munin-server-$V
-REVISION-main = 3
+REVISION-main = 4
 REVISION-server = 0
 CATEGORIES =	net

--- a/net/munin/pkg/munin_node.rc
+++ b/net/munin/pkg/munin_node.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: munin_node.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: munin_node.rc,v 1.4 2010/12/27 14:50:22 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/munin-node"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="perl: ${daemon}"

--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.50 2010/12/27 14:50:23 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=	3
+REVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://archive.ntp.org/ntp4/ntp-4.2/

--- a/net/ntp/pkg/ntpd.rc
+++ b/net/ntp/pkg/ntpd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: ntpd.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: ntpd.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/ntpd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	UPnP A/V media server

 DISTNAME=	ushare-1.1a
-REVISION=	2
+REVISION=	3
 EXTRACT_SUFX=	.tar.bz2

 CATEGORIES=	net multimedia
--- a/net/ushare/pkg/ushare.rc
+++ b/net/ushare/pkg/ushare.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: ushare.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: ushare.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/ushare"
 daemon_flags="-D"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT = 	network traffic monitor

 DISTNAME = 	vnstat-1.10
 CATEGORIES = 	net sysutils

-REVISION = 	2
+REVISION = 	3

 HOMEPAGE = 	http://humdi.net/vnstat/

--- a/net/vnstat/pkg/vnstatd.rc
+++ b/net/vnstat/pkg/vnstatd.rc
@ -1,14 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: vnstatd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: vnstatd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/vnstatd"
 daemon_flags="-d"
 daemon_user="_vnstat"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_pre() {
 	/usr/bin/install -d -o _vnstat /var/run/vnstat
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2010/12/24 10:40:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.44 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@ -13,8 +13,8 @@ FULLPKGNAME-web =	zabbix-web-${VERSION}
 FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net

-REVISION-main =		9
-REVISION-server =	8
+REVISION-main =		10
+REVISION-server =	9
 REVISION-web =		3

 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
--- a/net/zabbix/pkg/zabbix_agentd.rc
+++ b/net/zabbix/pkg/zabbix_agentd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_agentd.rc,v 1.3 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zabbix_agentd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/zabbix_agentd"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="zabbix_agentd: main process"
 rc_reload=NO
--- a/net/zabbix/pkg/zabbix_proxy.rc
+++ b/net/zabbix/pkg/zabbix_proxy.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_proxy.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zabbix_proxy.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/zabbix_proxy"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="zabbix_proxy: heartbeat sender"
 rc_reload=NO
--- a/net/zabbix/pkg/zabbix_server.rc
+++ b/net/zabbix/pkg/zabbix_server.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_server.rc,v 1.4 2010/12/24 10:40:05 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: zabbix_server.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/zabbix_server"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="zabbix_server: main process"
 rc_reload=NO
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.92 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	Common Unix Printing System

@ -6,7 +6,7 @@ VERSION=	1.4.5
 DISTNAME=	cups-${VERSION}-source
 PKGNAME=	cups-${VERSION}

-REVISION=	3
+REVISION=	4

 # Allow both ulpt(4) and libusb based backends to work together.
 # See http://www.cups.org/str.php?L3357
--- a/print/cups/pkg/cupsd.rc
+++ b/print/cups/pkg/cupsd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: cupsd.rc,v 1.5 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: cupsd.rc,v 1.6 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/cupsd"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="${daemon} -C ${SYSCONFDIR}/cups/cupsd.conf"

--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.63 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.64 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=		virus scanner
 DISTNAME=		clamav-0.96.5

-REVISION=		1
+REVISION=		2

 CATEGORIES=		security
 SHARED_LIBS=		clamav 17.0 \
--- a/security/clamav/pkg/clamav_daemon.rc
+++ b/security/clamav/pkg/clamav_daemon.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_daemon.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: clamav_daemon.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/clamd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/security/clamav/pkg/clamav_freshclam.rc
+++ b/security/clamav/pkg/clamav_freshclam.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_freshclam.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: clamav_freshclam.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/freshclam"
 daemon_flags="-d"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.56 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.57 2010/12/27 14:50:23 ajacoutot Exp $

 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)

 DISTNAME=	cyrus-sasl-2.1.23
-REVISION=	4
+REVISION=	5

 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
--- a/security/cyrus-sasl2/pkg/saslauthd.rc
+++ b/security/cyrus-sasl2/pkg/saslauthd.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: saslauthd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: saslauthd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/saslauthd"
 daemon_flags="-a getpwent"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/12/27 14:50:23 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=		1
+REVISION=		2

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}	
 HOMEPAGE=		http://smartmontools.sourceforge.net/ 
--- a/sysutils/smartmontools/pkg/smartd.rc
+++ b/sysutils/smartmontools/pkg/smartd.rc
@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: smartd.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: smartd.rc,v 1.4 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/smartd"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/12/27 14:50:24 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=	1
+REVISION-main=	2

 SHARED_LIBS =	cherokee-base		0.0 \
 		cherokee-client		0.0 \
--- a/www/cherokee/pkg/cherokee.rc
+++ b/www/cherokee/pkg/cherokee.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: cherokee.rc,v 1.2 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: cherokee.rc,v 1.3 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/cherokee"
 daemon_flags="-d"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="${daemon}[^-]"

--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2010/12/27 14:50:24 ajacoutot Exp $

 COMMENT=	robust and small HTTP server and mail proxy server

 DISTNAME=	nginx-0.8.53
 CATEGORIES=	www

-REVISION=	4
+REVISION=	5

 HOMEPAGE=	http://nginx.net/

--- a/www/nginx/pkg/nginx.rc
+++ b/www/nginx/pkg/nginx.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: nginx.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: nginx.rc,v 1.5 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/nginx"

-rc_conf
+. /etc/rc.d/rc.subr

 pexp="nginx:.*master.*process"

--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/12/27 14:50:24 ajacoutot Exp $

 COMMENT=	HTTP caching proxy

 DISTNAME=	polipo-1.0.4.1
 CATEGORIES=	www
-REVISION=	4
+REVISION=	5

 HOMEPAGE=	http://www.pps.jussieu.fr/~jch/software/polipo/

--- a/www/polipo/pkg/polipo.rc
+++ b/www/polipo/pkg/polipo.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: polipo.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: polipo.rc,v 1.5 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/polipo"
 daemon_flags="daemonise=yes"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_reload=NO

--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/27 14:50:24 ajacoutot Exp $

 COMMENT = 	web based groupware server

-REVISION =	2
+REVISION =	3
 VERSION =	1.3.4
 DISTNAME =	SOGo-${VERSION}
 PKGNAME =	sogo-${VERSION}
--- a/www/sogo/pkg/sogod.rc
+++ b/www/sogo/pkg/sogod.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: sogod.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: sogod.rc,v 1.4 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/sogod"
 daemon_user="_sogo"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_cmd $1
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.113 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.114 2010/12/27 14:50:24 ajacoutot Exp $

 COMMENT=	WWW and FTP proxy cache and accelerator

 DISTNAME=	squid-2.7.STABLE9
-REVISION=	4
+REVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/Versions/v2/2.7/
 DIST_SUBDIR=	squid
--- a/www/squid/pkg/squid.rc
+++ b/www/squid/pkg/squid.rc
@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# $OpenBSD: squid.rc,v 1.3 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: squid.rc,v 1.4 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/sbin/squid"

-rc_conf
+. /etc/rc.d/rc.subr

 rc_stop() {
 	${daemon} -k shutdown
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.57 2010/12/27 14:50:24 ajacoutot Exp $

 # XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a
 # temporary workaround until PIE works.
@ -8,7 +8,7 @@ COMMENT=	message bus system
 DISTNAME=	dbus-1.4.1
 EPOCH=		0

-REVISION=	0
+REVISION=	1

 SHARED_LIBS +=	dbus-1	9.0 # .8.2
 CATEGORIES=	x11
--- a/x11/dbus/pkg/dbus_daemon.rc
+++ b/x11/dbus/pkg/dbus_daemon.rc
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: dbus_daemon.rc,v 1.5 2010/12/16 07:13:59 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: dbus_daemon.rc,v 1.6 2010/12/27 14:50:24 ajacoutot Exp $

 daemon="${TRUEPREFIX}/bin/dbus-daemon"
 daemon_flags="--system"

+. /etc/rc.d/rc.subr
+
 rc_pre() {
 	rm -f /var/run/dbus/pid
 	install -d -o _dbus -g _dbus /var/run/dbus
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.97 2010/12/27 14:50:24 ajacoutot Exp $

 SHARED_ONLY=		Yes

@ -7,7 +7,7 @@ COMMENT=		GNOME display manager
 GNOME_PROJECT=		gdm
 GNOME_VERSION=		2.20.11

-REVISION=		16
+REVISION=		17

 HOMEPAGE=		http://projects.gnome.org/gdm/

--- a/x11/gnome/gdm/pkg/gdm.rc
+++ b/x11/gnome/gdm/pkg/gdm.rc
@ -1,10 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: gdm.rc,v 1.8 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: gdm.rc,v 1.9 2010/12/27 14:50:24 ajacoutot Exp $
+
+daemon="${TRUEPREFIX}/sbin/gdm"

 . /etc/rc.d/rc.subr

-daemon="${TRUEPREFIX}/sbin/gdm"
 pexp="${TRUEPREFIX}/sbin/gdm-binary"
 rc_reload=NO

--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2010/12/24 10:40:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/12/27 14:50:24 ajacoutot Exp $

 COMMENT =		VNC server for real X displays

 DISTNAME =		x11vnc-0.9.12

-REVISION =		3
+REVISION =		4

 CATEGORIES =		x11
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/
--- a/x11/x11vnc/pkg/x11vnc.rc
+++ b/x11/x11vnc/pkg/x11vnc.rc
@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: x11vnc.rc,v 1.4 2010/12/24 10:40:06 ajacoutot Exp $
-
-. /etc/rc.d/rc.subr
+# $OpenBSD: x11vnc.rc,v 1.5 2010/12/27 14:50:24 ajacoutot Exp $

 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
+. /etc/rc.d/rc.subr

 rc_reload=NO