Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Mar 2006 00:47:58 -0500
From:      "Anish Mistry" <amistry@am-productions.biz>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Cc:        tremere@cainites.net
Subject:   ports/95063: RCify audio/teamspeak_server
Message-ID:  <1143611278.75659@bigguy.am-productions.biz>
Resent-Message-ID: <200603290550.k2T5oMJC053103@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95063
>Category:       ports
>Synopsis:       RCify audio/teamspeak_server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 29 05:50:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Anish Mistry
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
AM Productions 
>Environment:


System: FreeBSD 6.1-PRERELEASE #0: Sun Mar 12 15:46:31 EST 2006
    amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY



>Description:


Change teamspeak to use the RC system.


>How-To-Repeat:





>Fix:


--- teamspeak-RCify.patch begins here ---
diff -ruN teamspeak_server.orig/Makefile teamspeak_server/Makefile
--- teamspeak_server.orig/Makefile	Wed Mar 29 00:21:09 2006
+++ teamspeak_server/Makefile	Wed Mar 29 00:25:06 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	teamspeak_server
 PORTVERSION=	2.0.20.1
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/
 DISTNAME=	ts2_server_rc2_20201
@@ -20,14 +21,13 @@
 NO_BUILD=	yes
 USE_LINUX=	yes
 
+USE_RC_SUBR=	teamspeak-server.sh
+
 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 -
-	${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/teamspeak_server.sh.sample
-	${RM} ${WRKSRC}/teamspeak_server.sh
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
diff -ruN teamspeak_server.orig/files/teamspeak-server.sh.in teamspeak_server/files/teamspeak-server.sh.in
--- teamspeak_server.orig/files/teamspeak-server.sh.in	Wed Dec 31 19:00:00 1969
+++ teamspeak_server/files/teamspeak-server.sh.in	Wed Mar 29 00:03:32 2006
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: teamspeak
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD shutdown
+
+[ -z "${teamspeak_enable}" ] && teamspeak_enable="NO"
+
+. /etc/rc.subr
+
+prefix=%%PREFIX%%
+
+name=teamspeak
+homedir="${prefix}/lib/teamspeak_server"
+pidfile="${homedir}/server.pid"
+teamspeak_user=${name}
+command="${homedir}/server_linux"
+command_args=">/dev/null"
+
+rcvar=`set_rcvar`
+
+stop_postcmd="teamspeak_poststop"
+
+load_rc_config $name
+
+teamspeak_poststop()
+{
+	/bin/rm -f "${pidfile}"
+}
+
+run_rc_command $*
diff -ruN teamspeak_server.orig/files/teamspeak_server.sh teamspeak_server/files/teamspeak_server.sh
--- teamspeak_server.orig/files/teamspeak_server.sh	Wed Mar 29 00:21:09 2006
+++ teamspeak_server/files/teamspeak_server.sh	Wed Dec 31 19:00:00 1969
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the TeamSpeak 2 server
-#
-
-TSHOME=%%TSHOME%%
-PIDFILE=${TSHOME}/server.pid
-
-cd "$TSHOME"
-
-case "$1" in
-	start)
-		su -fm teamspeak -c './server_linux >/dev/null' && echo -n ' teamspeak_server'
-		;;
-	stop)
-		kill -TERM `cat "$PIDFILE"`
-		;;
-	restart)
-		$0 stop
-		echo 5 second pause before restart. . .
-		sleep 5
-		$0 start
-		;;
-	*)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-exit 0
-
diff -ruN teamspeak_server.orig/pkg-plist teamspeak_server/pkg-plist
--- teamspeak_server.orig/pkg-plist	Wed Mar 29 00:21:09 2006
+++ teamspeak_server/pkg-plist	Wed Mar 29 00:22:44 2006
@@ -1,4 +1,3 @@
-etc/rc.d/teamspeak_server.sh.sample
 lib/teamspeak_server/INSTALL
 lib/teamspeak_server/INSTALL.mysql
 lib/teamspeak_server/Manual/C1H_HTML.css
--- teamspeak-RCify.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1143611278.75659>