From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 23 22:30:02 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AEB2497 for ; Sun, 23 Mar 2014 22:30:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19E18D5D for ; Sun, 23 Mar 2014 22:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NMU1mY051288 for ; Sun, 23 Mar 2014 22:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2NMU1L4051287; Sun, 23 Mar 2014 22:30:01 GMT (envelope-from gnats) Resent-Date: Sun, 23 Mar 2014 22:30:01 GMT Resent-Message-Id: <201403232230.s2NMU1L4051287@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, Johannes Jost Meixner Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D67EB48C; Sun, 23 Mar 2014 22:29:57 +0000 (UTC) Received: from dd16522.kasserver.com (dd16522.kasserver.com [85.13.137.124]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 62FDED53; Sun, 23 Mar 2014 22:29:57 +0000 (UTC) Received: from mx12.chaot.net (82.131.59.205.cable.starman.ee [82.131.59.205]) by dd16522.kasserver.com (Postfix) with ESMTPSA id 88C658D4015; Sun, 23 Mar 2014 23:29:55 +0100 (CET) Received: from localhost (1003@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id b59482c0; Mon, 24 Mar 2014 00:29:54 +0200 (EET) Message-Id: <14484847494210273959.enqueue@mx12.chaot.net> Date: Mon, 24 Mar 2014 00:29:54 +0200 (EET) From: Johannes Jost Meixner To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187864: [PATCH] games/linux-ut: Stage Cc: scf@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 22:30:02 -0000 >Number: 187864 >Category: ports >Synopsis: [PATCH] games/linux-ut: Stage >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 23 22:30:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #6: Wed Mar 19 11:02:48 EET 2014 >Description: - Stagify Port maintainer (scf@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- linux-ut-436.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348896) +++ Makefile (working copy) @@ -65,7 +65,6 @@ MAPS_EXCLUDE= # Empty .endif -NO_STAGE= yes do-extract: @${CAT} ${PKGMESSAGE} @${MKDIR} ${WRKSRC} @@ -111,7 +110,7 @@ # Anthology release CD #################################### .if defined(ANTHOLOGY) - @cd ${DATADIR} && ${MKDIR} ${CDDIRS} + @cd ${STAGEDIR}${DATADIR} && ${MKDIR} ${CDDIRS} # We need to create a single directory with all the cab files so unshield can # find them. @@ -132,12 +131,12 @@ --exclude 'mplay*' --exclude 'Splash*' ${MAPS_EXCLUDE}\ --exclude 'edsplash.bmp' --exclude 'UnrealEd.ini'\ --exclude 'editorres*' -f - . |\ - ${TAR} x -C ${DATADIR}/`${ECHO_CMD}\ + ${TAR} x -C ${STAGEDIR}${DATADIR}/`${ECHO_CMD}\ 3_UnrealTournament_${group} | ${SED} -e\ 's/3_UnrealTournament_//; s/_All//; s/_English//;'` -f - .endfor - @cd ${DATADIR}/System &&\ + @cd ${STAGEDIR}${DATADIR}/System &&\ ${MV} -f epiccustommodels.u EpicCustomModels.u &&\ ${MV} -f multimesh.u MultiMesh.u &&\ ${MV} -f multimesh.int MultiMesh.int &&\ @@ -148,7 +147,7 @@ ${MV} -f tcowmeshskins.int TCowMeshSkins.int &&\ ${MV} -f tnalimeshskins.int TNaliMeshSkins.int &&\ ${MV} -f tskmskins.int TSkMSkins.int - @cd ${DATADIR}/Textures &&\ + @cd ${STAGEDIR}${DATADIR}/Textures &&\ ${MV} -f tcowmeshskins.utx TCowMeshSkins.utx &&\ ${MV} -f tnalimeshskins.utx TNaliMeshSkins.utx &&\ ${MV} -f tskmskins.utx TSkMSkins.utx @@ -166,10 +165,10 @@ --exclude 'edsplash.bmp' --exclude 'UnrealEd.ini'\ --exclude 'editorres*' --exclude 'mplay*'\ ${MAPS_EXCLUDE} -f - ${dir} |\ - ${TAR} x -C ${DATADIR} -f - + ${TAR} x -C ${STAGEDIR}${DATADIR} -f - .endfor - @${RM} ${DATADIR}/Logs/delete_me.txt - @${RMDIR} ${DATADIR}/Logs + @${RM} ${STAGEDIR}${DATADIR}/Logs/delete_me.txt + @${RMDIR} ${STAGEDIR}${DATADIR}/Logs .endif #################################### # End of CD release-specific install @@ -178,7 +177,7 @@ # Install v436 Linux binaries. @${ECHO_CMD} "Installing v436 patch files" .for tarfile in Credits OpenGL.ini data - @${TAR} zox -C ${DATADIR} --exclude '*.exe'\ + @${TAR} zox -C ${STAGEDIR}${DATADIR} --exclude '*.exe'\ -f ${WRKSRC}/${tarfile}.tar.gz .endfor @@ -187,15 +186,15 @@ # Apply v436 files. @${ECHO_CMD} "Applying v436 patch" @${WRKSRC}/setup.data/bin/FreeBSD/x86/loki_patch\ - ${WRKSRC}/setup.data/patch.dat ${DATADIR} + ${WRKSRC}/setup.data/patch.dat ${STAGEDIR}${DATADIR} .endif # Adjust paths in configuration. @${SED} -i "" -e 's|\\|/|g'\ -e "/^Paths=/{h;s|\(Paths=\)\.\./|\1${DATADIR}/|;x;p;x;}"\ - ${DATADIR}/System/UnrealTournament.ini + ${STAGEDIR}${DATADIR}/System/UnrealTournament.ini .for script in ucc ut - @${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${PREFIX}/bin/ + @${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${STAGEDIR}${PREFIX}/bin/ .endfor # Install bonus packs @@ -202,25 +201,25 @@ @${ECHO_CMD} "Installing bonus packs" .for ndx in 1 2 3 4 .if defined(WITHOUT_MAPS) - @${TAR} jx -C ${DATADIR} --exclude '*.unr' -f ${WRKSRC}/bp${ndx}.tar.bz2 + @${TAR} jx -C ${STAGEDIR}${DATADIR} --exclude '*.unr' -f ${WRKSRC}/bp${ndx}.tar.bz2 .else - @${TAR} jx -C ${DATADIR} -f ${WRKSRC}/bp${ndx}.tar.bz2 + @${TAR} jx -C ${STAGEDIR}${DATADIR} -f ${WRKSRC}/bp${ndx}.tar.bz2 .endif .endfor # Install bonus packs. .for datafile in README README.Loki README.bonus.pack.collection - @${INSTALL_DATA} ${WRKSRC}/${datafile} ${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/${datafile} ${STAGEDIR}${DATADIR} .endfor # Install 451 Patch .if defined(WITH_451PATCH) @${ECHO_CMD} "Installing v${UTVERSION} patch files" - @${TAR} jx -C ${DATADIR} --exclude 'checkfiles.sh'\ + @${TAR} jx -C ${STAGEDIR}${DATADIR} --exclude 'checkfiles.sh'\ --exclude 'patch.md5' --exclude 'd3ddrv.int'\ --exclude 'edsplash.bmp' --exclude 'UnrealEd.ini'\ --exclude 'editorres*' -f ${_DISTDIR}/${PATCH451FILES:C/:.*//} - @cd ${DATADIR}/System &&\ + @cd ${STAGEDIR}${DATADIR}/System &&\ ${MV} -f glidedrv.int GlideDrv.int &&\ ${MV} -f softdrv.int SoftDrv.int &&\ ${MV} -f opengldrv.int OpenGlDrv.int &&\ @@ -229,10 +228,7 @@ ${MV} -f windrv.int WinDrv.int .endif -# Replace older libSDL included with UT; it has issues with the Nvidia driver -# when using Fedora 8 at the base. - @${LN} -sf ${LINUXBASE}/usr/lib/libSDL-1.2.so.0\ - ${DATADIR}/System/libSDL-1.1.so.0 +# Don't replace older libSDL included with UT - linux base is new enough # Remove /usr/local from ut-bin lib search path @${ECHO_CMD} "Removing /usr/local from ut-bin's library search path" @@ -245,17 +241,17 @@ # Set file permissions @${ECHO_CMD} "Setting permissions" - @${FIND} ${DATADIR} -print0 |\ + @${FIND} ${STAGEDIR}${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 |\ + @${FIND} ${STAGEDIR}${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE} + @${FIND} ${STAGEDIR}${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${NOBINMODE} + @${FIND} ${STAGEDIR}${DATADIR} \( -name "*.so" -o -name "lib*.so*" \) -print0 |\ ${XARGS} -0 ${CHMOD} ${BINMODE} .for exec in ucc-bin ut-bin - @${CHMOD} ${BINMODE} ${DATADIR}/System/${exec} + @${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/System/${exec} .endfor - @${TOUCH} ${DATADIR}/Help/ReleaseNotes.htm + @${TOUCH} ${STAGEDIR}${DATADIR}/Help/ReleaseNotes.htm @${ECHO_CMD} "Install complete" .include --- linux-ut-436.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: