From owner-svn-ports-head@freebsd.org  Wed Aug 14 22:00:21 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A84EFBD057;
 Wed, 14 Aug 2019 22:00:21 +0000 (UTC)
 (envelope-from ultima@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4683RT3wZqz43Y1;
 Wed, 14 Aug 2019 22:00:21 +0000 (UTC)
 (envelope-from ultima@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 685F9682C;
 Wed, 14 Aug 2019 22:00:21 +0000 (UTC)
 (envelope-from ultima@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7EM0L8g029231;
 Wed, 14 Aug 2019 22:00:21 GMT (envelope-from ultima@FreeBSD.org)
Received: (from ultima@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7EM0LG4029229;
 Wed, 14 Aug 2019 22:00:21 GMT (envelope-from ultima@FreeBSD.org)
Message-Id: <201908142200.x7EM0LG4029229@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ultima set sender to
 ultima@FreeBSD.org using -f
From: Richard Gallamore <ultima@FreeBSD.org>
Date: Wed, 14 Aug 2019 22:00:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r508976 - in head/audio/teamspeak3-server: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: ultima
X-SVN-Commit-Paths: in head/audio/teamspeak3-server: . files
X-SVN-Commit-Revision: 508976
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Aug 2019 22:00:21 -0000

Author: ultima
Date: Wed Aug 14 22:00:20 2019
New Revision: 508976
URL: https://svnweb.freebsd.org/changeset/ports/508976

Log:
  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^>

Modified:
  head/audio/teamspeak3-server/Makefile
  head/audio/teamspeak3-server/files/teamspeak.in

Modified: head/audio/teamspeak3-server/Makefile
==============================================================================
--- head/audio/teamspeak3-server/Makefile	Wed Aug 14 21:58:57 2019	(r508975)
+++ head/audio/teamspeak3-server/Makefile	Wed Aug 14 22:00:20 2019	(r508976)
@@ -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}/

Modified: head/audio/teamspeak3-server/files/teamspeak.in
==============================================================================
--- head/audio/teamspeak3-server/files/teamspeak.in	Wed Aug 14 21:58:57 2019	(r508975)
+++ head/audio/teamspeak3-server/files/teamspeak.in	Wed Aug 14 22:00:20 2019	(r508976)
@@ -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"