Remove manually crafted rc_start and use daemon_flags for the same effect.

mail/archiveopteryx/Makefile

@@ -2,7 +2,7 @@ COMMENT =		mail server storing messages in a database
 
 DISTNAME =		archiveopteryx-3.2.0
 CATEGORIES =		mail databases
-REVISION =		4
+REVISION =		5
 
 HOMEPAGE =		http://www.archiveopteryx.org/
 

mail/archiveopteryx/pkg/aox.rc

@@ -1,16 +1,13 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/bin/aox"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${TRUEPREFIX}/sbin/archiveopteryx -f"
 rc_reload=NO
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }

mail/courier-authlib/Makefile

@@ -11,7 +11,7 @@ PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
 PKGNAME-pgsql=		${DISTNAME:S/lib-/lib-pgsql-/}
 PKGNAME-userdb=		${DISTNAME:S/lib-/lib-userdb-/}
 
-REVISION-main=		0
+REVISION-main=		1
 
 SHARED_LIBS +=  courierauth          1.0      # .0.0
 SHARED_LIBS +=  courierauthsasl      1.0      # .0.0

mail/courier-authlib/pkg/courier_authdaemond.rc

@@ -1,14 +1,14 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/sbin/authdaemond"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${TRUEPREFIX}/sbin/courierlogger .* -start ${TRUEPREFIX}/libexec/courier-authlib/authdaemond"
 
-rc_start() {
+rc_pre() {
 	mkdir -p /var/run/courier{,-auth}/
-	rc_exec "${daemon} start"
 }
 
 rc_stop() {

mail/courier-imap/Makefile

@@ -7,8 +7,8 @@ PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-pop3=	courier-pop3-${V}
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
 
-REVISION-main=		1
-REVISION-pop3=		1
+REVISION-main=		2
+REVISION-pop3=		2
 
 CATEGORIES=		mail
 

mail/courier-imap/pkg/courier_imap.rc

@@ -1,15 +1,12 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/libexec/imapd.rc"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=imapd .*"
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }

mail/courier-imap/pkg/courier_imap_ssl.rc

@@ -1,15 +1,12 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=imapd-ssl .*"
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }

mail/courier-imap/pkg/courier_pop3.rc

@@ -1,15 +1,12 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/libexec/pop3d.rc"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=pop3d .*"
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }

mail/courier-imap/pkg/courier_pop3_ssl.rc

@@ -1,15 +1,12 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=pop3d-ssl .*"
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }

mail/sympa/Makefile

@@ -2,7 +2,7 @@ COMMENT =	mailing list manager with web interface
 
 VERSION =	6.2.16
 DISTNAME =	sympa-${VERSION}
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	mail www
 

mail/sympa/pkg/sympa.rc

@@ -1,14 +1,14 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/sbin/sympa"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
 rc_reload=NO
 
-rc_start() {
+rc_pre() {
 	rm -f /var/spool/lock/sympa
-	rc_exec "${daemon} start"
 }
 
 rc_stop() {

net/kea/Makefile

@@ -5,7 +5,7 @@ PORTROACH=	limitw:1,even
 
 DISTNAME=	kea-${VERSION}
 PKGNAME-main=	kea-${VERSION:S/-P/pl/}
-REVISION=	0
+REVISION=	1
 
 .for i in kea-asiodns kea-asiolink kea-cc kea-cfgclient kea-cryptolink \
     kea-d2srv kea-database kea-dhcp++ kea-dhcp_ddns kea-dhcpsrv kea-dns++ \

net/kea/pkg/kea.rc

@@ -1,6 +1,7 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/sbin/keactrl"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
@@ -12,10 +13,6 @@ rc_pre() {
 	fi
 }
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_reload() {
 	${daemon} reload
 }

security/opendnssec/Makefile

@@ -1,7 +1,7 @@
 COMMENT=	open-source turn-key solution for DNSSEC
 
 DISTNAME=	opendnssec-2.1.10
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	security
 

security/opendnssec/pkg/opendnssec.rc

@@ -1,6 +1,7 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/sbin/ods-control"
+daemon_flags="start"
 
 . /etc/rc.d/rc.subr
 
@@ -12,10 +13,6 @@ rc_pre() {
 	install -d -o _opendnssec /var/run/opendnssec/
 }
 
-rc_start() {
-	rc_exec "${daemon} start"
-}
-
 rc_stop() {
 	${daemon} stop
 }