Index: head/audio/teamspeak3-server/Makefile
===================================================================
--- head/audio/teamspeak3-server/Makefile	(revision 492461)
+++ head/audio/teamspeak3-server/Makefile	(revision 492462)
@@ -1,98 +1,96 @@
 # Created by: Daniel O'Connor
 # $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}/ \
 		http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Server side of the TeamSpeak group voice chat system
 
 LICENSE=	teamspeak
 LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 ONLY_FOR_ARCHS=		amd64 i386
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		tar:bz2
 USE_LDCONFIG=	${LIBDIR}
 USE_RC_SUBR=	teamspeak
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 USERS=	teamspeak
 GROUPS=	teamspeak
 
 CONFLICTS=	teamspeak_server-[0-9]*
 
 PLIST_SUB=	DBDIR=${DBDIR} \
 		ETCDIR=${ETCDIR} \
 		LOGDIR=${LOGDIR} \
 		BINGRP=${BINGRP}
 
 SUB_LIST=	DBDIR=${DBDIR} \
 		ETCDIR=${ETCDIR} \
 		LOGDIR=${LOGDIR}
 
 PORTDOCS=	permissiondoc.txt \
 		privilegekey_guide.txt \
 		server_quickstart.txt \
 		server_upgrade.txt \
 		update_mysql_to_mariadb.txt
 
 OPTIONS_DEFINE=	DOCS MYSQL
 
 MYSQL_USES=	mysql:server
 MYSQL_VARS=	SUB_LIST+=MYSQL=mysql
 MYSQL_VARS_OFF=	SUB_LIST+=MYSQL=
 
 .include <bsd.port.options.mk>
-
-SUB_LIST+=	CD=
 
 .if ${ARCH} == "i386"
 TEAMSPEAK_ARCH=	x86
 .elif ${ARCH} == "amd64"
 TEAMSPEAK_ARCH=	amd64
 .endif
 
 WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}
 
 DBDIR=	/var/db/teamspeak
 ETCDIR=	${PREFIX}/etc/teamspeak
 LIBDIR=	${PREFIX}/lib/teamspeak/server
 LIBEXECDIR=	${PREFIX}/libexec
 LOGDIR=	/var/log/teamspeak
 SHAREDIR=	${PREFIX}/share/teamspeak/server
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${SHAREDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql serverquerydocs" ${STAGEDIR}${SHAREDIR})
 
 	@${MKDIR} ${STAGEDIR}${LIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/*.so ${STAGEDIR}${LIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/redist/*.so* ${STAGEDIR}${LIBDIR}
 
 	${INSTALL_PROGRAM} ${WRKSRC}/ts3server \
 		${STAGEDIR}${LIBEXECDIR}/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for DOCFILE in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${STAGEDIR}${DOCSDIR}
 .	endfor
 
 	${INSTALL} -d ${STAGEDIR}${DBDIR}
 	${INSTALL} -d ${STAGEDIR}${LOGDIR}
 	${INSTALL} -d ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
Index: head/audio/teamspeak3-server/distinfo
===================================================================
--- head/audio/teamspeak3-server/distinfo	(revision 492461)
+++ head/audio/teamspeak3-server/distinfo	(revision 492462)
@@ -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
Index: head/audio/teamspeak3-server/files/teamspeak.in
===================================================================
--- head/audio/teamspeak3-server/files/teamspeak.in	(revision 492461)
+++ head/audio/teamspeak3-server/files/teamspeak.in	(revision 492462)
@@ -1,39 +1,37 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: teamspeak
 # REQUIRE: LOGIN %%MYSQL%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # teamspeak_enable (bool):   Set to NO by default.
 #               Set it to YES to enable teamspeak server.
 #
 
 . /etc/rc.subr
 
 name="teamspeak"
 rcvar=teamspeak_enable
 
-db_dir=%%DBDIR%%
-log_dir=%%LOGDIR%%
+load_rc_config $name
 
-pidfile=%%DBDIR%%/teamspeak_server.pid
+: ${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 $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"}
+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
 
 run_rc_command "$1"