From b0a8d6d8486c70dcb5da42c5300440bc159548b2 Mon Sep 17 00:00:00 2001 From: Richard Gallamore Date: Fri, 8 Feb 2019 20:58:56 +0000 Subject: [PATCH] * Updated to 3.6.1 * Removed workaround for a fixed bug in previous 11.x release * Reworked rc script to be more standardized The rc script now has 3 possible entries that can be changed, teamspeak_pidfile, teamspeak_db_dir and teamspeak_log_dir. This will provide a more customizable experience when using teamspeak. Changes: https://forum.teamspeak.com/threads/138675-Release-TeamSpeak-3-Server-3-6-1 PR: 235082 --- audio/teamspeak3-server/Makefile | 4 +--- audio/teamspeak3-server/distinfo | 10 +++++----- audio/teamspeak3-server/files/teamspeak.in | 22 ++++++++++------------ 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index b87542aea866..3d29f7bc4625 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= teamspeak3-server -PORTVERSION= 3.6.0 +PORTVERSION= 3.6.1 PORTEPOCH= 1 CATEGORIES= audio net MASTER_SITES= http://dl.4players.de/ts/releases/${PORTVERSION}/ \ @@ -56,8 +56,6 @@ MYSQL_VARS_OFF= SUB_LIST+=MYSQL= .include -SUB_LIST+= CD= - .if ${ARCH} == "i386" TEAMSPEAK_ARCH= x86 .elif ${ARCH} == "amd64" diff --git a/audio/teamspeak3-server/distinfo b/audio/teamspeak3-server/distinfo index 92a8bfef0dc2..ea473ae94177 100644 --- a/audio/teamspeak3-server/distinfo +++ b/audio/teamspeak3-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1548377660 -SHA256 (teamspeak3-server_freebsd_amd64-3.6.0.tar.bz2) = 8628b66c7048f7efd4494aa500b2e3f5a4bdfe72ad5677ae6fe80d46449ad4db -SIZE (teamspeak3-server_freebsd_amd64-3.6.0.tar.bz2) = 7503721 -SHA256 (teamspeak3-server_freebsd_x86-3.6.0.tar.bz2) = 127692d04fb82cb3d47ec402e322256bb5ef504389ea2592e87c96c478558f43 -SIZE (teamspeak3-server_freebsd_x86-3.6.0.tar.bz2) = 7365324 +TIMESTAMP = 1549586661 +SHA256 (teamspeak3-server_freebsd_amd64-3.6.1.tar.bz2) = 090f42b621d345e54503126cb99259a086ae6393d954a5424c18e3e4647ceb53 +SIZE (teamspeak3-server_freebsd_amd64-3.6.1.tar.bz2) = 7500909 +SHA256 (teamspeak3-server_freebsd_x86-3.6.1.tar.bz2) = 71ba69eeaf3679c907d719e2b4bd7678550928f2b429690da364031ab752947c +SIZE (teamspeak3-server_freebsd_x86-3.6.1.tar.bz2) = 7366217 diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in index 2c62f35f27c5..b2dd911ebf06 100644 --- a/audio/teamspeak3-server/files/teamspeak.in +++ b/audio/teamspeak3-server/files/teamspeak.in @@ -18,20 +18,18 @@ name="teamspeak" rcvar=teamspeak_enable -db_dir=%%DBDIR%% -log_dir=%%LOGDIR%% - -pidfile=%%DBDIR%%/teamspeak_server.pid -procname=%%PREFIX%%/libexec/ts3server -command=/usr/sbin/daemon -command_args="-fp $pidfile -u teamspeak %%PREFIX%%/libexec/ts3server dbsqlpath=%%PREFIX%%/share/teamspeak/server/sql/ inifile=%%PREFIX%%/etc/teamspeak/ts3server.ini licensepath=%%PREFIX%%/etc/teamspeak/ logpath=$log_dir license_accepted=1" -teamspeak_chdir=$db_dir -required_dirs="$db_dir $log_dir" - -%%CD%% load_rc_config $name -: ${teamspeak_enable="NO"} +: ${teamspeak_enable:="NO"} +: ${teamspeak_pidfile:="%%DBDIR%%/teamspeak_server.pid"} +: ${teamspeak_db_dir:="%%DBDIR%%"} +: ${teamspeak_log_dir:="%%LOGDIR%%"} + +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" +teamspeak_chdir="$teamspeak_db_dir" +required_dirs="$teamspeak_db_dir $teamspeak_log_dir" LD_LIBRARY_PATH=%%PREFIX%%/lib/teamspeak/server:$LD_LIBRARY_PATH export LD_LIBRARY_PATH