Date: Fri, 17 Feb 2023 12:43:37 GMT From: Dries Michiels <driesm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6e69b81986b9 - main - multimedia/emby-server(-devel): correctly stop the master process Message-ID: <202302171243.31HChbWA083589@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e69b81986b9412fcc3e06af7d37491236fe0504 commit 6e69b81986b9412fcc3e06af7d37491236fe0504 Author: Julien Cassette <julien.cassette@gmail.com> AuthorDate: 2023-02-17 12:00:05 +0000 Commit: Dries Michiels <driesm@FreeBSD.org> CommitDate: 2023-02-17 12:42:15 +0000 multimedia/emby-server(-devel): correctly stop the master process When passing -r to daemon, the supervisor process should be stopped. When stopping the child process it will just be restarted again. This fixes the rc script in that it correctly shuts down the daemon process. Pull Request: https://github.com/freebsd/freebsd-ports/pull/150 Pull Request: https://github.com/freebsd/freebsd-ports/pull/159 --- multimedia/emby-server-devel/Makefile | 2 +- multimedia/emby-server-devel/files/emby-server.in | 3 +-- multimedia/emby-server/Makefile | 2 +- multimedia/emby-server/files/emby-server.in | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile index 8ff8f364288d..6098d9366032 100644 --- a/multimedia/emby-server-devel/Makefile +++ b/multimedia/emby-server-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= emby-server DISTVERSION= 4.8.0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ https://mediabrowser.github.io/embytools/ diff --git a/multimedia/emby-server-devel/files/emby-server.in b/multimedia/emby-server-devel/files/emby-server.in index 8057bdcba11f..d5b9bdb4cf97 100644 --- a/multimedia/emby-server-devel/files/emby-server.in +++ b/multimedia/emby-server-devel/files/emby-server.in @@ -44,9 +44,8 @@ load_rc_config ${name} : ${%%RC_NAME%%_pid:="/var/run/%%PORTNAME%%.pid"} pidfile="${%%RC_NAME%%_pid}" -procname="%%PREFIX%%/lib/emby-server/system/EmbyServer" command="/usr/sbin/daemon" -command_args="-r -f -p ${%%RC_NAME%%_pid} ${procname} \ +command_args="-r -f -P ${%%RC_NAME%%_pid} %%PREFIX%%/lib/emby-server/system/EmbyServer \ -os freebsd \ -ffdetect ${%%RC_NAME%%_ffdetect} \ -ffmpeg ${%%RC_NAME%%_ffmpeg} \ diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile index 7ea30b515674..c93bd1421dd2 100644 --- a/multimedia/emby-server/Makefile +++ b/multimedia/emby-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= emby-server DISTVERSION= 4.7.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ https://mediabrowser.github.io/embytools/ diff --git a/multimedia/emby-server/files/emby-server.in b/multimedia/emby-server/files/emby-server.in index 8057bdcba11f..d5b9bdb4cf97 100644 --- a/multimedia/emby-server/files/emby-server.in +++ b/multimedia/emby-server/files/emby-server.in @@ -44,9 +44,8 @@ load_rc_config ${name} : ${%%RC_NAME%%_pid:="/var/run/%%PORTNAME%%.pid"} pidfile="${%%RC_NAME%%_pid}" -procname="%%PREFIX%%/lib/emby-server/system/EmbyServer" command="/usr/sbin/daemon" -command_args="-r -f -p ${%%RC_NAME%%_pid} ${procname} \ +command_args="-r -f -P ${%%RC_NAME%%_pid} %%PREFIX%%/lib/emby-server/system/EmbyServer \ -os freebsd \ -ffdetect ${%%RC_NAME%%_ffdetect} \ -ffmpeg ${%%RC_NAME%%_ffmpeg} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302171243.31HChbWA083589>