Update for teamspeak_server port update

	Updates to not install as root, and installs startup script as .sample.

PR:		ports/56918
Submitted by:	Daniel O'Connor <darius@dons.net.au>

6 files changed, 32 insertions, 16 deletions

diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index 0fe09f734c58..a0b2a4695a58 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	teamspeak_server
 PORTVERSION=	2.0.19.40
 PORTREVISION=1
 CATEGORIES=	audio net
-MASTER_SITES=	http://www.teamspeak.org/files/ \
-		ftp://ftp.ngz-network.de/pub/11/4/releases/ \
+MASTER_SITES=	ftp://ftp2.teamspeak.org/releases/ \
+		http://www.teamspeak.org/files/ \
 		http://www.gsoft.com.au/~doconnor/
 DISTNAME=	ts2_server_rc2_201940
 
@@ -24,12 +24,20 @@ USE_LINUX=	yes
 NO_FILTER_SHLIBS=yes
 
 do-install:
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 	${MKDIR} ${PREFIX}/lib/teamspeak_server
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX}/lib/teamspeak_server -xf -
-	${CHOWN} -R nobody:nobody ${PREFIX}/lib/teamspeak_server
-	${CHMOD} -R u+w,o-rx ${PREFIX}/lib/teamspeak_server
 	${SED} -e 's#%%TSHOME%%#${PREFIX}/lib/teamspeak_server#' <${FILESDIR}/teamspeak_server.sh >${WRKSRC}/teamspeak_server.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/teamspeak_server.sh ${PREFIX}/etc/rc.d/
+	${INSTALL_SCRIPT} ${WRKSRC}/teamspeak_server.sh ${PREFIX}/etc/rc.d/teamspeak_server.sh.sample
 	${RM} ${WRKSRC}/teamspeak_server.sh
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+post-deinstall:
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
+
+.include <bsd.port.pre.mk>
+PKGDEINSTALL=	${PKGINSTALL}
+.include <bsd.port.post.mk>
diff --git a/audio/teamspeak3-server/files/teamspeak_server.sh b/audio/teamspeak3-server/files/teamspeak_server.sh
index cfff238856a7..be5137cbfcc1 100644
--- a/audio/teamspeak3-server/files/teamspeak_server.sh
+++ b/audio/teamspeak3-server/files/teamspeak_server.sh
@@ -10,7 +10,7 @@ cd "$TSHOME"
 
 case "$1" in
 	start)
-		su -fm nobody -c './server_linux >/dev/null 2>&1' && echo -n ' teamspeak_server'
+		su -fm teamspeak -c './server_linux >/dev/null' && echo -n ' teamspeak_server'
 		;;
 	stop)
 		kill -TERM `cat "$PIDFILE"`
diff --git a/audio/teamspeak3-server/pkg-plist b/audio/teamspeak3-server/pkg-plist
index 12c01c437644..724547de73be 100644
--- a/audio/teamspeak3-server/pkg-plist
+++ b/audio/teamspeak3-server/pkg-plist
@@ -1,4 +1,4 @@
-etc/rc.d/teamspeak_server.sh
+etc/rc.d/teamspeak_server.sh.sample
 lib/teamspeak_server/changelog.txt
 lib/teamspeak_server/httpdocs/choice_box.html
 lib/teamspeak_server/httpdocs/database_client_manager.html
diff --git a/audio/teamspeak_server/Makefile b/audio/teamspeak_server/Makefile
index 0fe09f734c58..a0b2a4695a58 100644
--- a/audio/teamspeak_server/Makefile
+++ b/audio/teamspeak_server/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	teamspeak_server
 PORTVERSION=	2.0.19.40
 PORTREVISION=1
 CATEGORIES=	audio net
-MASTER_SITES=	http://www.teamspeak.org/files/ \
-		ftp://ftp.ngz-network.de/pub/11/4/releases/ \
+MASTER_SITES=	ftp://ftp2.teamspeak.org/releases/ \
+		http://www.teamspeak.org/files/ \
 		http://www.gsoft.com.au/~doconnor/
 DISTNAME=	ts2_server_rc2_201940
 
@@ -24,12 +24,20 @@ USE_LINUX=	yes
 NO_FILTER_SHLIBS=yes
 
 do-install:
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 	${MKDIR} ${PREFIX}/lib/teamspeak_server
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX}/lib/teamspeak_server -xf -
-	${CHOWN} -R nobody:nobody ${PREFIX}/lib/teamspeak_server
-	${CHMOD} -R u+w,o-rx ${PREFIX}/lib/teamspeak_server
 	${SED} -e 's#%%TSHOME%%#${PREFIX}/lib/teamspeak_server#' <${FILESDIR}/teamspeak_server.sh >${WRKSRC}/teamspeak_server.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/teamspeak_server.sh ${PREFIX}/etc/rc.d/
+	${INSTALL_SCRIPT} ${WRKSRC}/teamspeak_server.sh ${PREFIX}/etc/rc.d/teamspeak_server.sh.sample
 	${RM} ${WRKSRC}/teamspeak_server.sh
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+post-deinstall:
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
+
+.include <bsd.port.pre.mk>
+PKGDEINSTALL=	${PKGINSTALL}
+.include <bsd.port.post.mk>
diff --git a/audio/teamspeak_server/files/teamspeak_server.sh b/audio/teamspeak_server/files/teamspeak_server.sh
index cfff238856a7..be5137cbfcc1 100644
--- a/audio/teamspeak_server/files/teamspeak_server.sh
+++ b/audio/teamspeak_server/files/teamspeak_server.sh
@@ -10,7 +10,7 @@ cd "$TSHOME"
 
 case "$1" in
 	start)
-		su -fm nobody -c './server_linux >/dev/null 2>&1' && echo -n ' teamspeak_server'
+		su -fm teamspeak -c './server_linux >/dev/null' && echo -n ' teamspeak_server'
 		;;
 	stop)
 		kill -TERM `cat "$PIDFILE"`
diff --git a/audio/teamspeak_server/pkg-plist b/audio/teamspeak_server/pkg-plist
index 12c01c437644..724547de73be 100644
--- a/audio/teamspeak_server/pkg-plist
+++ b/audio/teamspeak_server/pkg-plist
@@ -1,4 +1,4 @@
-etc/rc.d/teamspeak_server.sh
+etc/rc.d/teamspeak_server.sh.sample
 lib/teamspeak_server/changelog.txt
 lib/teamspeak_server/httpdocs/choice_box.html
 lib/teamspeak_server/httpdocs/database_client_manager.html