Use the rc_exec function instead of ${rcexec}.

This commit is contained in:
ajacoutot 2022-05-21 10:50:49 +00:00
parent a932fc3beb
commit 9e45440fb2
83 changed files with 98 additions and 73 deletions

View File

@ -9,6 +9,7 @@ VERSION= 14.3
PREV_MAJOR= 13
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
REVISION-server=0
DPB_PROPERTIES= parallel

View File

@ -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

View File

@ -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 <jmatthew@openbsd.org>

View File

@ -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

View File

@ -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

View File

@ -9,7 +9,7 @@ rc_reload=NO
rc_bg=YES
rc_start() {
${rcexec} "${daemon}"
rc_exec "${daemon}"
}
pexp="${MODPY_BIN} ${daemon}"

View File

@ -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} \

View File

@ -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() {

View File

@ -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

View File

@ -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

View File

@ -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/

View File

@ -8,7 +8,7 @@ pexp="${TRUEPREFIX}/sbin/archiveopteryx -f"
rc_reload=NO
rc_start() {
${rcexec} "${daemon} start"
rc_exec "${daemon} start"
}
rc_stop() {

View File

@ -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

View File

@ -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() {

View File

@ -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/}

View File

@ -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() {

View File

@ -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() {

View File

@ -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() {

View File

@ -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() {

View File

@ -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

View File

@ -8,7 +8,7 @@ rc_reload=NO
rc_start() {
rm -f /var/spool/lock/sympa
${rcexec} "${daemon} start"
rc_exec "${daemon} start"
}
rc_stop() {

View File

@ -1,6 +1,7 @@
COMMENT = simple gemini server
V = 1.8.3
DISTNAME = gmid-${V}
REVISION = 0
CATEGORIES = net

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -4,6 +4,7 @@ GH_ACCOUNT= i2p
GH_PROJECT= i2p.i2p
GH_TAGNAME= i2p-1.7.0
DISTNAME= ${GH_TAGNAME}
REVISION= 0
CATEGORIES= net

View File

@ -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

View File

@ -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++ \

View File

@ -13,7 +13,7 @@ rc_pre() {
}
rc_start() {
${rcexec} "${daemon} start"
rc_exec "${daemon} start"
}
rc_reload() {

View File

@ -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

View File

@ -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() {

View File

@ -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/

View File

@ -11,7 +11,7 @@ pexp="/usr/bin/perl -w ${daemon}"
rc_reload=NO
rc_start() {
${rcexec} "${ctl} start"
rc_exec "${ctl} start"
}
rc_stop() {

View File

@ -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/

View File

@ -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() {

View File

@ -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

View File

@ -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() {

View File

@ -1,6 +1,6 @@
V= 5.14.23
SNAPPY_V= 1.1.8.4
REVISION= 12
REVISION= 13
REPLACE_LOG4J= Yes

View File

@ -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

View File

@ -1,6 +1,6 @@
V= 5.6.42
SNAPPY_V= 1.1.2.6
SNAPPY_S=
REVISION= 13
REVISION= 14
.include <bsd.port.mk>

View File

@ -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

View File

@ -1,6 +1,6 @@
V= 6.0.45
SNAPPY_V= 1.1.8.4
REVISION= 10
REVISION= 11
REPLACE_LOG4J= Yes

View File

@ -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

View File

@ -1,4 +1,5 @@
V= 7.1.65
SNAPPY_V= 1.1.8.4
REVISION= 0
.include <bsd.port.mk>

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -13,7 +13,7 @@ rc_pre() {
}
rc_start() {
${rcexec} "${daemon} start"
rc_exec "${daemon} start"
}
rc_stop() {

View File

@ -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

View File

@ -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() {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <bsd.port.mk>

View File

@ -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() {

View File

@ -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 <bsd.port.mk>

View File

@ -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() {

View File

@ -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 <bsd.port.mk>

View File

@ -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() {

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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() {

View File

@ -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

View File

@ -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

View File

@ -7,6 +7,7 @@ MODGO_MODNAME = github.com/superseriousbusiness/gotosocial
MODGO_VERSION = v0.3.3
DISTNAME = gotosocial-${MODGO_VERSION}
REVISION = 0
CATEGORIES = www

View File

@ -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

View File

@ -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 <sebastia@openbsd.org>

View File

@ -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"
}

View File

@ -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

View File

@ -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

View File

@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=10,<11
MAJ_VER = 10
MIN_VER = 0
MICRO_VER = 20
REVISION-main = 0
.include <bsd.port.mk>

View File

@ -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"

View File

@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=7,<8
MAJ_VER = 7
MIN_VER = 0
MICRO_VER = 109
REVISION-main = 0
.include <bsd.port.mk>

View File

@ -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"

View File

@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=8,<9
MAJ_VER = 8
MIN_VER = 5
MICRO_VER = 78
REVISION-main = 0
.include <bsd.port.mk>

View File

@ -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"

View File

@ -4,5 +4,6 @@ PKGSPEC-main = tomcat->=9,<10
MAJ_VER = 9
MIN_VER = 0
MICRO_VER = 62
REVISION-main = 0
.include <bsd.port.mk>

View File

@ -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"

View File

@ -3,7 +3,7 @@ COMMENT = HTML5 validator
V = 20.6.30
DISTNAME = vnu.jar_$V
PKGNAME = vnu-$V
REVISION = 0
REVISION = 1
CATEGORIES = www

View File

@ -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