4 files changed, 19 insertions, 16 deletions

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index befce75594e5..857b6f1ced71 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	teamspeak3-server
-PORTVERSION=	3.0.11.4
+PORTVERSION=	3.0.12.2
 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}
+DISTNAME=	${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	hirner@bitfire.at
 COMMENT=	Server side of the TeamSpeak group voice chat system
@@ -17,6 +17,7 @@ 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
 
+USES=		tar:bz2
 NO_BUILD=	yes
 USE_LDCONFIG=	${LIBDIR}
 USE_RC_SUBR=	teamspeak
@@ -45,11 +46,11 @@ OPTIONS_DEFINE=	DOCS
 
 .if ${ARCH} ==	"i386"
 TEAMSPEAK_ARCH=	x86
-WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}
+WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}
 .endif
 .if ${ARCH} ==	"amd64"
 TEAMSPEAK_ARCH=	amd64
-WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}
+WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}
 .endif
 
 DBDIR=	/var/db/teamspeak
@@ -58,8 +59,7 @@ LIBDIR=	${PREFIX}/lib/teamspeak/server
 LIBEXECDIR=	${PREFIX}/libexec
 LOGDIR=	/var/log/teamspeak
 SHAREDIR=	${PREFIX}/share/teamspeak/server
-PORTDOCS=	ts3_serverquery_manual.pdf \
-		permissiondoc.txt \
+PORTDOCS=	permissiondoc.txt \
 		privilegekey_guide.txt \
 		server_quickstart.txt \
 		server_upgrade.txt \
@@ -75,8 +75,8 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/*.so ${STAGEDIR}${LIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/redist/*.so* ${STAGEDIR}${LIBDIR}
 
-	${INSTALL_PROGRAM} ${WRKSRC}/ts3server_freebsd_${TEAMSPEAK_ARCH} \
-		${STAGEDIR}${LIBEXECDIR}/teamspeak_server
+	${INSTALL_PROGRAM} ${WRKSRC}/ts3server \
+		${STAGEDIR}${LIBEXECDIR}/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for DOCFILE in ${PORTDOCS}
diff --git a/audio/teamspeak3-server/distinfo b/audio/teamspeak3-server/distinfo
index 4c0b8088ba80..aefbf5ab84a4 100644
--- a/audio/teamspeak3-server/distinfo
+++ b/audio/teamspeak3-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (teamspeak3-server_freebsd-x86-3.0.11.4.tar.gz) = c289382c3ede8feaedff8feafbd25ad704283ed85542d17c22f8034e9b322816
-SIZE (teamspeak3-server_freebsd-x86-3.0.11.4.tar.gz) = 5845799
-SHA256 (teamspeak3-server_freebsd-amd64-3.0.11.4.tar.gz) = 047c9d63782a99c0cc31fa96471723c41de010613af5f6cb3aab1544a65fa6de
-SIZE (teamspeak3-server_freebsd-amd64-3.0.11.4.tar.gz) = 5798235
+SHA256 (teamspeak3-server_freebsd_x86-3.0.12.2.tar.bz2) = 43903ff5a910089416f95d250a584295b1234ede1c5ac7db733a6ffe6bb6d702
+SIZE (teamspeak3-server_freebsd_x86-3.0.12.2.tar.bz2) = 5424784
+SHA256 (teamspeak3-server_freebsd_amd64-3.0.12.2.tar.bz2) = 88440eece26bb1d7cfe1e431193f5448b7efe0dfc995a7e67aa23e0cb0288d10
+SIZE (teamspeak3-server_freebsd_amd64-3.0.12.2.tar.bz2) = 5557743
diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in
index c277b1640b90..430cb95cf0e8 100644
--- a/audio/teamspeak3-server/files/teamspeak.in
+++ b/audio/teamspeak3-server/files/teamspeak.in
@@ -22,9 +22,9 @@ db_dir=%%DBDIR%%
 log_dir=%%LOGDIR%%
 
 pidfile=%%DBDIR%%/teamspeak_server.pid
-procname=%%PREFIX%%/libexec/teamspeak_server
+procname=%%PREFIX%%/libexec/ts3server
 command=/usr/sbin/daemon
-command_args="-fp $pidfile -u teamspeak %%PREFIX%%/libexec/teamspeak_server dbsqlpath=%%PREFIX%%/share/teamspeak/server/sql/ inifile=%%PREFIX%%/etc/teamspeak/ts3server.ini licensepath=%%PREFIX%%/etc/teamspeak/ logpath=$log_dir"
+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"
 teamspeak_chdir=$db_dir
 required_dirs="$db_dir $log_dir"
 
diff --git a/audio/teamspeak3-server/pkg-plist b/audio/teamspeak3-server/pkg-plist
index a74d9a412ead..9b8536648dd4 100644
--- a/audio/teamspeak3-server/pkg-plist
+++ b/audio/teamspeak3-server/pkg-plist
@@ -1,7 +1,7 @@
 lib/teamspeak/server/libmariadb.so.2
 lib/teamspeak/server/libts3db_mariadb.so
 lib/teamspeak/server/libts3db_sqlite3.so
-libexec/teamspeak_server
+libexec/ts3server
 share/teamspeak/server/CHANGELOG
 share/teamspeak/server/LICENSE
 share/teamspeak/server/serverquerydocs/banadd.txt
@@ -103,7 +103,6 @@ share/teamspeak/server/serverquerydocs/servergroupaddclient.txt
 share/teamspeak/server/serverquerydocs/servergroupaddperm.txt
 share/teamspeak/server/serverquerydocs/servergroupautoaddperm.txt
 share/teamspeak/server/serverquerydocs/servergroupautodelperm.txt
-share/teamspeak/server/serverquerydocs/servergroupbyclientid.txt
 share/teamspeak/server/serverquerydocs/servergroupclientlist.txt
 share/teamspeak/server/serverquerydocs/servergroupcopy.txt
 share/teamspeak/server/serverquerydocs/servergroupdel.txt
@@ -205,6 +204,9 @@ share/teamspeak/server/sql/perm_delete_by_permid.sql
 share/teamspeak/server/sql/perm_delete_by_serverid.sql
 share/teamspeak/server/sql/perm_get_by_id.sql
 share/teamspeak/server/sql/perm_get_by_serverid.sql
+share/teamspeak/server/sql/perm_group_copy.sql
+share/teamspeak/server/sql/perm_group_get_mapping.sql
+share/teamspeak/server/sql/perm_group_perm_copy.sql
 share/teamspeak/server/sql/perm_insert.sql
 share/teamspeak/server/sql/perm_rename.sql
 share/teamspeak/server/sql/perm_update_get_groups.sql
@@ -244,6 +246,7 @@ share/teamspeak/server/sql/update_20.sql
 share/teamspeak/server/sql/update_21.sql
 share/teamspeak/server/sql/update_22.sql
 share/teamspeak/server/sql/update_23.sql
+share/teamspeak/server/sql/update_24.sql
 share/teamspeak/server/sql/update_database_version.sql
 share/teamspeak/server/sql/update_permissions_12.sql
 share/teamspeak/server/sql/updates_and_fixes/convert_mysql_to_mariadb.sql