From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 29 05:50:25 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5900B16A420 for ; Wed, 29 Mar 2006 05:50:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CEBA43D45 for ; Wed, 29 Mar 2006 05:50:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2T5oMqm053104 for ; Wed, 29 Mar 2006 05:50:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2T5oMJC053103; Wed, 29 Mar 2006 05:50:22 GMT (envelope-from gnats) Resent-Date: Wed, 29 Mar 2006 05:50:22 GMT Resent-Message-Id: <200603290550.k2T5oMJC053103@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Anish Mistry" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6C0916A422 for ; Wed, 29 Mar 2006 05:44:40 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from smtp1.fuse.net (mail-out1.fuse.net [216.68.8.174]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C76A43D49 for ; Wed, 29 Mar 2006 05:44:40 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from gx5.fuse.net ([69.61.164.22]) by smtp1.fuse.net (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20060329054439.PFFN22519.smtp1.fuse.net@gx5.fuse.net> for ; Wed, 29 Mar 2006 00:44:39 -0500 Received: from bigguy.am-productions.biz ([69.61.164.22]) by gx5.fuse.net (InterMail vG.1.02.00.02 201-2136-104-102-20041210) with ESMTP id <20060329054439.KZY4651.gx5.fuse.net@bigguy.am-productions.biz>; Wed, 29 Mar 2006 00:44:39 -0500 Message-Id: <1143611278.75659@bigguy.am-productions.biz> Date: Wed, 29 Mar 2006 00:47:58 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: tremere@cainites.net Subject: ports/95063: RCify audio/teamspeak_server X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2006 05:50:25 -0000 >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: