- Stage support

PR:		190474
Submitted by:	maintainer

3 files changed, 33 insertions, 30 deletions

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index 88444d1fcbd6..a37409b4a37a 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	teamspeak3-server
 PORTVERSION=	3.0.10.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://dl.4players.de/ts/releases/${PORTVERSION}/ \
@@ -18,37 +19,35 @@ 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
 
+LIB_DEPENDS=	libiconv.so.3:${PORTSDIR}/converters/libiconv
+
 .ifdef (BATCH)
 IGNORE=		license ${LICENSE} needs confirmation, but BATCH is defined
 .endif
 
-USES=		iconv
-NO_STAGE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/teamspeak/server
+NO_BUILD=	yes
+USE_LDCONFIG=	${LIBDIR}
 USE_RC_SUBR=	teamspeak
 SUB_FILES=	pkg-message
+USE_GCC=        yes
 
 RESTRICTED=	No redistribution
 ONLY_FOR_ARCHS=	amd64 i386
 
-NO_BUILD=	yes
-
 USERS=	teamspeak
 GROUPS=	teamspeak
 
 CONFLICTS=	teamspeak_server-[0-9]*
 
 PLIST_SUB+=	DBDIR=${DBDIR} \
+		ETCDIR=${ETCDIR} \
 		LOGDIR=${LOGDIR} \
-		USERS=${USERS} \
-		GROUPS=${GROUPS} \
 		BINGRP=${BINGRP}
 
 SUB_LIST+=	DBDIR=${DBDIR} \
+		ETCDIR=${ETCDIR} \
 		LOGDIR=${LOGDIR}
 
-OPTIONS_DEFINE=	DOCS
-
 .include <bsd.port.options.mk>
 
 .if ${ARCH} ==	"i386"
@@ -62,7 +61,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd-${TEAMSPEAK_ARCH}
 DBDIR=	/var/db/teamspeak
 ETCDIR=	${PREFIX}/etc/teamspeak
 LIBDIR=	${PREFIX}/lib/teamspeak/server
-LIBEXECDIR=	${PREFIX}/libexec/
+LIBEXECDIR=	${PREFIX}/libexec
 LOGDIR=	/var/log/teamspeak
 SHAREDIR=	${PREFIX}/share/teamspeak/server
 PORTDOCS=	ts3_serverquery_manual.pdf \
@@ -72,24 +71,26 @@ PORTDOCS=	ts3_serverquery_manual.pdf \
 		server_upgrade.txt
 
 do-install:
-	@${MKDIR} ${LIBDIR} ${SHAREDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${SHAREDIR}
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${SHAREDIR}
-	@${INSTALL_LIB} ${WRKSRC}/*.so ${LIBDIR}
+	@${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_PROGRAM} ${WRKSRC}/ts3server_freebsd_${TEAMSPEAK_ARCH} \
-		${LIBEXECDIR}/teamspeak_server
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql serverquerydocs" ${SHAREDIR})
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.   for DOCFILE in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}
-.   endfor
-.endif
+		${STAGEDIR}${LIBEXECDIR}/teamspeak_server
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.	for DOCFILE in ${PORTDOCS}
+		@${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${STAGEDIR}${DOCSDIR}
+.	endfor
 
 post-install:
-	@${INSTALL} -d -o ${USERS} -g ${GROUPS} ${DBDIR}
-	@${INSTALL} -d -o ${USERS} -g ${BINGRP} ${LOGDIR}
-	@${MKDIR} ${ETCDIR}
+	@${INSTALL} -d ${STAGEDIR}${DBDIR}
+	@${INSTALL} -d ${STAGEDIR}${LOGDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${CAT} ${WRKDIR}/pkg-message
 
 .include <bsd.port.mk>
diff --git a/audio/teamspeak3-server/files/pkg-message.in b/audio/teamspeak3-server/files/pkg-message.in
index 36136a1010b7..515cd5ff4ff5 100644
--- a/audio/teamspeak3-server/files/pkg-message.in
+++ b/audio/teamspeak3-server/files/pkg-message.in
@@ -12,4 +12,4 @@ To see the admin token after the first start, have a look
 into the logs in %%LOGDIR%%
 
 TeamSpeak DNS server (tsdns) is not handled by this port. If you
-need id, please download and install it manually.
+need it, please download and install it manually.
diff --git a/audio/teamspeak3-server/pkg-plist b/audio/teamspeak3-server/pkg-plist
index 31300908c1c3..15f75bdf56e4 100644
--- a/audio/teamspeak3-server/pkg-plist
+++ b/audio/teamspeak3-server/pkg-plist
@@ -251,9 +251,11 @@ share/teamspeak/server/sql/update_permissions_12.sql
 @dirrm share/teamspeak/server
 @dirrmtry share/teamspeak
 @dirrmtry %%ETCDIR%%
+@owner teamspeak
+@group teamspeak
 @dirrmtry %%DBDIR%%
+@group %%BINGRP%%
 @dirrmtry %%LOGDIR%%
-@comment installation with correct permissions
-@exec install -d -o %%USERS%% -g %%GROUPS%% %%DBDIR%%
-@exec install -d -o %%USERS%% -g %%BINGRP%% %%LOGDIR%%
-@exec mkdir -p %D/%%ETCDIR%%
+@comment pkg_tools compatibility
+@exec install -d -o teamspeak -g teamspeak %D/%%DBDIR%%
+@exec install -d -o teamspeak -g %%BINGRP%% %D/%%LOGDIR%%