- Update to 451

- Fix network play by fixing the paths within the UnrealTournament.ini
  file to actually be usable by the user. Removing of the
  ${HOME}/.loki/ut directory to fix this issue is recommended.

PR:		ports/99990
Submitted by:	Sean Farley <sean-freebsd@farley.org> (maintainer)
Approved by:	netchild (mentor, implicit)

4 files changed, 91 insertions, 13 deletions

diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index 5da5ea5c2c27..ea9447979602 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	linux-ut
-PORTVERSION=	436
+PORTVERSION=	451
 CATEGORIES=	games linux
-MASTER_SITES=	http://liflg.org/?what=dl&catid=6&gameid=51&filename=
-DISTFILES=	unreal.tournament_436-multilanguage.run \
-		unreal.tournament.official.bonus.pack.collection.run
+MASTER_SITES=	"http://liflg.org/?what=dl&catid=6&gameid=51&filename=":p436 \
+		http://www.utpg.org/patches/:p451
+DISTFILES=	${PATCH436FILES} \
+		${PATCH451FILES}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sean-freebsd@farley.org
 COMMENT=	Unreal Tournament for Linux
 
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+
 # A redirect will occur, so have fetch save the file with the correct name.
 FETCH_CMD=	/usr/bin/fetch -Rr
 FETCH_BEFORE_ARGS=	-o $${file}
@@ -24,15 +27,19 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
-NO_PACKAGE=	Distribution is 340MB\; set FORCE_PACKAGE if you really want\
+NO_PACKAGE=	Distribution is 340MB; set FORCE_PACKAGE if you really want\
 		to build this package
 RESTRICTED=	Redistribution is limited, see license
 IS_INTERACTIVE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
+PATCH436FILES=	unreal.tournament_436-multilanguage.run:p436 \
+		unreal.tournament.official.bonus.pack.collection.run:p436
+PATCH451FILES=	UTPGPatch451.tar.bz2:p451
+
 do-extract:
 	@${MKDIR} ${WRKSRC}
-.for file in ${DISTFILES}
+.for file in ${PATCH436FILES:C/:.*//}
 	@cd ${WRKSRC} &&\
 		${SED} -e '1,/exit $$res/d' ${_DISTDIR}/${file} | ${TAR} zxf -
 .endfor
@@ -50,8 +57,9 @@ post-patch:
 #   - Copy desired content off of CD to drive.  Windows files left behind.
 #   - Extract files from Linux patch minus various language files (necessary?).
 #   - Extract bonus pack.
-#   - Patch .ini file to use absolute paths to content.
-#   - Apply Linux patch.
+#   - Patch .ini file to also use absolute paths to content in addition to the
+#     relative paths for user saved content.
+#   - Apply Linux patches.
 #   - Install scripts and README's.
 #   - Set permissions on files and directories.
 do-install:
@@ -76,18 +84,19 @@ do-install:
 		${TAR} x -C ${DATADIR} -f -
 .endfor
 	@${RM} ${DATADIR}/Logs/delete_me.txt
-	@${ECHO_CMD} "Installing v${PORTVERSION} patch files"
+	@${ECHO_CMD} "Installing v436 patch files"
 .for tarfile in Credits NetGamesUSA.com OpenGL.ini data
 	@${TAR} zox -C ${DATADIR} --exclude '*.exe'\
 		-f ${WRKSRC}/${tarfile}.tar.gz
 .endfor
 	@${ECHO_CMD} "Installing bonus pack"
 .for ndx in 1 2 3 4
-	@${TAR} jox -C ${DATADIR} -f ${WRKSRC}/bp${ndx}.tar.bz2
+	@${TAR} jx -C ${DATADIR} -f ${WRKSRC}/bp${ndx}.tar.bz2
 .endfor
-	@${SED} -i "" -e "s|\.\.\\\\|${DATADIR}\\\\|" -e "s|\.\./|${DATADIR}/|"\
+	@${SED} -i "" -e 's|\\|/|g'\
+		-e "/^Paths=/{h;s|\(Paths=\)\.\./|\1${DATADIR}/|;x;p;x;}"\
 		${DATADIR}/System/UnrealTournament.ini
-	@${ECHO_CMD} "Applying v${PORTVERSION} patch"
+	@${ECHO_CMD} "Applying v436 patch"
 	@${WRKSRC}/setup.data/bin/FreeBSD/x86/loki_patch\
 		${WRKSRC}/setup.data/patch.dat ${DATADIR}
 .for script in ucc ut
@@ -96,7 +105,20 @@ do-install:
 .for datafile in README README.Loki README.bonus.pack.collection
 	@${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR}
 .endfor
+	@${ECHO_CMD} "Installing v${PORTVERSION} patch files"
+	@${TAR} jx -C ${DATADIR} --exclude 'checkfiles.sh'\
+		--exclude 'patch.md5' --exclude 'd3ddrv.int'\
+		-f ${_DISTDIR}/${PATCH451FILES:C/:.*//}
+	@cd ${DATADIR}/System &&\
+		${MV} -f glidedrv.int GlideDrv.int &&\
+		${MV} -f softdrv.int SoftDrv.int &&\
+		${MV} -f opengldrv.int OpenGlDrv.int &&\
+		${MV} -f galaxy.int Galaxy.int &&\
+		${MV} -f editor.int Editor.int &&\
+		${MV} -f windrv.int WinDrv.int
 	@${ECHO_CMD} "Setting permissions"
+	@${FIND} ${DATADIR} -print0 |\
+		${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${NOBINMODE}
 	@${FIND} ${DATADIR} \( -name "*.so" -o -name "lib*.so*" \) -print0 |\
diff --git a/games/linux-ut/distinfo b/games/linux-ut/distinfo
index 684f5747355c..ba4f1973fa8c 100644
--- a/games/linux-ut/distinfo
+++ b/games/linux-ut/distinfo
@@ -4,3 +4,6 @@ SIZE (linux-ut/unreal.tournament_436-multilanguage.run) = 7492482
 MD5 (linux-ut/unreal.tournament.official.bonus.pack.collection.run) = 82e71a81de1eaf4e09648372c0ca7289
 SHA256 (linux-ut/unreal.tournament.official.bonus.pack.collection.run) = b4ac49ab1df2bd9644d05e0dfe6a67effbaeab739b6073c98220872eb9eec464
 SIZE (linux-ut/unreal.tournament.official.bonus.pack.collection.run) = 37213789
+MD5 (linux-ut/UTPGPatch451.tar.bz2) = 77a735a78b1eb819042338859900b83b
+SHA256 (linux-ut/UTPGPatch451.tar.bz2) = 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d
+SIZE (linux-ut/UTPGPatch451.tar.bz2) = 3064473
diff --git a/games/linux-ut/pkg-descr b/games/linux-ut/pkg-descr
index 4255822ad50e..05c905583496 100644
--- a/games/linux-ut/pkg-descr
+++ b/games/linux-ut/pkg-descr
@@ -8,8 +8,9 @@ in multiplayer mode with up to 16 bots and/or humans.
 Step into the Unreal arena and stake your life in the pursuit of victory
 as the Unreal Grand Master. Or suffer the agonizing death of defeat.
 
-For information about the Linux patch/installer
+For information about the Linux patch/installer (436 and 451 respectively):
 WWW:  http://liflg.org/?catid=6&gameid=51
+WWW:  http://www.utpg.org/
 
 For more information about UT visit:
 http://www.unrealtournament.com/
diff --git a/games/linux-ut/pkg-plist b/games/linux-ut/pkg-plist
index a452f2d51962..c25e980c81ca 100644
--- a/games/linux-ut/pkg-plist
+++ b/games/linux-ut/pkg-plist
@@ -4,6 +4,7 @@ bin/ut
 %%DATADIR%%/Help/BonusPackReadme.txt
 %%DATADIR%%/Help/Logo.bmp
 %%DATADIR%%/Help/ReadMe.htm
+%%DATADIR%%/Help/ReleaseNotes.htm
 %%DATADIR%%/Help/UnrealTournamentLogo.bmp
 %%DATADIR%%/Help/UnrealTournamentSetupLogo.bmp
 %%DATADIR%%/Help/demutators-readme.txt
@@ -307,6 +308,7 @@ bin/ut
 %%DATADIR%%/System/MultiMesh.int
 %%DATADIR%%/System/MultiMesh.u
 %%DATADIR%%/System/NullDrv.so
+%%DATADIR%%/System/NullNetDriver.so
 %%DATADIR%%/System/NullRender.so
 %%DATADIR%%/System/OpenGLDrv.so
 %%DATADIR%%/System/OpenGlDrv.ini
@@ -347,6 +349,7 @@ bin/ut
 %%DATADIR%%/System/UWeb.u
 %%DATADIR%%/System/UWindow.u
 %%DATADIR%%/System/Unreal.int
+%%DATADIR%%/System/UnrealEd.ini
 %%DATADIR%%/System/UnrealEd.int
 %%DATADIR%%/System/UnrealI.int
 %%DATADIR%%/System/UnrealI.u
@@ -361,6 +364,41 @@ bin/ut
 %%DATADIR%%/System/de-logo.bmp
 %%DATADIR%%/System/de.int
 %%DATADIR%%/System/de.u
+%%DATADIR%%/System/editorres/AddMover.bmp
+%%DATADIR%%/System/editorres/AddSpecial.bmp
+%%DATADIR%%/System/editorres/BBCone.bmp
+%%DATADIR%%/System/editorres/BBCube.bmp
+%%DATADIR%%/System/editorres/BBCurvedStair.bmp
+%%DATADIR%%/System/editorres/BBCylinder.bmp
+%%DATADIR%%/System/editorres/BBGeneric.bmp
+%%DATADIR%%/System/editorres/BBLinearStair.bmp
+%%DATADIR%%/System/editorres/BBSheet.bmp
+%%DATADIR%%/System/editorres/BBSphere.bmp
+%%DATADIR%%/System/editorres/BBSpiralStair.bmp
+%%DATADIR%%/System/editorres/BBTerrain.bmp
+%%DATADIR%%/System/editorres/BBVolumetric.bmp
+%%DATADIR%%/System/editorres/BrushClip.bmp
+%%DATADIR%%/System/editorres/BrushClipDelete.bmp
+%%DATADIR%%/System/editorres/BrushClipFlip.bmp
+%%DATADIR%%/System/editorres/BrushClipSplit.bmp
+%%DATADIR%%/System/editorres/HideSelected.bmp
+%%DATADIR%%/System/editorres/InvertSelections.bmp
+%%DATADIR%%/System/editorres/ModeAdd.bmp
+%%DATADIR%%/System/editorres/ModeBrushClip.bmp
+%%DATADIR%%/System/editorres/ModeCamera.bmp
+%%DATADIR%%/System/editorres/ModeDeintersect.bmp
+%%DATADIR%%/System/editorres/ModeFaceDrag.bmp
+%%DATADIR%%/System/editorres/ModeIntersect.bmp
+%%DATADIR%%/System/editorres/ModeRotate.bmp
+%%DATADIR%%/System/editorres/ModeScale.bmp
+%%DATADIR%%/System/editorres/ModeSubtract.bmp
+%%DATADIR%%/System/editorres/ModeVertex.bmp
+%%DATADIR%%/System/editorres/ShowAll.bmp
+%%DATADIR%%/System/editorres/ShowSelected.bmp
+%%DATADIR%%/System/editorres/TexturePan.bmp
+%%DATADIR%%/System/editorres/TextureRotate.bmp
+%%DATADIR%%/System/editorres/vssver.scc
+%%DATADIR%%/System/edsplash.bmp
 %%DATADIR%%/System/libSDL-1.1.so.0
 %%DATADIR%%/System/libmikmod.so.2
 %%DATADIR%%/System/libopenal-0.0.so
@@ -520,6 +558,14 @@ bin/ut
 %%DATADIR%%/Web/images/m3-1.gif
 %%DATADIR%%/Web/images/m3-2.gif
 %%DATADIR%%/Web/images/right.gif
+%%DATADIR%%/Web/inc/content_footer_tables.inc
+%%DATADIR%%/Web/inc/content_header_tables.inc
+%%DATADIR%%/Web/inc/footer.inc
+%%DATADIR%%/Web/inc/header.inc
+%%DATADIR%%/Web/inc/menu_footer.inc
+%%DATADIR%%/Web/inc/menu_header.inc
+%%DATADIR%%/Web/inc/top_begin.inc
+%%DATADIR%%/Web/inc/top_end.inc
 %%DATADIR%%/Web/menu.uhtm
 %%DATADIR%%/Web/message.uhtm
 %%DATADIR%%/Web/plaintext/current.uhtm
@@ -540,6 +586,9 @@ bin/ut
 %%DATADIR%%/Web/plaintext/defaults_rules.uhtm
 %%DATADIR%%/Web/plaintext/defaults_server.uhtm
 %%DATADIR%%/Web/plaintext/defaults_settings.uhtm
+%%DATADIR%%/Web/plaintext/inc/footer.inc
+%%DATADIR%%/Web/plaintext/inc/header.inc
+%%DATADIR%%/Web/plaintext/inc/whiteheader.inc
 %%DATADIR%%/Web/plaintext/menu.uhtm
 %%DATADIR%%/Web/plaintext/message.uhtm
 %%DATADIR%%/Web/plaintext/root.uhtm
@@ -566,9 +615,12 @@ bin/ut
 @dirrm %%DATADIR%%/NetGamesUSA.com/ngWorldStats
 @dirrm %%DATADIR%%/NetGamesUSA.com
 @dirrm %%DATADIR%%/Sounds
+@dirrm %%DATADIR%%/System/editorres
 @dirrm %%DATADIR%%/System
 @dirrm %%DATADIR%%/Textures
 @dirrm %%DATADIR%%/Web/images
+@dirrm %%DATADIR%%/Web/inc
+@dirrm %%DATADIR%%/Web/plaintext/inc
 @dirrm %%DATADIR%%/Web/plaintext
 @dirrm %%DATADIR%%/Web
 @dirrm %%DATADIR%%