Date: Mon, 24 Mar 2014 00:29:54 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: scf@FreeBSD.org Subject: ports/187864: [PATCH] games/linux-ut: Stage Message-ID: <14484847494210273959.enqueue@mx12.chaot.net> Resent-Message-ID: <201403232230.s2NMU1L4051287@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
--- linux-ut-436.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14484847494210273959.enqueue>