- Update to 3.0.1

- Abstract MASTER_SITES to avoid having to edit each update
- Use bsd.port.options.mk; apparently that includes ARCH

PR:		ports/162666
Submitted by:	Richard Hirner <hirner@bitfire.at> (maintainer)
Feature safe:	yes

5 files changed, 20 insertions, 20 deletions

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index 832f81a0379f..3f904fa3ee23 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	teamspeak3-server
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.1
 PORTEPOCH=	1
 CATEGORIES=	audio net
-MASTER_SITES=	http://teamspeak.gameserver.gamed.de/ts3/releases/3.0.0/ \
-		http://ftp.4players.de/pub/hosted/ts3/releases/3.0.0/
-DISTNAME=	${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}-3.0.0
+MASTER_SITES=	http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/ \
+		http://ftp.4players.de/pub/hosted/ts3/releases/${PORTVERSION}/
+DISTNAME=	${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	hirner@bitfire.at
 COMMENT=	Server side of the TeamSpeak group voice chat system
@@ -36,7 +36,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	teamspeak_server-[0-9]*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} ==	"i386"
 TEAMSPEAK_ARCH=	x86
@@ -65,8 +65,6 @@ do-install:
 	@${INSTALL_LIB} ${WRKSRC}/*.so ${LIBDIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/ts3server_freebsd_${TEAMSPEAK_ARCH} \
 		${LIBEXECDIR}/teamspeak_server
-	@${INSTALL_PROGRAM} ${WRKSRC}/tsdns/tsdnsserver_freebsd_${TEAMSPEAK_ARCH} \
-		${LIBEXECDIR}/teamspeak_tsdnsserver
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql serverquerydocs" ${SHAREDIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -81,4 +79,4 @@ post-install:
 	@${MKDIR} ${LOGDIR} && ${CHOWN} -R ${USERS}:${BINGRP} ${LOGDIR}
 	@${CAT} ${WRKDIR}/pkg-message
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/teamspeak3-server/distinfo b/audio/teamspeak3-server/distinfo
index eff6236581f2..87915f5110b5 100644
--- a/audio/teamspeak3-server/distinfo
+++ b/audio/teamspeak3-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (teamspeak3-server_freebsd-x86-3.0.0.tar.gz) = 89efc3fc6d3a5258d792ab062825a3d6b9a235490b603331477801e64bf8d4e0
-SIZE (teamspeak3-server_freebsd-x86-3.0.0.tar.gz) = 4372935
-SHA256 (teamspeak3-server_freebsd-amd64-3.0.0.tar.gz) = 1e9b784a18ec270f8f0c5e8739ecdbdd8737babab550175ad67431422ec0b13d
-SIZE (teamspeak3-server_freebsd-amd64-3.0.0.tar.gz) = 3869845
+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
diff --git a/audio/teamspeak3-server/files/pkg-message.in b/audio/teamspeak3-server/files/pkg-message.in
index 4119916f3d1f..09461b74a565 100644
--- a/audio/teamspeak3-server/files/pkg-message.in
+++ b/audio/teamspeak3-server/files/pkg-message.in
@@ -11,5 +11,5 @@ put it into %%PREFIX%%/etc/teamspeak
 To see the admin token after the first start, have a look
 into the logs in /var/log/teamspeak
 
-TeamSpeak DNS server can be found in libexec dir but is not
-started automatically.
+TeamSpeak DNS server (tsdns) is not handled by this port. If you
+need id, please download and install it manually.
diff --git a/audio/teamspeak3-server/pkg-descr b/audio/teamspeak3-server/pkg-descr
index abd1bfba9168..54b1671eac5f 100644
--- a/audio/teamspeak3-server/pkg-descr
+++ b/audio/teamspeak3-server/pkg-descr
@@ -1,4 +1,6 @@
 A proprietary software which allows groups of people to speak over
 the Internet.  This port contains the TeamSpeak 3 server part.
 
+No tsdns support available (yet). If you need it, extract & install yourself.
+
 WWW: http://www.teamspeak.com
diff --git a/audio/teamspeak3-server/pkg-plist b/audio/teamspeak3-server/pkg-plist
index a8867e072380..0121cf6ec6cd 100644
--- a/audio/teamspeak3-server/pkg-plist
+++ b/audio/teamspeak3-server/pkg-plist
@@ -1,12 +1,13 @@
 @stopdaemon teamspeak
+@comment basic files
 lib/teamspeak/server/libts3db_sqlite3.so
 lib/teamspeak/server/libts3db_mysql.so
 @dirrm lib/teamspeak/server
 @dirrmtry lib/teamspeak
 libexec/teamspeak_server
-libexec/teamspeak_tsdnsserver
 share/teamspeak/server/LICENSE
 share/teamspeak/server/CHANGELOG
+@comment sql files
 share/teamspeak/server/sql/ban_delete.sql
 share/teamspeak/server/sql/ban_insert.sql
 share/teamspeak/server/sql/ban_list.sql
@@ -65,11 +66,6 @@ share/teamspeak/server/sql/groups_get_by_serverid_type.sql
 share/teamspeak/server/sql/info_delete.sql
 share/teamspeak/server/sql/info_get_by_ident.sql
 share/teamspeak/server/sql/info_insert.sql
-share/teamspeak/server/sql/log_delete.sql
-share/teamspeak/server/sql/log_insert.sql
-share/teamspeak/server/sql/log_list.sql
-share/teamspeak/server/sql/log_list_comparator.sql
-share/teamspeak/server/sql/log_list_comparator_ordered.sql
 share/teamspeak/server/sql/message_delete.sql
 share/teamspeak/server/sql/message_get_by_clientid.sql
 share/teamspeak/server/sql/message_get_unread_by_clientid.sql
@@ -97,6 +93,7 @@ share/teamspeak/server/sql/server_get_byid.sql
 share/teamspeak/server/sql/server_get_byport.sql
 share/teamspeak/server/sql/server_insert.sql
 share/teamspeak/server/sql/server_list.sql
+share/teamspeak/server/sql/server_list_by_machine_id.sql
 share/teamspeak/server/sql/server_snapshot_delete.sql
 share/teamspeak/server/sql/server_snapshot_delete_failed.sql
 share/teamspeak/server/sql/server_update_autostart.sql
@@ -114,11 +111,13 @@ share/teamspeak/server/sql/update_15.sql
 share/teamspeak/server/sql/update_16.sql
 share/teamspeak/server/sql/update_17.sql
 share/teamspeak/server/sql/update_18.sql
+share/teamspeak/server/sql/update_19.sql
 share/teamspeak/server/sql/update_database_version.sql
 share/teamspeak/server/sql/update_permissions_12.sql
 @dirrm share/teamspeak/server/sql/create_mysql
 @dirrm share/teamspeak/server/sql/create_sqlite
 @dirrm share/teamspeak/server/sql
+@comment serverquerydocs files
 share/teamspeak/server/serverquerydocs/banadd.txt
 share/teamspeak/server/serverquerydocs/banclient.txt
 share/teamspeak/server/serverquerydocs/bandel.txt
@@ -246,6 +245,7 @@ share/teamspeak/server/serverquerydocs/use.txt
 share/teamspeak/server/serverquerydocs/version.txt
 share/teamspeak/server/serverquerydocs/whoami.txt
 @dirrm share/teamspeak/server/serverquerydocs
+@comment directories
 @dirrm share/teamspeak/server
 @dirrmtry share/teamspeak
 @dirrmtry etc/teamspeak