From 4043dab9ccf32ca82b7e7b557355a58efd079394 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 21 May 2022 11:16:52 +0000 Subject: [PATCH] Remove manually crafted rc_start and use daemon_flags for the same effect. --- mail/archiveopteryx/Makefile | 2 +- mail/archiveopteryx/pkg/aox.rc | 5 +---- mail/courier-authlib/Makefile | 2 +- mail/courier-authlib/pkg/courier_authdaemond.rc | 4 ++-- mail/courier-imap/Makefile | 4 ++-- mail/courier-imap/pkg/courier_imap.rc | 5 +---- mail/courier-imap/pkg/courier_imap_ssl.rc | 5 +---- mail/courier-imap/pkg/courier_pop3.rc | 5 +---- mail/courier-imap/pkg/courier_pop3_ssl.rc | 5 +---- mail/sympa/Makefile | 2 +- mail/sympa/pkg/sympa.rc | 4 ++-- net/kea/Makefile | 2 +- net/kea/pkg/kea.rc | 5 +---- security/opendnssec/Makefile | 2 +- security/opendnssec/pkg/opendnssec.rc | 5 +---- 15 files changed, 18 insertions(+), 39 deletions(-) diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index e53f2d454d8..d59859971ca 100644 --- a/mail/archiveopteryx/Makefile +++ b/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/ diff --git a/mail/archiveopteryx/pkg/aox.rc b/mail/archiveopteryx/pkg/aox.rc index 4c12a72f303..3e965a17335 100644 --- a/mail/archiveopteryx/pkg/aox.rc +++ b/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 } diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile index 810cf911ba0..42b31b283b2 100644 --- a/mail/courier-authlib/Makefile +++ b/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 diff --git a/mail/courier-authlib/pkg/courier_authdaemond.rc b/mail/courier-authlib/pkg/courier_authdaemond.rc index 6a2ee646800..e7c88798246 100644 --- a/mail/courier-authlib/pkg/courier_authdaemond.rc +++ b/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() { diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 485f7157cb3..77551690cfc 100644 --- a/mail/courier-imap/Makefile +++ b/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 diff --git a/mail/courier-imap/pkg/courier_imap.rc b/mail/courier-imap/pkg/courier_imap.rc index 0befc2cf4bf..1999ae2fecd 100644 --- a/mail/courier-imap/pkg/courier_imap.rc +++ b/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 } diff --git a/mail/courier-imap/pkg/courier_imap_ssl.rc b/mail/courier-imap/pkg/courier_imap_ssl.rc index bec52e37a2b..71cc6496e17 100644 --- a/mail/courier-imap/pkg/courier_imap_ssl.rc +++ b/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 } diff --git a/mail/courier-imap/pkg/courier_pop3.rc b/mail/courier-imap/pkg/courier_pop3.rc index d82240084d7..eb3411b5885 100644 --- a/mail/courier-imap/pkg/courier_pop3.rc +++ b/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 } diff --git a/mail/courier-imap/pkg/courier_pop3_ssl.rc b/mail/courier-imap/pkg/courier_pop3_ssl.rc index 110fbcbeb9d..4b10bb0a9e7 100644 --- a/mail/courier-imap/pkg/courier_pop3_ssl.rc +++ b/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 } diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 266d1d72098..f52695b8bcf 100644 --- a/mail/sympa/Makefile +++ b/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 diff --git a/mail/sympa/pkg/sympa.rc b/mail/sympa/pkg/sympa.rc index 6f9883b30e0..b7021754fab 100644 --- a/mail/sympa/pkg/sympa.rc +++ b/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() { diff --git a/net/kea/Makefile b/net/kea/Makefile index 243573ce537..9ec1a1d58fc 100644 --- a/net/kea/Makefile +++ b/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++ \ diff --git a/net/kea/pkg/kea.rc b/net/kea/pkg/kea.rc index 5be236334fb..056f395e3b8 100644 --- a/net/kea/pkg/kea.rc +++ b/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 } diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 007834130c2..a86827e6881 100644 --- a/security/opendnssec/Makefile +++ b/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 diff --git a/security/opendnssec/pkg/opendnssec.rc b/security/opendnssec/pkg/opendnssec.rc index 101c865f08d..1246cd009d3 100644 --- a/security/opendnssec/pkg/opendnssec.rc +++ b/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 }