From 9e45440fb291f90e4e05dab602a70c9b2d1280d1 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 21 May 2022 10:50:49 +0000 Subject: [PATCH] Use the rc_exec function instead of ${rcexec}. --- databases/postgresql/Makefile | 1 + databases/postgresql/pkg/postgresql.rc | 10 +++++----- databases/riak/Makefile | 2 +- databases/riak/pkg/riak.rc | 6 +++--- databases/web2ldap/Makefile | 1 + databases/web2ldap/pkg/web2ldap.rc | 2 +- devel/py-buildbot/buildbot/Makefile | 2 +- devel/py-buildbot/buildbot/pkg/buildbot.rc | 2 +- geo/traccar/Makefile | 2 +- geo/traccar/pkg/traccar.rc | 2 +- mail/archiveopteryx/Makefile | 2 +- mail/archiveopteryx/pkg/aox.rc | 2 +- mail/courier-authlib/Makefile | 2 ++ mail/courier-authlib/pkg/courier_authdaemond.rc | 2 +- mail/courier-imap/Makefile | 4 +++- mail/courier-imap/pkg/courier_imap.rc | 2 +- mail/courier-imap/pkg/courier_imap_ssl.rc | 2 +- mail/courier-imap/pkg/courier_pop3.rc | 2 +- mail/courier-imap/pkg/courier_pop3_ssl.rc | 2 +- mail/sympa/Makefile | 2 +- mail/sympa/pkg/sympa.rc | 2 +- net/gmid/Makefile | 1 + net/gmid/pkg/gmid.rc | 4 ++-- net/go-ipfs/Makefile | 1 + net/go-ipfs/pkg/go_ipfs.rc | 2 +- net/i2p/Makefile | 1 + net/i2p/pkg/i2p.rc | 4 ++-- net/kea/Makefile | 1 + net/kea/pkg/kea.rc | 2 +- net/mfi/Makefile | 2 +- net/mfi/pkg/mfi.rc | 2 +- net/nfsen/Makefile | 2 +- net/nfsen/pkg/nfsen.rc | 2 +- net/rabbitmq/Makefile | 2 +- net/rabbitmq/pkg/rabbitmq.rc | 2 +- net/synapse/Makefile | 1 + net/synapse/pkg/synapse.rc | 2 +- net/unifi/5.14/Makefile | 2 +- net/unifi/5.14/pkg/unifi.rc | 2 +- net/unifi/5.6/Makefile | 2 +- net/unifi/5.6/pkg/unifi.rc | 2 +- net/unifi/6.0/Makefile | 2 +- net/unifi/6.0/pkg/unifi.rc | 2 +- net/unifi/main/Makefile | 1 + net/unifi/main/pkg/unifi.rc | 2 +- print/cups/Makefile | 4 ++-- print/cups/pkg/cupsd.rc | 4 ++-- security/opendnssec/Makefile | 2 +- security/opendnssec/pkg/opendnssec.rc | 2 +- security/ossec-hids/Makefile | 2 +- security/ossec-hids/pkg/ossec_hids.rc | 2 +- security/vaultwarden/Makefile | 1 + security/vaultwarden/pkg/vaultwarden.rc | 2 +- sysutils/riemann/Makefile | 2 +- sysutils/riemann/pkg/riemann.rc | 2 +- telephony/asterisk/16/Makefile | 1 + telephony/asterisk/16/pkg/asterisk.rc | 2 +- telephony/asterisk/18/Makefile | 1 + telephony/asterisk/18/pkg/asterisk.rc | 2 +- telephony/asterisk/19/Makefile | 1 + telephony/asterisk/19/pkg/asterisk.rc | 2 +- telephony/kamailio/Makefile | 2 ++ telephony/kamailio/pkg/kamailio.rc | 4 ++-- textproc/solr/Makefile | 2 +- textproc/solr/pkg/solr.rc | 2 +- www/apertium-apy/Makefile | 2 +- www/apertium-apy/pkg/apertium_apy.rc | 2 +- www/gotosocial/Makefile | 1 + www/gotosocial/pkg/gotosocial.rc | 2 +- www/puppetboard/Makefile | 1 + www/puppetboard/pkg/puppetboard.rc | 2 +- www/sthttpd/Makefile | 1 + www/sthttpd/pkg/thttpd.rc | 2 +- www/tomcat/v10/Makefile | 1 + www/tomcat/v10/pkg/tomcat.rc | 2 +- www/tomcat/v7/Makefile | 1 + www/tomcat/v7/pkg/tomcat.rc | 2 +- www/tomcat/v8/Makefile | 1 + www/tomcat/v8/pkg/tomcat.rc | 2 +- www/tomcat/v9/Makefile | 1 + www/tomcat/v9/pkg/tomcat.rc | 2 +- www/vnu/Makefile | 2 +- www/vnu/pkg/vnu.rc | 2 +- 83 files changed, 98 insertions(+), 73 deletions(-) diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 55b8c0245c8..f427f413373 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -9,6 +9,7 @@ VERSION= 14.3 PREV_MAJOR= 13 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} +REVISION-server=0 DPB_PROPERTIES= parallel diff --git a/databases/postgresql/pkg/postgresql.rc b/databases/postgresql/pkg/postgresql.rc index 1a3a19951ac..c9ec697319f 100644 --- a/databases/postgresql/pkg/postgresql.rc +++ b/databases/postgresql/pkg/postgresql.rc @@ -10,20 +10,20 @@ daemon_timeout=300 rc_usercheck=NO rc_check() { - ${rcexec} "${daemon} status ${daemon_flags}" + rc_exec "${daemon} status ${daemon_flags}" } rc_reload() { - ${rcexec} "${daemon} reload ${daemon_flags}" + rc_exec "${daemon} reload ${daemon_flags}" } rc_start() { - ${rcexec} "${daemon} start ${daemon_flags}" + rc_exec "${daemon} start ${daemon_flags}" } rc_stop() { - ${rcexec} "${daemon} stop ${daemon_flags} -m fast" || \ - ${rcexec} "${daemon} stop ${daemon_flags} -m immediate" + rc_exec "${daemon} stop ${daemon_flags} -m fast" || \ + rc_exec "${daemon} stop ${daemon_flags} -m immediate" } rc_cmd $1 diff --git a/databases/riak/Makefile b/databases/riak/Makefile index 2facfc8b774..1916b7e6c71 100644 --- a/databases/riak/Makefile +++ b/databases/riak/Makefile @@ -6,7 +6,7 @@ COMMENT= distributed data store DISTNAME= riak-2.2.5 CATEGORIES= databases HOMEPAGE= http://basho.com/ -REVISION= 1 +REVISION= 2 MAINTAINER= Jonathan Matthew diff --git a/databases/riak/pkg/riak.rc b/databases/riak/pkg/riak.rc index 86030c6283d..f8debe97bbf 100644 --- a/databases/riak/pkg/riak.rc +++ b/databases/riak/pkg/riak.rc @@ -9,15 +9,15 @@ rc_reload=NO rc_usercheck=NO rc_check() { - ${rcexec} "${daemon} ping" + rc_exec "${daemon} ping" } rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { - ${rcexec} "${daemon} stop" + rc_exec "${daemon} stop" } rc_cmd $1 diff --git a/databases/web2ldap/Makefile b/databases/web2ldap/Makefile index be20f8e6ded..f13495b4a91 100644 --- a/databases/web2ldap/Makefile +++ b/databases/web2ldap/Makefile @@ -2,6 +2,7 @@ COMMENT = full-featured LDAP client running as web application MODPY_EGG_VERSION = 1.7.7 DISTNAME = web2ldap-${MODPY_EGG_VERSION} +REVISION = 0 CATEGORIES = databases www sysutils diff --git a/databases/web2ldap/pkg/web2ldap.rc b/databases/web2ldap/pkg/web2ldap.rc index 3ec38361a10..f94766d739b 100755 --- a/databases/web2ldap/pkg/web2ldap.rc +++ b/databases/web2ldap/pkg/web2ldap.rc @@ -9,7 +9,7 @@ rc_reload=NO rc_bg=YES rc_start() { - ${rcexec} "${daemon}" + rc_exec "${daemon}" } pexp="${MODPY_BIN} ${daemon}" diff --git a/devel/py-buildbot/buildbot/Makefile b/devel/py-buildbot/buildbot/Makefile index 0739e725394..f66911c460c 100644 --- a/devel/py-buildbot/buildbot/Makefile +++ b/devel/py-buildbot/buildbot/Makefile @@ -2,7 +2,7 @@ COMMENT = continuous integration framework DISTNAME = buildbot-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME} -REVISION = 0 +REVISION = 1 RUN_DEPENDS = databases/py-sqlalchemy${MODPY_FLAVOR} \ databases/py-alembic${MODPY_FLAVOR} \ diff --git a/devel/py-buildbot/buildbot/pkg/buildbot.rc b/devel/py-buildbot/buildbot/pkg/buildbot.rc index 1fe12856df2..2975d5de6cf 100644 --- a/devel/py-buildbot/buildbot/pkg/buildbot.rc +++ b/devel/py-buildbot/buildbot/pkg/buildbot.rc @@ -9,7 +9,7 @@ daemon_user="_buildbot" pexp="${MODPY_BIN} .*logfile=twistd.log --python=buildbot.tac" rc_start() { - ${rcexec} "${daemon} start ${daemon_flags}" + rc_exec "${daemon} start ${daemon_flags}" } rc_reload() { diff --git a/geo/traccar/Makefile b/geo/traccar/Makefile index e836e05f2d6..40bded7b73c 100644 --- a/geo/traccar/Makefile +++ b/geo/traccar/Makefile @@ -1,6 +1,6 @@ COMMENT = modern GPS tracking platform V = 4.15 -REVISION = 0 +REVISION = 1 PKGNAME = traccar-${V} DISTNAME = traccar-other-${V} EXTRACT_SUFX = .zip diff --git a/geo/traccar/pkg/traccar.rc b/geo/traccar/pkg/traccar.rc index ca6e2211de8..85b2b9d4a91 100644 --- a/geo/traccar/pkg/traccar.rc +++ b/geo/traccar/pkg/traccar.rc @@ -11,7 +11,7 @@ rc_bg=YES rc_reload=NO rc_start() { - ${rcexec} "${java} ${daemon_flags} -XX:-UsePerfData -jar ${daemon} /etc/traccar/traccar.xml" + rc_exec "${java} ${daemon_flags} -XX:-UsePerfData -jar ${daemon} /etc/traccar/traccar.xml" } rc_cmd $1 diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index 369dd1a1fd5..e53f2d454d8 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 = 3 +REVISION = 4 HOMEPAGE = http://www.archiveopteryx.org/ diff --git a/mail/archiveopteryx/pkg/aox.rc b/mail/archiveopteryx/pkg/aox.rc index 983702f1d74..4c12a72f303 100644 --- a/mail/archiveopteryx/pkg/aox.rc +++ b/mail/archiveopteryx/pkg/aox.rc @@ -8,7 +8,7 @@ pexp="${TRUEPREFIX}/sbin/archiveopteryx -f" rc_reload=NO rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile index c2959c9f36c..810cf911ba0 100644 --- a/mail/courier-authlib/Makefile +++ b/mail/courier-authlib/Makefile @@ -11,6 +11,8 @@ PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/} PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/} PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/} +REVISION-main= 0 + SHARED_LIBS += courierauth 1.0 # .0.0 SHARED_LIBS += courierauthsasl 1.0 # .0.0 SHARED_LIBS += courierauthsaslclient 0.0 # .0.0 diff --git a/mail/courier-authlib/pkg/courier_authdaemond.rc b/mail/courier-authlib/pkg/courier_authdaemond.rc index 718eed3d563..6a2ee646800 100644 --- a/mail/courier-authlib/pkg/courier_authdaemond.rc +++ b/mail/courier-authlib/pkg/courier_authdaemond.rc @@ -8,7 +8,7 @@ pexp="${TRUEPREFIX}/sbin/courierlogger .* -start ${TRUEPREFIX}/libexec/courier-a rc_start() { mkdir -p /var/run/courier{,-auth}/ - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 7de09298c7a..485f7157cb3 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -3,11 +3,13 @@ COMMENT-pop3= pop3 server for maildir format mailboxes V= 5.1.7 DISTNAME= courier-imap-${V} -REVISION= 0 PKGNAME-main= ${DISTNAME} FULLPKGNAME-pop3= courier-pop3-${V} FULLPKGPATH-pop3= mail/courier-imap,-pop3 +REVISION-main= 1 +REVISION-pop3= 1 + CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} diff --git a/mail/courier-imap/pkg/courier_imap.rc b/mail/courier-imap/pkg/courier_imap.rc index ed2bb315f69..0befc2cf4bf 100644 --- a/mail/courier-imap/pkg/courier_imap.rc +++ b/mail/courier-imap/pkg/courier_imap.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/libexec/imapd.rc" pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=imapd .*" rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/courier-imap/pkg/courier_imap_ssl.rc b/mail/courier-imap/pkg/courier_imap_ssl.rc index 7219ed5ee89..bec52e37a2b 100644 --- a/mail/courier-imap/pkg/courier_imap_ssl.rc +++ b/mail/courier-imap/pkg/courier_imap_ssl.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc" pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=imapd-ssl .*" rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/courier-imap/pkg/courier_pop3.rc b/mail/courier-imap/pkg/courier_pop3.rc index a38d019d382..d82240084d7 100644 --- a/mail/courier-imap/pkg/courier_pop3.rc +++ b/mail/courier-imap/pkg/courier_pop3.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/libexec/pop3d.rc" pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=pop3d .*" rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/courier-imap/pkg/courier_pop3_ssl.rc b/mail/courier-imap/pkg/courier_pop3_ssl.rc index 31db263705e..110fbcbeb9d 100644 --- a/mail/courier-imap/pkg/courier_pop3_ssl.rc +++ b/mail/courier-imap/pkg/courier_pop3_ssl.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc" pexp="${LOCALBASE}/sbin/courierlogger .* -start -name=pop3d-ssl .*" rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 23a11ee4f84..266d1d72098 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 = 2 +REVISION = 3 CATEGORIES = mail www diff --git a/mail/sympa/pkg/sympa.rc b/mail/sympa/pkg/sympa.rc index f0de17d0671..6f9883b30e0 100644 --- a/mail/sympa/pkg/sympa.rc +++ b/mail/sympa/pkg/sympa.rc @@ -8,7 +8,7 @@ rc_reload=NO rc_start() { rm -f /var/spool/lock/sympa - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/net/gmid/Makefile b/net/gmid/Makefile index a2db899d8de..0c9f0d151c3 100644 --- a/net/gmid/Makefile +++ b/net/gmid/Makefile @@ -1,6 +1,7 @@ COMMENT = simple gemini server V = 1.8.3 DISTNAME = gmid-${V} +REVISION = 0 CATEGORIES = net diff --git a/net/gmid/pkg/gmid.rc b/net/gmid/pkg/gmid.rc index 10fd18b6e04..f60586e4232 100644 --- a/net/gmid/pkg/gmid.rc +++ b/net/gmid/pkg/gmid.rc @@ -6,8 +6,8 @@ daemon_flags="-c ${SYSCONFDIR}/gmid.conf" . /etc/rc.d/rc.subr rc_pre() { - # use rcexec here since daemon_flags may contain arguments with spaces - ${rcexec} "${daemon} -n ${daemon_flags}" + # use rc_exec here since daemon_flags may contain arguments with spaces + rc_exec "${daemon} -n ${daemon_flags}" } rc_cmd $1 diff --git a/net/go-ipfs/Makefile b/net/go-ipfs/Makefile index 4029eaf76f3..720c10bb6b5 100644 --- a/net/go-ipfs/Makefile +++ b/net/go-ipfs/Makefile @@ -6,6 +6,7 @@ MODGO_MODNAME = github.com/ipfs/go-ipfs MODGO_VERSION = v0.11.0 DISTNAME = go-ipfs-${MODGO_VERSION} +REVISION = 0 CATEGORIES = net HOMEPAGE = https://ipfs.io diff --git a/net/go-ipfs/pkg/go_ipfs.rc b/net/go-ipfs/pkg/go_ipfs.rc index 8dbe579f407..f9432bf8f40 100644 --- a/net/go-ipfs/pkg/go_ipfs.rc +++ b/net/go-ipfs/pkg/go_ipfs.rc @@ -10,7 +10,7 @@ rc_bg=YES rc_reload=NO rc_start() { - ${rcexec} "IPFS_PATH=\"${VARBASE}/go-ipfs\" ${daemon} ${daemon_flags}" + rc_exec "IPFS_PATH=\"${VARBASE}/go-ipfs\" ${daemon} ${daemon_flags}" } rc_cmd $1 diff --git a/net/i2p/Makefile b/net/i2p/Makefile index ee2eb08c825..a2017f1f63d 100644 --- a/net/i2p/Makefile +++ b/net/i2p/Makefile @@ -4,6 +4,7 @@ GH_ACCOUNT= i2p GH_PROJECT= i2p.i2p GH_TAGNAME= i2p-1.7.0 DISTNAME= ${GH_TAGNAME} +REVISION= 0 CATEGORIES= net diff --git a/net/i2p/pkg/i2p.rc b/net/i2p/pkg/i2p.rc index d1e0e1c6d18..9902028d341 100644 --- a/net/i2p/pkg/i2p.rc +++ b/net/i2p/pkg/i2p.rc @@ -7,11 +7,11 @@ daemon_user="_i2p" . /etc/rc.d/rc.subr rc_check() { - ${rcexec} "${daemon} status" + rc_exec "${daemon} status" } rc_stop() { - ${rcexec} "${daemon} stop" + rc_exec "${daemon} stop" } rc_cmd $1 diff --git a/net/kea/Makefile b/net/kea/Makefile index 914ac35eba4..243573ce537 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -5,6 +5,7 @@ PORTROACH= limitw:1,even DISTNAME= kea-${VERSION} PKGNAME-main= kea-${VERSION:S/-P/pl/} +REVISION= 0 .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 43bcb86b5ad..5be236334fb 100644 --- a/net/kea/pkg/kea.rc +++ b/net/kea/pkg/kea.rc @@ -13,7 +13,7 @@ rc_pre() { } rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_reload() { diff --git a/net/mfi/Makefile b/net/mfi/Makefile index c127539eea7..5e7ed101224 100644 --- a/net/mfi/Makefile +++ b/net/mfi/Makefile @@ -4,7 +4,7 @@ DISTFILES= mFi-$V{mFi.unix}.zip V= 2.1.2 FW_VER= 2.1.2.1297 PKGNAME= mfi-$V -REVISION= 7 +REVISION= 8 CATEGORIES= net diff --git a/net/mfi/pkg/mfi.rc b/net/mfi/pkg/mfi.rc index effd0013f95..03352029839 100644 --- a/net/mfi/pkg/mfi.rc +++ b/net/mfi/pkg/mfi.rc @@ -12,7 +12,7 @@ rc_bg=YES rc_reload=NO rc_start() { - ${rcexec} "${java} ${daemon_flags} -jar ${daemon} start" + rc_exec "${java} ${daemon_flags} -jar ${daemon} start" } rc_stop() { diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile index db65df864b2..743d411edcb 100644 --- a/net/nfsen/Makefile +++ b/net/nfsen/Makefile @@ -1,7 +1,7 @@ COMMENT= web-based front end for the nfdump netflow tools V= 1.3.8 -REVISION= 7 +REVISION= 8 DISTNAME= nfsen-$V CATEGORIES= net www HOMEPAGE= http://nfsen.sourceforge.net/ diff --git a/net/nfsen/pkg/nfsen.rc b/net/nfsen/pkg/nfsen.rc index bfae31912d7..2e60fecfcc7 100644 --- a/net/nfsen/pkg/nfsen.rc +++ b/net/nfsen/pkg/nfsen.rc @@ -11,7 +11,7 @@ pexp="/usr/bin/perl -w ${daemon}" rc_reload=NO rc_start() { - ${rcexec} "${ctl} start" + rc_exec "${ctl} start" } rc_stop() { diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 91e6b18087d..f5762f54fcd 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -12,7 +12,7 @@ V = 3.8.8 DISTNAME = rabbitmq-server-$V PKGNAME = rabbitmq-$V CATEGORIES = net -REVISION = 1 +REVISION = 2 HOMEPAGE = https://www.rabbitmq.com/ diff --git a/net/rabbitmq/pkg/rabbitmq.rc b/net/rabbitmq/pkg/rabbitmq.rc index 7bc4e9e4d5d..53576e3e611 100644 --- a/net/rabbitmq/pkg/rabbitmq.rc +++ b/net/rabbitmq/pkg/rabbitmq.rc @@ -14,7 +14,7 @@ rc_pre() { rc_check() { # return 1 is needed: rabbitmqctl returns a higher error code on failure - $rcexec ${TRUEPREFIX}/bin/rabbitmqctl status || return 1 + rc_exec ${TRUEPREFIX}/bin/rabbitmqctl status || return 1 } rc_stop() { diff --git a/net/synapse/Makefile b/net/synapse/Makefile index fa72adce906..572c6610011 100644 --- a/net/synapse/Makefile +++ b/net/synapse/Makefile @@ -1,6 +1,7 @@ COMMENT = open network for secure, decentralized communication MODPY_EGG_VERSION = 1.54.0 +REVISION = 0 GH_ACCOUNT = matrix-org GH_PROJECT = synapse diff --git a/net/synapse/pkg/synapse.rc b/net/synapse/pkg/synapse.rc index 102567baa22..0e85dfbfe98 100644 --- a/net/synapse/pkg/synapse.rc +++ b/net/synapse/pkg/synapse.rc @@ -9,7 +9,7 @@ daemon_flags="${LOCALSTATEDIR}/synapse/homeserver.yaml" pexp="${MODPY_BIN} -m synapse.app.homeserver -c ${daemon_flags} --daemonize" rc_start() { - ${rcexec} "${daemon} start ${daemon_flags}" + rc_exec "${daemon} start ${daemon_flags}" } rc_stop() { diff --git a/net/unifi/5.14/Makefile b/net/unifi/5.14/Makefile index 0cdb4ef8a6f..e59a6a2c59e 100644 --- a/net/unifi/5.14/Makefile +++ b/net/unifi/5.14/Makefile @@ -1,6 +1,6 @@ V= 5.14.23 SNAPPY_V= 1.1.8.4 -REVISION= 12 +REVISION= 13 REPLACE_LOG4J= Yes diff --git a/net/unifi/5.14/pkg/unifi.rc b/net/unifi/5.14/pkg/unifi.rc index 218c94e311f..f9d543796bb 100644 --- a/net/unifi/5.14/pkg/unifi.rc +++ b/net/unifi/5.14/pkg/unifi.rc @@ -13,7 +13,7 @@ rc_reload=NO rc_start() { cd ${LOCALBASE}/share/unifi - ${rcexec} "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" + rc_exec "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" } rc_cmd $1 diff --git a/net/unifi/5.6/Makefile b/net/unifi/5.6/Makefile index a17c31e367b..6e25bd24c7e 100644 --- a/net/unifi/5.6/Makefile +++ b/net/unifi/5.6/Makefile @@ -1,6 +1,6 @@ V= 5.6.42 SNAPPY_V= 1.1.2.6 SNAPPY_S= -REVISION= 13 +REVISION= 14 .include diff --git a/net/unifi/5.6/pkg/unifi.rc b/net/unifi/5.6/pkg/unifi.rc index 218c94e311f..f9d543796bb 100644 --- a/net/unifi/5.6/pkg/unifi.rc +++ b/net/unifi/5.6/pkg/unifi.rc @@ -13,7 +13,7 @@ rc_reload=NO rc_start() { cd ${LOCALBASE}/share/unifi - ${rcexec} "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" + rc_exec "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" } rc_cmd $1 diff --git a/net/unifi/6.0/Makefile b/net/unifi/6.0/Makefile index 0540f6e219b..4a29e05742d 100644 --- a/net/unifi/6.0/Makefile +++ b/net/unifi/6.0/Makefile @@ -1,6 +1,6 @@ V= 6.0.45 SNAPPY_V= 1.1.8.4 -REVISION= 10 +REVISION= 11 REPLACE_LOG4J= Yes diff --git a/net/unifi/6.0/pkg/unifi.rc b/net/unifi/6.0/pkg/unifi.rc index 218c94e311f..f9d543796bb 100644 --- a/net/unifi/6.0/pkg/unifi.rc +++ b/net/unifi/6.0/pkg/unifi.rc @@ -13,7 +13,7 @@ rc_reload=NO rc_start() { cd ${LOCALBASE}/share/unifi - ${rcexec} "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" + rc_exec "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" } rc_cmd $1 diff --git a/net/unifi/main/Makefile b/net/unifi/main/Makefile index 7101970ae34..2e49a1c30c8 100644 --- a/net/unifi/main/Makefile +++ b/net/unifi/main/Makefile @@ -1,4 +1,5 @@ V= 7.1.65 SNAPPY_V= 1.1.8.4 +REVISION= 0 .include diff --git a/net/unifi/main/pkg/unifi.rc b/net/unifi/main/pkg/unifi.rc index 218c94e311f..f9d543796bb 100644 --- a/net/unifi/main/pkg/unifi.rc +++ b/net/unifi/main/pkg/unifi.rc @@ -13,7 +13,7 @@ rc_reload=NO rc_start() { cd ${LOCALBASE}/share/unifi - ${rcexec} "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" + rc_exec "${java} ${daemon_flags} -cp 'lib/*' com/ubnt/ace/Launcher start" } rc_cmd $1 diff --git a/print/cups/Makefile b/print/cups/Makefile index ea851bb722d..dbb6f239175 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -6,8 +6,8 @@ GH_ACCOUNT= OpenPrinting GH_PROJECT= cups GH_TAGNAME= v2.4.1 -REVISION-main= 0 -REVISION-libs= 0 +REVISION-main= 1 +REVISION-libs= 1 CATEGORIES= print sysutils diff --git a/print/cups/pkg/cupsd.rc b/print/cups/pkg/cupsd.rc index 71cf08cc23e..9c9bd26adc3 100755 --- a/print/cups/pkg/cupsd.rc +++ b/print/cups/pkg/cupsd.rc @@ -10,11 +10,11 @@ rc_pre() { # XXX cups-driverd(8) can crash when setting up a printer driver rm -f /var/cache/cups/* - # rcexec is needed because: + # rc_exec is needed because: # - ${TRUEPREFIX}/sbin/cupsd is only executable by root # - if openfiles limits are bumped and cupsd(8) runs in debug mode to # prevent MaxClients warnings in logs - ${rcexec} "${daemon} ${daemon_flags} -t" || return 1 + rc_exec "${daemon} ${daemon_flags} -t" || return 1 # no existing printcap means we're not running lpd(8) so link cups' # printcap so base lp commands can find and use cups printers diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index d11e7563b9c..007834130c2 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= 1 +REVISION= 2 CATEGORIES= security diff --git a/security/opendnssec/pkg/opendnssec.rc b/security/opendnssec/pkg/opendnssec.rc index c20534775fc..101c865f08d 100644 --- a/security/opendnssec/pkg/opendnssec.rc +++ b/security/opendnssec/pkg/opendnssec.rc @@ -13,7 +13,7 @@ rc_pre() { } rc_start() { - ${rcexec} "${daemon} start" + rc_exec "${daemon} start" } rc_stop() { diff --git a/security/ossec-hids/Makefile b/security/ossec-hids/Makefile index 2ea858cb1fc..a9bb0eba704 100644 --- a/security/ossec-hids/Makefile +++ b/security/ossec-hids/Makefile @@ -3,7 +3,7 @@ COMMENT = host-based intrusion detection system GH_ACCOUNT = ossec GH_PROJECT = ossec-hids GH_TAGNAME = 3.0.0 -REVISION = 2 +REVISION = 3 CATEGORIES = security diff --git a/security/ossec-hids/pkg/ossec_hids.rc b/security/ossec-hids/pkg/ossec_hids.rc index c0ea61696ee..4ca492d84cc 100755 --- a/security/ossec-hids/pkg/ossec_hids.rc +++ b/security/ossec-hids/pkg/ossec_hids.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/ossec-hids/bin/ossec-control" rc_usercheck=NO rc_start() { - ${rcexec} "${daemon} ${daemon_flags} start" + rc_exec "${daemon} ${daemon_flags} start" } rc_check() { diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile index 8f5a60ac997..52ec81832ca 100644 --- a/security/vaultwarden/Makefile +++ b/security/vaultwarden/Makefile @@ -6,6 +6,7 @@ COMMENT = unofficial bitwarden compatible server GH_ACCOUNT = dani-garcia GH_PROJECT = vaultwarden GH_TAGNAME = 1.24.0 +REVISION = 0 CATEGORIES = security diff --git a/security/vaultwarden/pkg/vaultwarden.rc b/security/vaultwarden/pkg/vaultwarden.rc index fddded1909f..ecf2a14bf15 100644 --- a/security/vaultwarden/pkg/vaultwarden.rc +++ b/security/vaultwarden/pkg/vaultwarden.rc @@ -6,7 +6,7 @@ daemon_user="_vaultwarden" . /etc/rc.d/rc.subr rc_start() { - ${rcexec} "cd ${VARBASE}/vaultwarden; ${daemon} ${daemon_flags}" + rc_exec "cd ${VARBASE}/vaultwarden; ${daemon} ${daemon_flags}" } rc_bg=YES diff --git a/sysutils/riemann/Makefile b/sysutils/riemann/Makefile index ba69f7f96c6..e96fa0f1f43 100644 --- a/sysutils/riemann/Makefile +++ b/sysutils/riemann/Makefile @@ -2,7 +2,7 @@ COMMENT = network event stream processing system V = 0.3.8 DISTNAME = riemann-${V} -REVISION = 0 +REVISION = 1 CATEGORIES = sysutils HOMEPAGE = http://riemann.io diff --git a/sysutils/riemann/pkg/riemann.rc b/sysutils/riemann/pkg/riemann.rc index f6d49897e14..8f5b854f995 100644 --- a/sysutils/riemann/pkg/riemann.rc +++ b/sysutils/riemann/pkg/riemann.rc @@ -11,7 +11,7 @@ pexp="${java}.*riemann.*" rc_bg=YES rc_start() { - ${rcexec} "JAVA_CMD=\"${java}\" ${daemon}" + rc_exec "JAVA_CMD=\"${java}\" ${daemon}" } rc_cmd $1 diff --git a/telephony/asterisk/16/Makefile b/telephony/asterisk/16/Makefile index 9149d864628..f96a2b4e8e8 100644 --- a/telephony/asterisk/16/Makefile +++ b/telephony/asterisk/16/Makefile @@ -3,5 +3,6 @@ PJ_V= 2.12 SHLIB_V= 0.0 VERSION_SPEC= >=16.0,<17.0 PORTROACH= limit:^16\. +REVISION-main= 0 .include diff --git a/telephony/asterisk/16/pkg/asterisk.rc b/telephony/asterisk/16/pkg/asterisk.rc index c1634cae0fc..f524086c4fd 100644 --- a/telephony/asterisk/16/pkg/asterisk.rc +++ b/telephony/asterisk/16/pkg/asterisk.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/sbin/asterisk" pexp="${daemon}.*" rc_start() { - ${rcexec} "${TRUEPREFIX}/sbin/safe_asterisk" + rc_exec "${TRUEPREFIX}/sbin/safe_asterisk" } rc_stop() { diff --git a/telephony/asterisk/18/Makefile b/telephony/asterisk/18/Makefile index 11453ca58d3..bc2599e180f 100644 --- a/telephony/asterisk/18/Makefile +++ b/telephony/asterisk/18/Makefile @@ -3,5 +3,6 @@ PJ_V= 2.12 SHLIB_V= 0.0 VERSION_SPEC= >=18.0,<19.0 PORTROACH= limit:^18\. +REVISION-main= 0 .include diff --git a/telephony/asterisk/18/pkg/asterisk.rc b/telephony/asterisk/18/pkg/asterisk.rc index c1634cae0fc..f524086c4fd 100644 --- a/telephony/asterisk/18/pkg/asterisk.rc +++ b/telephony/asterisk/18/pkg/asterisk.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/sbin/asterisk" pexp="${daemon}.*" rc_start() { - ${rcexec} "${TRUEPREFIX}/sbin/safe_asterisk" + rc_exec "${TRUEPREFIX}/sbin/safe_asterisk" } rc_stop() { diff --git a/telephony/asterisk/19/Makefile b/telephony/asterisk/19/Makefile index fbe337dff19..4fb80301bd7 100644 --- a/telephony/asterisk/19/Makefile +++ b/telephony/asterisk/19/Makefile @@ -2,6 +2,7 @@ VER= 19.4.1 PJ_V= 2.12 SHLIB_V= 0.0 VERSION_SPEC= >=19.0,<20.0 +REVISION-main= 0 # no PORTROACH marker for the highest branch, to allow finding new branches .include diff --git a/telephony/asterisk/19/pkg/asterisk.rc b/telephony/asterisk/19/pkg/asterisk.rc index c1634cae0fc..f524086c4fd 100644 --- a/telephony/asterisk/19/pkg/asterisk.rc +++ b/telephony/asterisk/19/pkg/asterisk.rc @@ -7,7 +7,7 @@ daemon="${TRUEPREFIX}/sbin/asterisk" pexp="${daemon}.*" rc_start() { - ${rcexec} "${TRUEPREFIX}/sbin/safe_asterisk" + rc_exec "${TRUEPREFIX}/sbin/safe_asterisk" } rc_stop() { diff --git a/telephony/kamailio/Makefile b/telephony/kamailio/Makefile index 56340a05c8b..7d0c1c79349 100644 --- a/telephony/kamailio/Makefile +++ b/telephony/kamailio/Makefile @@ -16,6 +16,8 @@ PKGNAME-perl = kamailio-perl-${VERSION} PKGNAME-presence = kamailio-presence-${VERSION} PKGNAME-radius = kamailio-radius-${VERSION} +REVISION-main = 0 + CATEGORIES = telephony HOMEPAGE = https://www.kamailio.org/ diff --git a/telephony/kamailio/pkg/kamailio.rc b/telephony/kamailio/pkg/kamailio.rc index f4d2abc7019..4ec8888f8b2 100644 --- a/telephony/kamailio/pkg/kamailio.rc +++ b/telephony/kamailio/pkg/kamailio.rc @@ -11,11 +11,11 @@ rc_pre() { } rc_start() { - ${rcexec} "${TRUEPREFIX}/sbin/kamctl start" + rc_exec "${TRUEPREFIX}/sbin/kamctl start" } rc_stop() { - ${rcexec} "${TRUEPREFIX}/sbin/kamctl stop" + rc_exec "${TRUEPREFIX}/sbin/kamctl stop" } rc_reload=NO diff --git a/textproc/solr/Makefile b/textproc/solr/Makefile index bdf3580aa0a..7a7b45195ad 100644 --- a/textproc/solr/Makefile +++ b/textproc/solr/Makefile @@ -1,7 +1,7 @@ COMMENT= full-text search engine based on Lucene V= 8.11.1 -REVISION= 0 +REVISION= 1 DISTNAME= solr-$V EXTRACT_SUFX= .tgz diff --git a/textproc/solr/pkg/solr.rc b/textproc/solr/pkg/solr.rc index 24b84f4e495..8e2067b7332 100644 --- a/textproc/solr/pkg/solr.rc +++ b/textproc/solr/pkg/solr.rc @@ -10,7 +10,7 @@ pexp="$(${LOCALBASE}/bin/javaPathHelper -c solr) .*-Dsolr.solr.home=${LOCALSTATE rc_reload=NO rc_start() { - ${rcexec} "SOLR_INCLUDE=${SYSCONFDIR}/solr.in.sh ${daemon} start" + rc_exec "SOLR_INCLUDE=${SYSCONFDIR}/solr.in.sh ${daemon} start" } rc_stop() { diff --git a/www/apertium-apy/Makefile b/www/apertium-apy/Makefile index 5ec7bcba836..c509043e59b 100644 --- a/www/apertium-apy/Makefile +++ b/www/apertium-apy/Makefile @@ -5,7 +5,7 @@ DISTNAME = apertium-apy-${MODPY_EGG_VERSION} # XXX: distfile for version 0.11.6 on pypi is many commits # behind the github distfile with the same version MODPY_EGG_VERSION = 0.11.6 -REVISION = 2 +REVISION = 3 CATEGORIES = www diff --git a/www/apertium-apy/pkg/apertium_apy.rc b/www/apertium-apy/pkg/apertium_apy.rc index 29d5e3d607e..890b30ac483 100644 --- a/www/apertium-apy/pkg/apertium_apy.rc +++ b/www/apertium-apy/pkg/apertium_apy.rc @@ -11,7 +11,7 @@ rc_bg=YES rc_reload=NO rc_start() { - ${rcexec} "env LC_ALL=en_US.UTF-8 ${daemon} ${daemon_flags}" + rc_exec "env LC_ALL=en_US.UTF-8 ${daemon} ${daemon_flags}" } rc_cmd $1 diff --git a/www/gotosocial/Makefile b/www/gotosocial/Makefile index 31e868a073a..c5c96198491 100644 --- a/www/gotosocial/Makefile +++ b/www/gotosocial/Makefile @@ -7,6 +7,7 @@ MODGO_MODNAME = github.com/superseriousbusiness/gotosocial MODGO_VERSION = v0.3.3 DISTNAME = gotosocial-${MODGO_VERSION} +REVISION = 0 CATEGORIES = www diff --git a/www/gotosocial/pkg/gotosocial.rc b/www/gotosocial/pkg/gotosocial.rc index e5c60d76992..0b0b0346e95 100644 --- a/www/gotosocial/pkg/gotosocial.rc +++ b/www/gotosocial/pkg/gotosocial.rc @@ -9,7 +9,7 @@ daemon_flags="--config-path ${SYSCONFDIR}/gotosocial.yaml" pexp="${daemon} .*" rc_start() { - ${rcexec} "${daemon} ${daemon_flags} server start" + rc_exec "${daemon} ${daemon_flags} server start" } rc_bg=YES diff --git a/www/puppetboard/Makefile b/www/puppetboard/Makefile index cf5a48b003f..47c28b33174 100644 --- a/www/puppetboard/Makefile +++ b/www/puppetboard/Makefile @@ -3,6 +3,7 @@ COMMENT= web interface to PuppetDB MODPY_EGG_VERSION= 3.4.1 DISTNAME= puppetboard-${MODPY_EGG_VERSION} CATEGORIES= www +REVISION= 0 MAINTAINER= Sebastian Reitenbach diff --git a/www/puppetboard/pkg/puppetboard.rc b/www/puppetboard/pkg/puppetboard.rc index f224e6f716c..13ac759560e 100644 --- a/www/puppetboard/pkg/puppetboard.rc +++ b/www/puppetboard/pkg/puppetboard.rc @@ -9,7 +9,7 @@ daemon_user="_puppetboard" pexp="${MODPY_BIN}.*${daemon_flags:+ ${daemon_flags}} ${daemon}:application" rc_start() { - ${rcexec} "cd ${INSTDIR} && \ + rc_exec "cd ${INSTDIR} && \ ${LOCALBASE}/bin/gunicorn --daemon ${daemon_flags} ${daemon}:application" } diff --git a/www/sthttpd/Makefile b/www/sthttpd/Makefile index ea10cf4aa2c..67e537bf6eb 100644 --- a/www/sthttpd/Makefile +++ b/www/sthttpd/Makefile @@ -4,6 +4,7 @@ GH_ACCOUNT= blueness GH_PROJECT= sthttpd GH_TAGNAME= v2.27.1 CATEGORIES= www +REVISION= 0 HOMEPAGE= https://github.com/blueness/sthttpd diff --git a/www/sthttpd/pkg/thttpd.rc b/www/sthttpd/pkg/thttpd.rc index f7197ea719e..925728c3d9f 100755 --- a/www/sthttpd/pkg/thttpd.rc +++ b/www/sthttpd/pkg/thttpd.rc @@ -10,7 +10,7 @@ rc_stop_signal=USR1 # supplies. This addresses the awkward fact that thttpd defaults to the # current working directory. rc_start() { - ${rcexec} "cd /var/www; ${daemon} ${daemon_flags}" + rc_exec "cd /var/www; ${daemon} ${daemon_flags}" } rc_cmd $1 diff --git a/www/tomcat/v10/Makefile b/www/tomcat/v10/Makefile index 81bb2ee6897..9cd2f31717b 100644 --- a/www/tomcat/v10/Makefile +++ b/www/tomcat/v10/Makefile @@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=10,<11 MAJ_VER = 10 MIN_VER = 0 MICRO_VER = 20 +REVISION-main = 0 .include diff --git a/www/tomcat/v10/pkg/tomcat.rc b/www/tomcat/v10/pkg/tomcat.rc index 74e3885f523..3f15a90f597 100644 --- a/www/tomcat/v10/pkg/tomcat.rc +++ b/www/tomcat/v10/pkg/tomcat.rc @@ -11,7 +11,7 @@ pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_ rc_reload=NO rc_start() { - ${rcexec} \ + rc_exec \ "CATALINA_BASE=\"${CATALINA_BASE}\" \ CATALINA_OPTS=\"${daemon_flags}\" \ JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start" diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile index c55186f0fe2..2fdfb52dae5 100644 --- a/www/tomcat/v7/Makefile +++ b/www/tomcat/v7/Makefile @@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=7,<8 MAJ_VER = 7 MIN_VER = 0 MICRO_VER = 109 +REVISION-main = 0 .include diff --git a/www/tomcat/v7/pkg/tomcat.rc b/www/tomcat/v7/pkg/tomcat.rc index 74e3885f523..3f15a90f597 100755 --- a/www/tomcat/v7/pkg/tomcat.rc +++ b/www/tomcat/v7/pkg/tomcat.rc @@ -11,7 +11,7 @@ pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_ rc_reload=NO rc_start() { - ${rcexec} \ + rc_exec \ "CATALINA_BASE=\"${CATALINA_BASE}\" \ CATALINA_OPTS=\"${daemon_flags}\" \ JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start" diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile index bb3363f5eb2..d2cdf35cd58 100644 --- a/www/tomcat/v8/Makefile +++ b/www/tomcat/v8/Makefile @@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=8,<9 MAJ_VER = 8 MIN_VER = 5 MICRO_VER = 78 +REVISION-main = 0 .include diff --git a/www/tomcat/v8/pkg/tomcat.rc b/www/tomcat/v8/pkg/tomcat.rc index 74e3885f523..3f15a90f597 100644 --- a/www/tomcat/v8/pkg/tomcat.rc +++ b/www/tomcat/v8/pkg/tomcat.rc @@ -11,7 +11,7 @@ pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_ rc_reload=NO rc_start() { - ${rcexec} \ + rc_exec \ "CATALINA_BASE=\"${CATALINA_BASE}\" \ CATALINA_OPTS=\"${daemon_flags}\" \ JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start" diff --git a/www/tomcat/v9/Makefile b/www/tomcat/v9/Makefile index 780566d50f9..ca1a9d7fc9a 100644 --- a/www/tomcat/v9/Makefile +++ b/www/tomcat/v9/Makefile @@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=9,<10 MAJ_VER = 9 MIN_VER = 0 MICRO_VER = 62 +REVISION-main = 0 .include diff --git a/www/tomcat/v9/pkg/tomcat.rc b/www/tomcat/v9/pkg/tomcat.rc index 74e3885f523..3f15a90f597 100644 --- a/www/tomcat/v9/pkg/tomcat.rc +++ b/www/tomcat/v9/pkg/tomcat.rc @@ -11,7 +11,7 @@ pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_ rc_reload=NO rc_start() { - ${rcexec} \ + rc_exec \ "CATALINA_BASE=\"${CATALINA_BASE}\" \ CATALINA_OPTS=\"${daemon_flags}\" \ JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start" diff --git a/www/vnu/Makefile b/www/vnu/Makefile index 7cd9b3ca9f0..976e4968a4a 100644 --- a/www/vnu/Makefile +++ b/www/vnu/Makefile @@ -3,7 +3,7 @@ COMMENT = HTML5 validator V = 20.6.30 DISTNAME = vnu.jar_$V PKGNAME = vnu-$V -REVISION = 0 +REVISION = 1 CATEGORIES = www diff --git a/www/vnu/pkg/vnu.rc b/www/vnu/pkg/vnu.rc index 4149966039b..0d34763ef7b 100644 --- a/www/vnu/pkg/vnu.rc +++ b/www/vnu/pkg/vnu.rc @@ -12,7 +12,7 @@ rc_reload=NO pexp="$(${LOCALBASE}/bin/javaPathHelper -c vnu) -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" rc_start() { - ${rcexec} "$(${LOCALBASE}/bin/javaPathHelper -c vnu) -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" + rc_exec "$(${LOCALBASE}/bin/javaPathHelper -c vnu) -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" } rc_cmd $1