5 files changed, 37 insertions, 19 deletions

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index 3f904fa3ee23..d154ea1d8e84 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	teamspeak3-server
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.3
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/ \
@@ -16,6 +16,15 @@ DISTNAME=	${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}-${PORTVERSION}
 MAINTAINER=	hirner@bitfire.at
 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
+
+.ifdef (BATCH)
+IGNORE=		license ${LICENSE} needs confirmation, but BATCH is defined
+.endif
+
 USE_ICONV=	yes
 USE_LDCONFIG=	${PREFIX}/lib/teamspeak/server
 USE_RC_SUBR=	teamspeak
@@ -29,13 +38,14 @@ NO_BUILD=	yes
 USERS=	teamspeak
 GROUPS=	teamspeak
 
-LICENSE=	teamspeak
-LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
 CONFLICTS=	teamspeak_server-[0-9]*
 
+PLIST_SUB+=	DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		USERS=${USERS} \
+		GROUPS=${GROUPS} \
+		BINGRP=${BINGRP}
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH} ==	"i386"
@@ -74,9 +84,9 @@ do-install:
 .endif
 
 post-install:
-	@${MKDIR} ${DBDIR} && ${CHOWN} -R ${USERS}:${GROUPS} ${DBDIR}
+	@${INSTALL} -d -o ${USERS} -g ${GROUPS} ${DBDIR}
+	@${INSTALL} -d -o ${USERS} -g ${BINGRP} ${LOGDIR}
 	@${MKDIR} ${ETCDIR}
-	@${MKDIR} ${LOGDIR} && ${CHOWN} -R ${USERS}:${BINGRP} ${LOGDIR}
 	@${CAT} ${WRKDIR}/pkg-message
 
 .include <bsd.port.mk>
diff --git a/audio/teamspeak3-server/distinfo b/audio/teamspeak3-server/distinfo
index 87915f5110b5..1c18bebe6f1d 100644
--- a/audio/teamspeak3-server/distinfo
+++ b/audio/teamspeak3-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 919165cd1a7660271b78ce244c380bd18d6e3037e53939e2915d02809fff5b5b
-SIZE (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 4396259
-SHA256 (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = d0fefb8bc7423a52e291b45cd02e8d3ec8e3a8f7f58c69c9a9fd9743d915d5e2
-SIZE (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = 3902437
+SIZE (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = 3972768
+SHA256 (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = a6954eba16bbd2f8920f90e94ea5dbf7b7247918c7b3e7636956b7451d3e7717
+SIZE (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = 4480739
+SHA256 (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = f0f8f2d8bfe14ca58e12d8f1c9c766560ff6e9be09fe27129d775863d75c912e
diff --git a/audio/teamspeak3-server/files/pkg-message.in b/audio/teamspeak3-server/files/pkg-message.in
index 09461b74a565..d4b8410ac037 100644
--- a/audio/teamspeak3-server/files/pkg-message.in
+++ b/audio/teamspeak3-server/files/pkg-message.in
@@ -6,7 +6,7 @@ To enable the TeamSpeak server, set
 in your /etc/rc.conf and then use it like any other service.
 
 If you have a license file (licensekey.dat) and/or ts3server.ini,
-put it into %%PREFIX%%/etc/teamspeak
+put it into %%ETCDIR%%
 
 To see the admin token after the first start, have a look
 into the logs in /var/log/teamspeak
diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in
index e580ccc3d43c..c277b1640b90 100644
--- a/audio/teamspeak3-server/files/teamspeak.in
+++ b/audio/teamspeak3-server/files/teamspeak.in
@@ -18,10 +18,10 @@
 name="teamspeak"
 rcvar=teamspeak_enable
 
-db_dir=/var/db/teamspeak
-log_dir=/var/log/teamspeak
+db_dir=%%DBDIR%%
+log_dir=%%LOGDIR%%
 
-pidfile=/var/db/teamspeak/teamspeak_server.pid
+pidfile=%%DBDIR%%/teamspeak_server.pid
 procname=%%PREFIX%%/libexec/teamspeak_server
 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"
diff --git a/audio/teamspeak3-server/pkg-plist b/audio/teamspeak3-server/pkg-plist
index 0121cf6ec6cd..e44b0e25d39c 100644
--- a/audio/teamspeak3-server/pkg-plist
+++ b/audio/teamspeak3-server/pkg-plist
@@ -215,6 +215,8 @@ share/teamspeak/server/serverquerydocs/serveredit.txt
 share/teamspeak/server/serverquerydocs/servergroupadd.txt
 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
@@ -236,6 +238,9 @@ share/teamspeak/server/serverquerydocs/serversnapshotcreate.txt
 share/teamspeak/server/serverquerydocs/serversnapshotdeploy.txt
 share/teamspeak/server/serverquerydocs/serverstart.txt
 share/teamspeak/server/serverquerydocs/serverstop.txt
+share/teamspeak/server/serverquerydocs/servertemppasswordadd.txt
+share/teamspeak/server/serverquerydocs/servertemppassworddel.txt
+share/teamspeak/server/serverquerydocs/servertemppasswordlist.txt
 share/teamspeak/server/serverquerydocs/setclientchannelgroup.txt
 share/teamspeak/server/serverquerydocs/tokenadd.txt
 share/teamspeak/server/serverquerydocs/tokendelete.txt
@@ -248,6 +253,9 @@ share/teamspeak/server/serverquerydocs/whoami.txt
 @comment directories
 @dirrm share/teamspeak/server
 @dirrmtry share/teamspeak
-@dirrmtry etc/teamspeak
-@dirrmtry /var/db/teamspeak
-@dirrmtry /var/log/teamspeak
+@dirrmtry %%ETCDIR%%
+@comment these three exec lines are needed for pkg_add
+@exec install -d -o %%USERS%% -g %%GROUPS%% %%DBDIR%%
+@exec install -d -o %%USERS%% -g %%BINGRP%% %%LOGDIR%%
+@exec mkdir -p %D/%%ETCDIR%%
+@unexec rmdir %%DBDIR%% %%LOGDIR%% 2>/dev/null || true