diff options
| author | ultima <ultima@FreeBSD.org> | 2019-08-15 06:00:20 +0800 |
|---|---|---|
| committer | ultima <ultima@FreeBSD.org> | 2019-08-15 06:00:20 +0800 |
| commit | b4856178db6808db5ba5a16423f6521b1667d1b5 (patch) | |
| tree | 4b094f4c7990ba50823fe3c6cf36f773eb583c01 /audio | |
| parent | 397974b38942cbcc57033e3519fd4aba0bba84fc (diff) | |
| download | freebsd-ports-gnome-b4856178db6808db5ba5a16423f6521b1667d1b5.tar.gz freebsd-ports-gnome-b4856178db6808db5ba5a16423f6521b1667d1b5.tar.zst freebsd-ports-gnome-b4856178db6808db5ba5a16423f6521b1667d1b5.zip | |
Fix issues when calling teamspeak_flags.
When calling teamspeak_flags prior to this commit,
flags would be appended to the daemon command. After
this commit, it will be appended to the teamspeak
command as one would expect.
Reported by: Oliver Lehmann <lehmann@ans^>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/teamspeak3-server/Makefile | 1 | ||||
| -rw-r--r-- | audio/teamspeak3-server/files/teamspeak.in | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index d9174585375c..c1680496d779 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= teamspeak3-server PORTVERSION= 3.9.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio net MASTER_SITES= https://files.teamspeak-services.com/releases/server/${PORTVERSION}/ diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in index b2dd911ebf06..d219a68dc1bc 100644 --- a/audio/teamspeak3-server/files/teamspeak.in +++ b/audio/teamspeak3-server/files/teamspeak.in @@ -25,9 +25,11 @@ load_rc_config $name : ${teamspeak_db_dir:="%%DBDIR%%"} : ${teamspeak_log_dir:="%%LOGDIR%%"} +# Add flags var so it isn't called in daemon +flags=" " procname=%%PREFIX%%/libexec/ts3server command=/usr/sbin/daemon -command_args="-fp "$teamspeak_pidfile" -u teamspeak %%PREFIX%%/libexec/ts3server dbsqlpath=%%PREFIX%%/share/teamspeak/server/sql/ inifile=%%PREFIX%%/etc/teamspeak/ts3server.ini licensepath=%%PREFIX%%/etc/teamspeak/ logpath="$teamspeak_log_dir" license_accepted=1" +command_args="-fp "$teamspeak_pidfile" -u teamspeak %%PREFIX%%/libexec/ts3server dbsqlpath=%%PREFIX%%/share/teamspeak/server/sql/ inifile=%%PREFIX%%/etc/teamspeak/ts3server.ini licensepath=%%PREFIX%%/etc/teamspeak/ logpath="$teamspeak_log_dir" license_accepted=1 $teamspeak_flags" teamspeak_chdir="$teamspeak_db_dir" required_dirs="$teamspeak_db_dir $teamspeak_log_dir" |