- Update to 451

- Pass maintainership to submitter

PR:		ports/101339
Submitted by:	Alexander Logvinov <ports at logvinov.com>

7 files changed, 83 insertions, 73 deletions

diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index ce195cdda415..36b4e261b3a6 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	utserver
-PORTVERSION=	436
-PORTREVISION=	5
+PORTVERSION=	451
 CATEGORIES=	games linux
-MASTER_SITES=	http://public.planetmirror.com/pub/lokigames/installers/ut/ \
-		http://fileserver.talkware.net/ut/ \
-		http://freebsd.unixfreunde.de/sources/
-DISTNAME=	ut-server-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
+MASTER_SITES=   http://public.planetmirror.com/pub/lokigames/installers/ut/:p436 \
+		http://fileserver.talkware.net/ut/:p436 \
+		http://freebsd.unixfreunde.de/sources/:p436 \
+		http://www.utpg.org/patches/:p451
+DISTFILES=      ut-server-436.tar.gz:p436 ${PATCH451FILES}
+EXTRACT_ONLY=   ut-server-436.tar.gz
+
+MAINTAINER=	ports@logvinov.com
 COMMENT=	Unreal Tournament Dedicated Server for Linux
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
@@ -27,66 +28,30 @@ NO_CDROM=	Size; the data set is much too big
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ut-server
 
-UTDIR=		ut-server/
-PLIST_SUB=	UTDIR="${UTDIR}"
-EXTRA_PATCHES=	${WRKDIR}/patch-ngstatsut
-INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
-INSTALL_MY_DATA=	${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 644
-
-# files which should be installed with executable perms
-EXECUTABLES=	ucc ucc-bin ngStatsUT ngStatsUT.exe ngWorldStats \
-		bgWorldStats ngWorldStats.exe
+UTDIR=          ut-server
+PLIST_SUB=      UTDIR="${UTDIR}/"
+SUB_LIST=       UTDIR="${PREFIX}/${UTDIR}"
+SUB_FILES=      pkg-message
+PATCH451FILES=  UTPGPatch451.tar.bz2:p451
+EXTRA_PATCHES=  ${WRKDIR}/patch-ngstatsut
 
 pre-patch:
+	@${SED} -e "s!%%LOCALBASE%%!${LOCALBASE}!" \
+	    -e "s!%%UTDIR%%!${PREFIX}/${UTDIR}!" \
+	    ${FILESDIR}/template-patch-ngstatsut > \
+	    ${WRKDIR}/patch-ngstatsut
+
+do-patch:
+	@${TAR} jx -C ${WRKSRC} -X ${FILESDIR}/excludefiles \
+	   -f ${_DISTDIR}/${PATCH451FILES:C/:.*//}
 # remove trailing ^M
 	@${FIND} -E ${WRKSRC} -type f \
-		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|int|lst|pl|pm|sc|sh|scr|txt|url|uhtm)" \
+		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|int|lst|pl|pm|sc|sh|scr|txt|url|uhtm|inc)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
-	@${SED} -e "s!%%LOCALBASE%%!${LOCALBASE}!" \
-		-e "s!%%LINUXBASE%%!${LINUXBASE}!" \
-		-e "s!%%UTDIR%%!${UTDIR}!" \
-		${FILESDIR}/template-patch-ngstatsut > \
-		${WRKDIR}/patch-ngstatsut
-
-do-install: install-parse-plist install-run-scripts
-
-# Contributed by <lioux@FreeBSD.org>
-install-parse-plist: generate-plist
-	@${PERL} -e 'open(FHANDLER,"${TMPPLIST}");' \
-		-e 'open(FDIR,">${WRKDIR}/dirs.sh.tmp");' \
-		-e 'open(FFILES,">${WRKDIR}/files.sh");' \
-		-e 'while (!eof(FHANDLER)) {' \
-			-e 'chop($$file = <FHANDLER>);' \
-			-e '$$dir = $$file_partial = $$file;' \
-			-e '$$file_partial =~ s!^${UTDIR}!!;' \
-			-e 'print FDIR "${INSTALL_DIR}", \
-				" ", "\"${PREFIX}/$$dir\"", \
-				"\n" if $$dir =~ s!(^\@dirrm\s+)!!;' \
-			-e 'if ($$file !~ m!^\@!) {' \
-				-e '$$program_flag = 0;' \
-				-e 'if ("${EXECUTABLES}" ne "") {' \
-					-e 'foreach $$program_pattern \
-						(split (/\s+/,"${EXECUTABLES}")) {' \
-						-e '($$program_flag = 1 , break) \
-							if ($$file =~ /$$program_pattern$$/);' \
-					-e '}' \
-				-e '}' \
-				-e 'print FFILES ($$program_flag == 0) ? \
-					"${INSTALL_MY_DATA}" : "${INSTALL_SCRIPT}", \
-					" ", "\"${WRKSRC}/$$file_partial\"", \
-					" ", "\"${PREFIX}/$$file\"", \
-					"\n";' \
-			-e '}' \
-		-e '}' \
-		-e 'close(FFILES);' \
-		-e 'close(FDIR);' \
-		-e 'close(FHANDLER);'
-	@${SORT} ${WRKDIR}/dirs.sh.tmp > ${WRKDIR}/dirs.sh
 
-install-run-scripts:
-.for script in dirs files
-	@${SH} ${WRKDIR}/${script}.sh
-.endfor
+do-install:
+	@${CP} -Rp ${WRKSRC}/ ${PREFIX}/${UTDIR}
+	@${RM} -f ${PREFIX}/${UTDIR}/System/libSDL-1.1.so.0
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/utserver/distinfo b/games/utserver/distinfo
index 989656064b9d..b2cc5630f624 100644
--- a/games/utserver/distinfo
+++ b/games/utserver/distinfo
@@ -1,3 +1,6 @@
 MD5 (ut-server-436.tar.gz) = 10cd7353aa9d758a075c600a6dd193fd
 SHA256 (ut-server-436.tar.gz) = 282b5d71d53322c76052af3aa9e73292efcd42b1b074bd924631a9766b9e00f6
 SIZE (ut-server-436.tar.gz) = 92769123
+MD5 (UTPGPatch451.tar.bz2) = 77a735a78b1eb819042338859900b83b
+SHA256 (UTPGPatch451.tar.bz2) = 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d
+SIZE (UTPGPatch451.tar.bz2) = 3064473
diff --git a/games/utserver/files/excludefiles b/games/utserver/files/excludefiles
new file mode 100644
index 000000000000..24de4f1c7980
--- /dev/null
+++ b/games/utserver/files/excludefiles
@@ -0,0 +1,24 @@
+System/d3ddrv.int
+System/editor.int
+System/galaxy.int
+System/glidedrv.int
+System/libSDL-1.1.so.0
+System/opengldrv.int
+System/softdrv.int
+System/windrv.int
+System/Galaxy.int
+System/NullDrv.so
+System/NullNetDriver.so
+System/NullRender.so
+System/OpenGLDrv.so
+System/OpenGlDrv.int
+System/Render.so
+System/SDLGLDrv.so
+System/SoftDrv.ini
+System/UnrealEd.ini
+System/WinDrv.int
+System/edsplash.bmp
+System/ut-bin
+System/editorres
+checkfiles.sh
+patch.md5
diff --git a/games/utserver/pkg-message b/games/utserver/files/pkg-message.in
index b428a91bf6af..adb3d2931b99 100644
--- a/games/utserver/pkg-message
+++ b/games/utserver/files/pkg-message.in
@@ -6,5 +6,9 @@ environment. There is a zombie-process bug if running UT as
 user root.
 ------------------------------------------------------------
 
+Read %%UTDIR%%/Help/ReadMe.htm for troubleshooting, hints,
+tips, information and %%UTDIR%%/Help/ReleaseNotes.htm 
+for version release notes.
+
 If you want to use ngStats and/or ngWorldStats 
 install a 1.2 jdk from /usr/ports/java/*jdk12
diff --git a/games/utserver/files/template-patch-ngstatsut b/games/utserver/files/template-patch-ngstatsut
index 037cf402a21f..991398aead3e 100644
--- a/games/utserver/files/template-patch-ngstatsut
+++ b/games/utserver/files/template-patch-ngstatsut
@@ -12,7 +12,7 @@
 +## 2001-10-18 (matuska)
 +##   modifications to suit FreeBSD UT installation
 +
-+INSTALL_DIR="%%LINUXBASE%%/%%UTDIR%%/System"
++INSTALL_DIR="%%UTDIR%%/System"
 +
 +# set three possible locations for the java executable
 +
@@ -37,7 +37,7 @@
  NGHOME1="../NetGamesUSA.com/ngStats"
  NGHOME2="$INSTALL_DIR/../NetGamesUSA.com/ngStats"
 -NGHOME3="$HOME/UnrealTournament/NetGamesUSA.com/ngStats"
-+NGHOME3="%%LINUXBASE%%/%%UTDIR%/NetGamesUSA.com/ngStats"
++NGHOME3="%%UTDIR%%/NetGamesUSA.com/ngStats"
  
  # try each of the above to see if they work
  
diff --git a/games/utserver/pkg-descr b/games/utserver/pkg-descr
index a9d7f04263d3..5919dc7f6bc3 100644
--- a/games/utserver/pkg-descr
+++ b/games/utserver/pkg-descr
@@ -3,7 +3,7 @@ Unreal Tournament Dedicated Server under FreeBSD (with Linux
 emulation).
 
 Dedicated server of the very popular first person shooter game.
-- default install points to '/compat/linux/usr/games/ut-server/'
+- default install points to '/usr/local/ut-server/'
 
 netgames patch ver 0.8.2 by Abfackeln included
 
@@ -11,6 +11,7 @@ WWW: http://ut.abfackeln.com/installer.html?page=dedicated
 
 For more information about UT visit:
 http://www.unrealtournament.com/
+http://www.utpg.org/
 
 For more information about configuring Linux UT servers visit:
 http://www.planetunreal.com/TheAdminPage/TheLinuxServer.htm
diff --git a/games/utserver/pkg-plist b/games/utserver/pkg-plist
index 2a1d57cc4a46..24df2b291d41 100644
--- a/games/utserver/pkg-plist
+++ b/games/utserver/pkg-plist
@@ -1,8 +1,9 @@
-%%PORTDOCS%%%%UTDIR%%Help/Logo.bmp
-%%PORTDOCS%%%%UTDIR%%Help/ReadMe.htm
-%%PORTDOCS%%%%UTDIR%%Help/Unreal.ico
-%%PORTDOCS%%%%UTDIR%%Help/UnrealTournamentSetupLogo.bmp
-%%PORTDOCS%%%%UTDIR%%Help/UnrealTournamentSetupLogo.gif
+%%UTDIR%%Help/Logo.bmp
+%%UTDIR%%Help/ReadMe.htm
+%%UTDIR%%Help/Unreal.ico
+%%UTDIR%%Help/UnrealTournamentSetupLogo.bmp
+%%UTDIR%%Help/UnrealTournamentSetupLogo.gif
+%%UTDIR%%Help/ReleaseNotes.htm
 %%UTDIR%%Logs/delete_me.txt
 %%UTDIR%%Maps/AS-Frigate.unr
 %%UTDIR%%Maps/AS-Guardia.unr
@@ -182,7 +183,6 @@
 %%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
@@ -435,6 +435,14 @@
 %%UTDIR%%Web/images/right.gif
 %%UTDIR%%Web/menu.uhtm
 %%UTDIR%%Web/message.uhtm
+%%UTDIR%%Web/inc/content_footer_tables.inc
+%%UTDIR%%Web/inc/content_header_tables.inc
+%%UTDIR%%Web/inc/footer.inc
+%%UTDIR%%Web/inc/header.inc
+%%UTDIR%%Web/inc/menu_footer.inc
+%%UTDIR%%Web/inc/menu_header.inc
+%%UTDIR%%Web/inc/top_begin.inc
+%%UTDIR%%Web/inc/top_end.inc
 %%UTDIR%%Web/plaintext/current.uhtm
 %%UTDIR%%Web/plaintext/current_console.uhtm
 %%UTDIR%%Web/plaintext/current_console_log.uhtm
@@ -456,9 +464,14 @@
 %%UTDIR%%Web/plaintext/menu.uhtm
 %%UTDIR%%Web/plaintext/message.uhtm
 %%UTDIR%%Web/plaintext/root.uhtm
+%%UTDIR%%Web/plaintext/inc/footer.inc
+%%UTDIR%%Web/plaintext/inc/header.inc
+%%UTDIR%%Web/plaintext/inc/whiteheader.inc
 %%UTDIR%%Web/root.uhtm
 %%UTDIR%%ucc
+@dirrm %%UTDIR%%Web/plaintext/inc
 @dirrm %%UTDIR%%Web/plaintext
+@dirrm %%UTDIR%%Web/inc
 @dirrm %%UTDIR%%Web/images
 @dirrm %%UTDIR%%Web
 @dirrm %%UTDIR%%Textures
@@ -484,5 +497,5 @@
 @dirrm %%UTDIR%%Music
 @dirrm %%UTDIR%%Maps
 @dirrm %%UTDIR%%Logs
-%%PORTDOCS%%@dirrm %%UTDIR%%Help
-@unexec rmdir %D/%%UTDIR%% 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%UTDIR%%`` to remove any configuration files and logs left." | fmt
+@dirrm %%UTDIR%%Help
+@dirrmtry %%UTDIR%%