aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2001-10-27 06:08:04 +0800
committerlioux <lioux@FreeBSD.org>2001-10-27 06:08:04 +0800
commitb1c29990a9fb4f3200f05722d6f5348c2861df1b (patch)
treeee85c7dd1dc2b45c19af828145b53e10a6cad800
parent641bb9b2d9841317eccffe2d480a4f7737b9adec (diff)
downloadfreebsd-ports-gnome-b1c29990a9fb4f3200f05722d6f5348c2861df1b.tar.gz
freebsd-ports-gnome-b1c29990a9fb4f3200f05722d6f5348c2861df1b.tar.zst
freebsd-ports-gnome-b1c29990a9fb4f3200f05722d6f5348c2861df1b.zip
o make all installation user writable; otherwise, nothing works
o update ngstats to 0.8.2 (from abfackeln) o update PKGMESSAGE o bump PORTREVISION due to these Submitted by: MAINTAINER
-rw-r--r--games/utserver/Makefile9
-rw-r--r--games/utserver/files/patch-NetGamesUSA.com:ngStats:ngStatsUT.cfg608
-rw-r--r--games/utserver/files/template-patch-ngstatsut65
-rw-r--r--games/utserver/pkg-descr2
-rw-r--r--games/utserver/pkg-message7
-rw-r--r--games/utserver/pkg-plist1
6 files changed, 673 insertions, 19 deletions
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index 999fc705e143..7cb15c42b826 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= utserver
PORTVERSION= 436
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= ftp://utservers:idspispopd@ftp.lokigames.com/ \
http://arcadia.inf.udec.cl/ftp/pub/linux/ut-server/ \
@@ -33,12 +33,13 @@ WRKSRC= ${WRKDIR}/ut-server
UTDIR= usr/games/ut-server/
PLIST_SUB= UTDIR="${UTDIR}"
EXTRA_PATCHES= ${WRKDIR}/patch-ngstatsut
-INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
+INSTALL_MY_DATA= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 644
SORT?= /usr/bin/sort
# files which should be installed with executable perms
EXECUTABLES= ucc ucc-bin ngStatsUT ngStatsUT.exe ngWorldStats \
- ngWorldStats.exe
+ bgWorldStats ngWorldStats.exe
post-extract:
.for file in ${DISTFILES:S/${EXTRACT_ONLY}//}
@@ -85,7 +86,7 @@ install-parse-plist: generate-plist
-e '}' \
-e '}' \
-e 'print FFILES ($$program_flag == 0) ? \
- "${INSTALL_DATA}" : "${INSTALL_SCRIPT}", \
+ "${INSTALL_MY_DATA}" : "${INSTALL_SCRIPT}", \
" ", "\"${WRKSRC}/$$file_partial\"", \
" ", "\"${PREFIX}/$$file\"", \
"\n";' \
diff --git a/games/utserver/files/patch-NetGamesUSA.com:ngStats:ngStatsUT.cfg b/games/utserver/files/patch-NetGamesUSA.com:ngStats:ngStatsUT.cfg
new file mode 100644
index 000000000000..f6091b9a4a40
--- /dev/null
+++ b/games/utserver/files/patch-NetGamesUSA.com:ngStats:ngStatsUT.cfg
@@ -0,0 +1,608 @@
+--- NetGamesUSA.com/ngStats/ngStatsUT.cfg Thu Oct 18 18:27:19 2001
++++ NetGamesUSA.com/ngStats/ngStatsUT.cfg Thu Oct 18 18:27:19 2001
+@@ -93,7 +93,7 @@
+ # false = do not create graphs
+
+
+-SpawnBrowser true
++SpawnBrowser false
+
+ #SpawnBrowser = Advanced option for those running dedicated servers on which it
+ #is undesirable to have ngStatsUT.exe automatically launch the default web browser
+--- NetGamesUSA.com/ngWorldStats/bin/bgWorldStats Thu Jan 1 01:00:00 1970
++++ NetGamesUSA.com/ngWorldStats/bin/bgWorldStats Thu Oct 18 18:27:19 2001
+@@ -0,0 +1,277 @@
++#!/bin/bash
++defopts=-vrl
++
++# bgWorldStats 1.2
++# Copyright (c) 2001 "Ouch@Schooner.COM"
++#
++# Permission to use, copy, modify, and distribute this software and its
++# documentation for any purpose and without fee is hereby granted,
++# provided that the above copyright notice appear in all copies.
++# The author makes no representations about the suitability of this
++# software for any purpose. It is provided "as is" without express
++# or implied warranty.
++#
++# http://illuminati.guildhappy.com/
++#
++# This will run the NG stats sender in the background, immediately returning
++# to UT.
++#
++# Installation:
++# Put this script (chmod a+x) into same directory as the existing
++# ngWorldStats binary:
++# <UT>/NetGamesUSA.com/ngWorldStats/bin
++# and call it "bgWorldStats"
++#
++# Change your server's .ini to include this:
++#
++# WorldBatcherURL=../NetGamesUSA.com/ngWorldStats/bin/bgWorldStats
++# WorldBatcherParams=-vrl
++#
++# Or, edit the "defopts" line above to include "-vrl"
++#
++# NOTICE:
++# This script has only been tested on FreeBSD with the Linux UT server
++# started with the "-nohomedir" option.
++#
++
++#
++# Inspired by ngWorldStats.sh, originally by <abfackeln@abfackeln.com>
++# and modified (v1.2) by Leif Sawyer <leif@gci.net>
++#
++
++#
++# Change history:
++# 2001-02-26 1.2 released
++# close leaked fd's (bash required), add -C and -R options
++# 2001-01-30 1.1 released
++# first public release
++
++Usage() {
++ echo 2>&1 Usage: `basename $0` '[-vlrDCR] [-s statsbin] [-d logsdir] [-g gametype]
++ Options:
++ -v verbose ngWorldStats output
++ -r carry forward last result code
++ -l direct output to transcript log (only saved if an error occurs)
++
++ Debugging (only when needed):
++ -D enable debugging output
++ -C do not close leaked file descriptors
++ -R do not remove transcript logs of successful runs
++
++ Change defaults:
++ -d logs directory path (if relative, must be from <UT>/System)
++ ["'$logs'"]
++ -g game type ["UT"]
++ -s ngWorldStats program to use ["ngWorldStats"] - not a pathname'
++ exit 2
++}
++
++# UT runs us as "../NetGamesUSA.com/ngWorldStats/bin/bgWorldStats"
++# UT execs us from the "<UT>/System" directory.
++
++bin=`dirname $0`
++logs=$bin/../logs
++
++args=`getopt DCRrvls:g:d: $defopts $*`
++if [ $? != 0 ]; then Usage; fi
++oargs=$@
++set -- $args
++for i
++do
++ case "$1" in
++ -D) debug=true ;;
++ -v) verbose=-v ;;
++ -r) doresults=true ;;
++ -l) dologfile=true ;;
++ -R) dontcleanlogs=true ;;
++ -C) dontclose=false ;;
++ -s) statsbin=$2; shift ;;
++ -d) logs=$2; shift ;;
++ -g) game=$2; shift ;;
++ --) shift; break ;;
++ esac
++ shift
++done
++case $# in
++0) ;;
++*) Usage;;
++esac
++
++#
++# Main variables
++#
++
++# ngWorldStats executable
++stats=$bin/${statsbin:-ngWorldStats}
++
++# game
++game=${game:-UT}
++
++# Saved ngWorldStats result from last run
++results=$logs/.lastresult
++
++# When we were run
++now=`date +%y%m%d-%H%M`
++
++if ${dologfile-false}
++then
++ # redirect stdout to log file of our run
++ logf=$logs/.ngrun.$now
++ exec > $logf 2>&1
++fi
++
++if ${debug-false}
++then
++ echo Started at: `date`
++ echo Called as: $0 $oargs
++ echo In Directory: `pwd`
++ echo ""
++fi
++
++# ngWorldStats exit codes
++ngE=1 # error (?)
++ngNoLog=83 # no logfiles
++ngBusy=97 # ngWorldStats already running
++ngOK=99 # ngWorldStats successful
++ngSyntax=139 # Server Syntax error
++
++#
++# Ugly shell locking code
++#
++# All systems don't have shlock(1) (from INN) or lockfile (1) (from procmail);
++# FreeBSD has lockf(1) but it doesn't have the semantics I want here.
++# So this makes up for it in a "somewhat" portable, safe fashion, under
++# the assumption that there isn't going to be significant contention.
++#
++# Lock using file path $1, returning an error message
++# (with original lock time and pid) if it fails.
++#
++# return 0 for OK; 1 for locked; 2 for lock file error
++# Error message to stdout
++#
++Lock() {
++ l=$1
++ if ! mkdir $l >/dev/null 2>&1
++ then
++ if [ ! -d $l ]
++ then
++ echo "ERROR: $l not a lock dir"
++ return 2
++ elif [ ! -r $l/lock ]
++ then
++ # race?
++ echo "ERROR: $l does not have a lock info file"
++ return 2
++ fi
++ read p d < $l/lock
++ # still around?
++ if ps p$p >/dev/null 2>&1
++ then
++ echo ALREADY LOCKED: by pid $p at $d
++ return 1
++ fi
++ # must be stale, override it
++ echo 1>&2 "STALE LOCK REMOVED: by pid $p at $d"
++ fi
++ echo $$ `date` > $l/lock
++ return 0
++}
++Unlock() {
++ l=$1
++ rm -rf $l
++}
++
++#
++# Start the real work here
++#
++
++#
++# Take a lock, or return busy to the UT server
++#
++
++lockf=$logs/.ngWS.lock
++ret=`Lock $lockf`
++if [ $? != 0 ]
++then
++ echo Lock error: $ret
++ exit $ngBusy
++fi
++
++#
++# UT leaks file descriptors (including the listening socket) to us.
++# If we don't close these, the next server instance won't be able to bind to
++# the ServerQueryPort (i.e., 7778) and will pick the next available one
++# (i.e., 7783), even if we are in the background
++#
++# How many leaked? Lots. On my server it was fds 3..70, with 8 of those
++# sockets. I don't know if it varies, so I just close "a whole bunch".
++#
++close-fds() {
++ ${debug-false} && fstat -p$$
++ fd=3
++ while [ $fd -lt $1 ]
++ do
++ # this next line requires bash2 to work for fd>9 (damn)
++ eval "exec $fd<&-"
++ fd=$(($fd+1))
++ done
++ ${debug-false} && fstat -p$$
++}
++
++# prevent fd leaks
++# do this before forking child to avoid race conditions
++${dontclose-false} || close-fds 200
++
++#
++# Start child process to send stats
++#
++
++(
++ # Give parent a moment to go away
++ sleep 1
++
++ echo Exec: $stats -d $logs -g UT $verbose
++ echo Start: `date`
++ $stats -d $logs -g UT $verbose
++ ret=$?
++ echo End: `date`
++
++ case "$ret" in
++ $ngNoLog) echo "No logfiles found" ;;
++ $ngBusy) echo "ngWorldStats already running" ;;
++ $ngOK) echo "ngWorldStats successful" ;;
++ $ngSyntax) echo "Server Syntax error" ;;
++ *) echo "ngWorldStats returned $ret" ;;
++ esac
++
++ # remove transcript log if run was OK
++ if ${dologfile-false}
++ then
++ case "$ret" in
++ $ngOK) ${dontcleanlogs-false} || rm -f $logf;;
++ esac
++ fi
++
++ if ${doresults-false}
++ then
++ echo $ret > $results
++ else
++ rm -f $results 2> /dev/null
++ fi
++
++ Unlock $lockf
++) &
++
++#
++# Meanwhile, in the parent process, return result to UT
++#
++
++# close the log file - the child will complete the output
++exec >&- 2>&-
++
++if ${doresults-false} && [ -r $results ]
++then
++ lastresults=`cat $results`
++fi
++
++exit ${lastresults:-$ngOK}
+--- NetGamesUSA.com/ngWorldStats/bin/ngWorldStats.exe Thu Oct 18 18:27:19 2001
++++ NetGamesUSA.com/ngWorldStats/bin/ngWorldStats.exe Thu Oct 18 18:27:19 2001
+@@ -1,56 +1,277 @@
+-#!/bin/sh
++#!/bin/bash
++defopts=-vrl
++
++# bgWorldStats 1.2
++# Copyright (c) 2001 "Ouch@Schooner.COM"
++#
++# Permission to use, copy, modify, and distribute this software and its
++# documentation for any purpose and without fee is hereby granted,
++# provided that the above copyright notice appear in all copies.
++# The author makes no representations about the suitability of this
++# software for any purpose. It is provided "as is" without express
++# or implied warranty.
+ #
+-# ngWorldStats.exe for linux
+-# version 0.3.0, 2000-10-06
+-# abfackeln@abfackeln.com
++# http://illuminati.guildhappy.com/
+ #
+-########################################
++# This will run the NG stats sender in the background, immediately returning
++# to UT.
+ #
+-# this file contains no user servicable parts.
++# Installation:
++# Put this script (chmod a+x) into same directory as the existing
++# ngWorldStats binary:
++# <UT>/NetGamesUSA.com/ngWorldStats/bin
++# and call it "bgWorldStats"
+ #
+-########################################
++# Change your server's .ini to include this:
+ #
+-# the objective of this script was to execute the
+-# ngWorldStats batcher without hanging up the
+-# UT server by waiting for the NetGames server
+-# to respond (which sometimes may take a long
+-# time and force the UT server to switch ports
+-# which is obviously a bad thing)
++# WorldBatcherURL=../NetGamesUSA.com/ngWorldStats/bin/bgWorldStats
++# WorldBatcherParams=-vrl
+ #
+-# a new objective is to support the home
+-# directory option introduced in loki games
+-# linux UT 4.25 server by searching for all
+-# possible locations for the ngWorldStats
+-# binary executable file
++# Or, edit the "defopts" line above to include "-vrl"
+ #
+-# comments and suggestions to enhance this
+-# script should be sent to abfackeln at
+-# abfackeln@abfackeln.com
++# NOTICE:
++# This script has only been tested on FreeBSD with the Linux UT server
++# started with the "-nohomedir" option.
++#
++
++#
++# Inspired by ngWorldStats.sh, originally by <abfackeln@abfackeln.com>
++# and modified (v1.2) by Leif Sawyer <leif@gci.net>
++#
++
+ #
+-# as always, any comments are welcome and
+-# i hope that this script alleviates all of
+-# the ngWorldStats problems from the past
++# Change history:
++# 2001-02-26 1.2 released
++# close leaked fd's (bash required), add -C and -R options
++# 2001-01-30 1.1 released
++# first public release
++
++Usage() {
++ echo 2>&1 Usage: `basename $0` '[-vlrDCR] [-s statsbin] [-d logsdir] [-g gametype]
++ Options:
++ -v verbose ngWorldStats output
++ -r carry forward last result code
++ -l direct output to transcript log (only saved if an error occurs)
++
++ Debugging (only when needed):
++ -D enable debugging output
++ -C do not close leaked file descriptors
++ -R do not remove transcript logs of successful runs
++
++ Change defaults:
++ -d logs directory path (if relative, must be from <UT>/System)
++ ["'$logs'"]
++ -g game type ["UT"]
++ -s ngWorldStats program to use ["ngWorldStats"] - not a pathname'
++ exit 2
++}
++
++# UT runs us as "../NetGamesUSA.com/ngWorldStats/bin/bgWorldStats"
++# UT execs us from the "<UT>/System" directory.
++
++bin=`dirname $0`
++logs=$bin/../logs
++
++args=`getopt DCRrvls:g:d: $defopts $*`
++if [ $? != 0 ]; then Usage; fi
++oargs=$@
++set -- $args
++for i
++do
++ case "$1" in
++ -D) debug=true ;;
++ -v) verbose=-v ;;
++ -r) doresults=true ;;
++ -l) dologfile=true ;;
++ -R) dontcleanlogs=true ;;
++ -C) dontclose=false ;;
++ -s) statsbin=$2; shift ;;
++ -d) logs=$2; shift ;;
++ -g) game=$2; shift ;;
++ --) shift; break ;;
++ esac
++ shift
++done
++case $# in
++0) ;;
++*) Usage;;
++esac
++
+ #
+-# -abf.
++# Main variables
+ #
+-########################################
+
+-WorldBatcherURL="../NetGamesUSA.com/ngWorldStats/bin/ngWorldStats"
++# ngWorldStats executable
++stats=$bin/${statsbin:-ngWorldStats}
+
+-if [ ! -x "$WorldBatcherURL" ]; then
+- INSTALL_DIR=`cat $HOME/.loki/ut/install_dir`
+- HomeBatcherURL="$INSTALL_DIR/NetGamesUSA.com/ngWorldStats/bin/ngWorldStats"
++# game
++game=${game:-UT}
+
+- if [ ! -x "$HomeBatcherURL" ]; then
+- echo "ngWS ERROR: can not exec: $WorldBatcherURL or $HomeBatcherURL"
+- exit 0
++# Saved ngWorldStats result from last run
++results=$logs/.lastresult
++
++# When we were run
++now=`date +%y%m%d-%H%M`
++
++if ${dologfile-false}
++then
++ # redirect stdout to log file of our run
++ logf=$logs/.ngrun.$now
++ exec > $logf 2>&1
++fi
++
++if ${debug-false}
++then
++ echo Started at: `date`
++ echo Called as: $0 $oargs
++ echo In Directory: `pwd`
++ echo ""
++fi
++
++# ngWorldStats exit codes
++ngE=1 # error (?)
++ngNoLog=83 # no logfiles
++ngBusy=97 # ngWorldStats already running
++ngOK=99 # ngWorldStats successful
++ngSyntax=139 # Server Syntax error
++
++#
++# Ugly shell locking code
++#
++# All systems don't have shlock(1) (from INN) or lockfile (1) (from procmail);
++# FreeBSD has lockf(1) but it doesn't have the semantics I want here.
++# So this makes up for it in a "somewhat" portable, safe fashion, under
++# the assumption that there isn't going to be significant contention.
++#
++# Lock using file path $1, returning an error message
++# (with original lock time and pid) if it fails.
++#
++# return 0 for OK; 1 for locked; 2 for lock file error
++# Error message to stdout
++#
++Lock() {
++ l=$1
++ if ! mkdir $l >/dev/null 2>&1
++ then
++ if [ ! -d $l ]
++ then
++ echo "ERROR: $l not a lock dir"
++ return 2
++ elif [ ! -r $l/lock ]
++ then
++ # race?
++ echo "ERROR: $l does not have a lock info file"
++ return 2
++ fi
++ read p d < $l/lock
++ # still around?
++ if ps p$p >/dev/null 2>&1
++ then
++ echo ALREADY LOCKED: by pid $p at $d
++ return 1
+ fi
++ # must be stale, override it
++ echo 1>&2 "STALE LOCK REMOVED: by pid $p at $d"
++ fi
++ echo $$ `date` > $l/lock
++ return 0
++}
++Unlock() {
++ l=$1
++ rm -rf $l
++}
++
++#
++# Start the real work here
++#
++
++#
++# Take a lock, or return busy to the UT server
++#
+
+- WorldBatcherURL="$HomeBatcherURL"
++lockf=$logs/.ngWS.lock
++ret=`Lock $lockf`
++if [ $? != 0 ]
++then
++ echo Lock error: $ret
++ exit $ngBusy
+ fi
+
+-$WorldBatcherURL $* &
+-echo "ngWS OK: $WorldBatcherURL $* &"
++#
++# UT leaks file descriptors (including the listening socket) to us.
++# If we don't close these, the next server instance won't be able to bind to
++# the ServerQueryPort (i.e., 7778) and will pick the next available one
++# (i.e., 7783), even if we are in the background
++#
++# How many leaked? Lots. On my server it was fds 3..70, with 8 of those
++# sockets. I don't know if it varies, so I just close "a whole bunch".
++#
++close-fds() {
++ ${debug-false} && fstat -p$$
++ fd=3
++ while [ $fd -lt $1 ]
++ do
++ # this next line requires bash2 to work for fd>9 (damn)
++ eval "exec $fd<&-"
++ fd=$(($fd+1))
++ done
++ ${debug-false} && fstat -p$$
++}
++
++# prevent fd leaks
++# do this before forking child to avoid race conditions
++${dontclose-false} || close-fds 200
++
++#
++# Start child process to send stats
++#
+
+-exit 99
++(
++ # Give parent a moment to go away
++ sleep 1
++
++ echo Exec: $stats -d $logs -g UT $verbose
++ echo Start: `date`
++ $stats -d $logs -g UT $verbose
++ ret=$?
++ echo End: `date`
++
++ case "$ret" in
++ $ngNoLog) echo "No logfiles found" ;;
++ $ngBusy) echo "ngWorldStats already running" ;;
++ $ngOK) echo "ngWorldStats successful" ;;
++ $ngSyntax) echo "Server Syntax error" ;;
++ *) echo "ngWorldStats returned $ret" ;;
++ esac
++
++ # remove transcript log if run was OK
++ if ${dologfile-false}
++ then
++ case "$ret" in
++ $ngOK) ${dontcleanlogs-false} || rm -f $logf;;
++ esac
++ fi
++
++ if ${doresults-false}
++ then
++ echo $ret > $results
++ else
++ rm -f $results 2> /dev/null
++ fi
++
++ Unlock $lockf
++) &
++
++#
++# Meanwhile, in the parent process, return result to UT
++#
++
++# close the log file - the child will complete the output
++exec >&- 2>&-
++
++if ${doresults-false} && [ -r $results ]
++then
++ lastresults=`cat $results`
++fi
+
++exit ${lastresults:-$ngOK}
diff --git a/games/utserver/files/template-patch-ngstatsut b/games/utserver/files/template-patch-ngstatsut
index c24bc1b22a40..037cf402a21f 100644
--- a/games/utserver/files/template-patch-ngstatsut
+++ b/games/utserver/files/template-patch-ngstatsut
@@ -1,21 +1,58 @@
---- NetGamesUSA.com/ngStats/ngStatsUT Tue Aug 7 15:24:12 2001
-+++ NetGamesUSA.com/ngStats/ngStatsUT Tue Aug 7 15:32:36 2001
-@@ -5,13 +5,16 @@
- ## to ensure that the files are actually found
- ## this has not really been tested, hence the debug.
- ## modified by abfackeln, 2000-10-10
+--- NetGamesUSA.com/ngStats/ngStatsUT Thu Oct 18 18:27:19 2001
++++ NetGamesUSA.com/ngStats/ngStatsUT Thu Oct 18 18:44:01 2001
+@@ -1,20 +1,27 @@
+ #!/bin/sh
+##
-+## FreeBSD directories added by RebuM, 2001-08-07
++## written by abfackeln@abfackeln.com, based on the original epic code
+##
- #######
++## 2000-10-10 (abfackeln)
++## added a lot of conditions to ensure that the files are actually found
++## 2001-06-15 (abfackeln)
++## added "at -b" as per suggestion from Matthew Hall <leareth@angui.sh>
++## 2001-10-18 (matuska)
++## modifications to suit FreeBSD UT installation
++
++INSTALL_DIR="%%LINUXBASE%%/%%UTDIR%%/System"
++
++# set three possible locations for the java executable
++
++JAVA1="%%LOCALBASE%%/linux-jdk1.2.2/bin/java"
++JAVA2=`which java`
++JAVA3="/usr/local/java/bin/java"
++
++# set three possible locations for the ngStats directory
+-#######
+-## this next bit written by abfackeln@abfackeln.com
+-## to ensure that the files are actually found
+-## this has not really been tested, hence the debug.
+-## modified by abfackeln, 2000-10-10
+-#######
+-
-INSTALL_DIR=`cat $HOME/.loki/ut/install_dir`
-+INSTALL_DIR="%%LINUXBASE%%/%%UTDIR%%"
-
- JAVA1=`which java`
- JAVA2="/usr/local/java/bin/java"
+-
+-JAVA1=`which java`
+-JAVA2="/usr/local/java/bin/java"
-JAVA3="/usr/jdk1.2/bin/java"
-+JAVA3="%%LOCALBASE%%/linux-jdk1.2.2/bin/java"
NGHOME1="../NetGamesUSA.com/ngStats"
NGHOME2="$INSTALL_DIR/../NetGamesUSA.com/ngStats"
- NGHOME3="$HOME/UnrealTournament/NetGamesUSA.com/ngStats"
+-NGHOME3="$HOME/UnrealTournament/NetGamesUSA.com/ngStats"
++NGHOME3="%%LINUXBASE%%/%%UTDIR%/NetGamesUSA.com/ngStats"
+
+ # try each of the above to see if they work
+
+@@ -52,11 +59,13 @@
+ NGHOME="$NGHOME1"
+ fi
+
+-#######
++# export the vars for the java process to use
+
+ export CLASSPATH="$NGHOME/ngusa.jar"
+ export NGCONFIG="$NGHOME/ngStatsUT.cfg"
+ export NGHOME
++
++# execute java
+
+ echo "ngLS: $JAVA ngStatsUT -c $NGCONFIG -j $NGHOME $*"
+ $JAVA ngStatsUT -c $NGCONFIG -j $NGHOME $* &
diff --git a/games/utserver/pkg-descr b/games/utserver/pkg-descr
index 95379a201c3b..a9d7f04263d3 100644
--- a/games/utserver/pkg-descr
+++ b/games/utserver/pkg-descr
@@ -5,6 +5,8 @@ emulation).
Dedicated server of the very popular first person shooter game.
- default install points to '/compat/linux/usr/games/ut-server/'
+netgames patch ver 0.8.2 by Abfackeln included
+
WWW: http://ut.abfackeln.com/installer.html?page=dedicated
For more information about UT visit:
diff --git a/games/utserver/pkg-message b/games/utserver/pkg-message
index 08bacc02174c..adb51c9e7836 100644
--- a/games/utserver/pkg-message
+++ b/games/utserver/pkg-message
@@ -4,8 +4,13 @@
It is highly recommended to run the UT server in a non-root
environment. There is a zombie-process bug if running UT as
user root.
+------------------------------------------------------------
+
+netgames patch ver 0.8.2 included (http://ut.abfackeln.com)
If you want to use ngStats and/or ngWorldStats
install linux-jdk-1.2.2 from /usr/ports/java/linux-jdk
-------------------------------------------------------------
+
+Install the ASU port from /usr/ports/games/utserver-asu
+for easy installation, customization and management.
diff --git a/games/utserver/pkg-plist b/games/utserver/pkg-plist
index 8c521c361194..2a1d57cc4a46 100644
--- a/games/utserver/pkg-plist
+++ b/games/utserver/pkg-plist
@@ -182,6 +182,7 @@
%%UTDIR%%NetGamesUSA.com/ngStats/ngusa.jar
%%UTDIR%%NetGamesUSA.com/ngStats/processedLogs/_tmp
%%UTDIR%%NetGamesUSA.com/ngStats/spawnBrowser.exe
+%%UTDIR%%NetGamesUSA.com/ngWorldStats/bin/bgWorldStats
%%UTDIR%%NetGamesUSA.com/ngWorldStats/bin/ngWS.ver
%%UTDIR%%NetGamesUSA.com/ngWorldStats/bin/ngWorldStats
%%UTDIR%%NetGamesUSA.com/ngWorldStats/bin/ngWorldStats End User License Agreement (EULA).txt