From user@blg.akavia.ru  Fri Aug 11 00:37:11 2006
Return-Path: <user@blg.akavia.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E9DFE16A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Aug 2006 00:37:11 +0000 (UTC)
	(envelope-from user@blg.akavia.ru)
Received: from blg.akavia.ru (blg.akavia.ru [62.33.174.250])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C80E643D7E
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Aug 2006 00:37:01 +0000 (GMT)
	(envelope-from user@blg.akavia.ru)
Received: from blg.akavia.ru (localhost.blg.akavia.ru [127.0.0.1])
	by blg.akavia.ru (8.13.6/8.13.3) with ESMTP id k7B0awYv063743
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Aug 2006 10:36:58 +1000 (YAKST)
	(envelope-from user@blg.akavia.ru)
Received: (from root@localhost)
	by blg.akavia.ru (8.13.6/8.13.3/Submit) id k7B0awCC063742;
	Fri, 11 Aug 2006 10:36:58 +1000 (YAKST)
	(envelope-from user)
Message-Id: <200608110036.k7B0awCC063742@blg.akavia.ru>
Date: Fri, 11 Aug 2006 10:36:58 +1000 (YAKST)
From: Alexander Logvinov <ports@logvinov.com>
Reply-To: Alexander Logvinov <ports@logvinov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] games/utserver
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         101792
>Category:       ports
>Synopsis:       [maintainer update] games/utserver
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 11 00:40:10 GMT 2006
>Closed-Date:    Fri Aug 11 14:45:52 GMT 2006
>Last-Modified:  Fri Aug 11 14:45:52 GMT 2006
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:

>Description:
  
   Removed bad master sites according to portsurvey and added new mirrors.
   Changed WWW link to remove redirect.
   Added some checks of /usr/sbin/daemon and support user to run command 
   as in rc_subr script.

>How-To-Repeat:

>Fix:

diff -ruN --exclude=CVS /usr/ports/games/utserver/Makefile /home/utserver/Makefile
--- /usr/ports/games/utserver/Makefile	Thu Aug 10 14:51:06 2006
+++ /home/utserver/Makefile	Fri Aug 11 09:32:44 2006
@@ -7,11 +7,11 @@
 
 PORTNAME=	utserver
 PORTVERSION=	451
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games linux
-MASTER_SITES=   http://public.planetmirror.com/pub/lokigames/installers/ut/:p436 \
-		http://fileserver.talkware.net/ut/:p436 \
-		http://freebsd.unixfreunde.de/sources/:p436 \
+MASTER_SITES=   http://freebsd.unixfreunde.de/sources/:p436 \
+		ftp://ftp.wireplay.co.uk/pub/unrealtournament/server/:p436 \
+		ftp://ftp.fh-niederrhein.de/pub/win9x/gamesup/ut/:p436 \
 		http://www.utpg.org/patches/:p451
 DISTFILES=      ut-server-436.tar.gz:p436 ${PATCH451FILES}
 EXTRACT_ONLY=   ut-server-436.tar.gz
diff -ruN --exclude=CVS /usr/ports/games/utserver/files/ucc.in /home/utserver/files/ucc.in
--- /usr/ports/games/utserver/files/ucc.in	Thu Aug 10 14:04:48 2006
+++ /home/utserver/files/ucc.in	Fri Aug 11 09:21:33 2006
@@ -35,12 +35,21 @@
         return 1
     fi
     echo Starting ${name}.
+    if [ ! -x /usr/sbin/daemon ]; then
+	err 1 "/usr/sbin/daemon required"
+    fi
+    if ! /usr/sbin/daemon 2>&1 | grep pidfile > /dev/null; then
+	err 1 "/usr/sbin/daemon with -p option required"
+    fi
     if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then
	err 1 "Linux support required"
-        return
     fi
     cd %%UTDIR%%/System/
-    /usr/sbin/daemon -p ${ucc_pidfile} ${command} ${command_args} 2>&1 >> ${ucc_logfile}
+    cmd="/usr/sbin/daemon -p ${ucc_pidfile} ${command} ${command_args}"
+    if [ -n "$ucc_user" ]; then
+	cmd="su -m $ucc_user -c '$cmd'"
+    fi
+    eval "$cmd 2>&1 >> ${ucc_logfile}"
 }
        
 run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/games/utserver/pkg-descr /home/utserver/pkg-descr
--- /usr/ports/games/utserver/pkg-descr	Mon Aug  7 13:07:48 2006
+++ /home/utserver/pkg-descr	Fri Aug 11 08:59:10 2006
@@ -7,7 +7,7 @@
 
 netgames patch ver 0.8.2 by Abfackeln included
 
-WWW: http://ut.abfackeln.com/installer.html?page=dedicated
+WWW: http://ut.abfackeln.com/asu.html?page=dedicated
 
 For more information about UT visit:
 http://www.unrealtournament.com/
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: bsam 
Responsible-Changed-When: Fri Aug 11 14:06:43 UTC 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101792 
State-Changed-From-To: open->closed 
State-Changed-By: bsam 
State-Changed-When: Fri Aug 11 14:44:35 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

Note: your patch didn't apply cleanly (mixed using of spaces/tabs between 
your port version and that at CVS). I advice you using a command 
"cvs diff -uN" against the CVS version to file a PR. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=101792 
>Unformatted:
