Attachment 61279 Details for Bug 91837 – linux-alienarena.diff

[patch] linux-alienarena.diff

linux-alienarena.diff (text/plain), 9.90 KB, created by Alejandro Pulver on 2006-01-15 18:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2006-01-15 18:30:03 UTC

Size: 9.90 KB

patch

obsolete

>diff -urN /usr/ports/games/linux-alienarena/Makefile sent/linux-alienarena/Makefile
>--- /usr/ports/games/linux-alienarena/Makefile	Wed Jan 11 07:45:24 2006
>+++ sent/linux-alienarena/Makefile	Sun Jan 15 15:23:52 2006
>@@ -6,62 +6,45 @@
> #
> 
> PORTNAME=	alienarena
>-PORTVERSION=	2006
>-PORTREVISION=	1
>+PORTVERSION=	2006.0.30
> CATEGORIES=	games linux
>-MASTER_SITES=	http://www.forsakenweb.com/gamepage/loaders/games/:full \
>-		ftp://download1.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download2.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download4.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download6.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download7.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download9.gamershell.com/pub/pc/games/gamershell/demo/:full \
>-		ftp://download11.gamershell.com/pub/pc/gamershell/demo/:full \
>-		ftp://download12.gamershell.com/pub/pc/gamershell/demo/:full \
>-		ftp://download12.gamershell.com/pub/pc/gamershell/patch/:patch1 \
>-		http://offload1.icculus.org/~ravage/alienarena2006/:patch2
>+MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/:i386 \
>+		ftp://download12.gamershell.com/pub/pc/gamershell/patch/:i386 \
>+		http://offload1.icculus.org/~ravage/alienarena2006/:amd64
> PKGNAMEPREFIX=	linux-
>-DISTFILES=	${PORTNAME}-${PORTVERSION}-x86.run:full \
>-		aa2k6-update-12-30.tar.gz:patch1 \
>-		${PORTNAME}-${PORTVERSION}-i386-update-12-30.tar.gz:patch2 \
>-		${PORTNAME}-${PORTVERSION}-x86_64-update-12-30.tar.gz:patch2
>+DISTFILES=	#
> 
> MAINTAINER=	acardenas@bsd.org.pe
> COMMENT=	Alien Arena 2006 (Linux version)
> 
>-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libGLU.so.1.3:${PORTSDIR}/graphics/linux_dri \
>-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
>+RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data \
>+		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1.3:${PORTSDIR}/graphics/linux_dri
> 
> ONLY_FOR_ARCHS=	i386 amd64
> USE_X_PREFIX=	yes
> USE_LINUX=	yes
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
>-RESTRICTED=	"Redistribution is limited, see license"
>-NO_PACKAGE=	"Package will be 150MB, set FORCE_PACKAGE if you really want to build it"
> 
>-ALIENDIR=	${PREFIX}/lib/${PORTNAME}
>-ALIENDIR_REL=	${ALIENDIR:S,^${PREFIX}/,,}
>-LIBDIRS=	arena botinfo data1
>-
>-SUB_FILES=	AlienArena AlienArenaDedicated
>-
>-PLIST=		${WRKDIR}/pkg-plist
>-PLIST_FILES=	bin/AlienArena bin/AlienArenaDedicated \
>-		${ALIENDIR_REL}/crded ${ALIENDIR_REL}/crx \
>-		share/pixmaps/alienarena.xpm
>-PLIST_DIRS=	${ALIENDIR_REL}
>-PORTDOCS=	README.txt
>+OPTIONS=	SDLSOUND "Install client that uses SDL for sound" on
>+
>+SUB_FILES=	alienarena alienarena-ded
>+SUB_LIST=	LIBDIR=${LIBDIR}
>+PLIST_SUB=	GAME_LIB=${GAME_LIB} LIBDIR=${LIBDIR:S/${PREFIX}\///}
>+LIBDIR=		${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
> 
> DESKTOP_ENTRIES="Alien Arena 2006" \
> 		"Play Alien Arena 2006" \
> 		"alienarena.xpm" \
>-		"AlienArena" \
>+		"linux-alienarena" \
> 		"Application;Game;" \
> 		false
> 
> .include <bsd.port.pre.mk>
> 
>+EXE_TARGETS=	crx crded
>+SCRIPTS=	alienarena alienarena-ded
>+
> .if ${X_WINDOW_SYSTEM:L} != xfree86-3
> .if defined(WITH_NVIDIA_GL)
> RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
>@@ -73,46 +56,33 @@
> .endif
> 
> .if ${ARCH} == "i386"
>-ENGINE_ARCH=	x86
>-SDL_ARCH=	i386
>+DISTFILES+=	aa2k6-update-12-30.tar.gz:i386
>+GAME_LIB=	gamei386.so
> .elif ${ARCH} == "amd64"
>-ENGINE_ARCH=	x86_64
>-SDL_ARCH=	x86_64
>+DISTFILES+=	alienarena-2006-x86_64-update-12-30.tar.gz:amd64
>+GAME_LIB=	gamex86_64.so
> .endif
> 
>-do-extract:
>-	@${MKDIR} ${WRKSRC}
>-	@cd ${WRKSRC} && \
>-		${TAIL} -c +8778 ${_DISTDIR}/${PORTNAME}-${PORTVERSION}-x86.run | ${TAR} xfz -
>-	@${TAR} xfj ${WRKSRC}/alienarena-2006-data.tar.bz2 -C ${WRKSRC}
>-
>-	@${CP} -R ${WRKSRC}/engine/${ENGINE_ARCH}/* ${WRKSRC}
>-	@${TAR} xfz ${_DISTDIR}/aa2k6-update-12-30.tar.gz -C ${WRKSRC}
>-	@${TAR} xfz ${_DISTDIR}/${PORTNAME}-${PORTVERSION}-${SDL_ARCH}-update-12-30.tar.gz -C ${WRKSRC}
>-
>-pre-install:
>-	@${RM} -f ${PLIST}
>-	@cd ${WRKSRC} && \
>-	${FIND} ${LIBDIRS} -type f | ${SORT} \
>-		| ${SED} -e 's|^|${ALIENDIR_REL}/|' >> ${PLIST} && \
>-	${FIND} ${LIBDIRS} -type d | ${SORT} -r \
>-		| ${SED} -e 's|^|@dirrm ${ALIENDIR_REL}/|' >> ${PLIST}
>+.if defined(WITH_SDLSOUND)
>+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
>+EXE_TARGETS+=	crx.sdl
>+SCRIPTS+=	alienarena-sdl
>+SUB_FILES+=	alienarena-sdl
>+PLIST_SUB+=	SDLSOUND=""
>+.else
>+PLIST_SUB+=	SDLSOUND="@comment "
>+.endif
> 
> do-install:
>-	cd ${WRKSRC} && \
>-	${FIND} ${LIBDIRS} -type d -exec ${MKDIR} "${ALIENDIR}/{}" \; && \
>-	${FIND} ${LIBDIRS} -type f -exec ${INSTALL_DATA} "{}" "${ALIENDIR}/{}" \;
>-
>-	${INSTALL_SCRIPT} ${WRKDIR}/AlienArena ${WRKDIR}/AlienArenaDedicated ${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/crded ${ALIENDIR}
>-	${INSTALL_PROGRAM} ${WRKSRC}/crx.sdl ${ALIENDIR}/crx
>-
>-	${MKDIR} ${PREFIX}/share/pixmaps
>-	${INSTALL_DATA} ${WRKSRC}/alienarena.xpm ${PREFIX}/share/pixmaps
>-
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
>-.endif
>+	${MKDIR} ${LIBDIR}/arena
>+	${INSTALL_PROGRAM} ${WRKSRC}/arena/${GAME_LIB} ${LIBDIR}/arena
>+	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
>+	${LN} -s ${DATADIR}/botinfo ${DATADIR}/data1 ${LIBDIR}
>+.for f in ${EXE_TARGETS}
>+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${LIBDIR}
>+.endfor
>+.for f in ${SCRIPTS}
>+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin/${PKGNAMEPREFIX}${f}
>+.endfor
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/games/linux-alienarena/distinfo sent/linux-alienarena/distinfo
>--- /usr/ports/games/linux-alienarena/distinfo	Wed Jan 11 07:45:24 2006
>+++ sent/linux-alienarena/distinfo	Fri Jan 13 21:03:08 2006
>@@ -1,12 +1,6 @@
>-MD5 (alienarena-2006-x86.run) = 0467b8ec4b1cb77ef5299857b270d27d
>-SHA256 (alienarena-2006-x86.run) = 6277c5ee53b6477401c96bdaf6b1e97cc33ffeb07a8b6c13e070bc99fb5174ea
>-SIZE (alienarena-2006-x86.run) = 151752065
> MD5 (aa2k6-update-12-30.tar.gz) = 73d800a2ab17000e77a64f56f421c8db
> SHA256 (aa2k6-update-12-30.tar.gz) = 6fdf1014adcf2b674e2273038b09d10f710e6a654d4aefdf875d08df258a2922
> SIZE (aa2k6-update-12-30.tar.gz) = 9469494
>-MD5 (alienarena-2006-i386-update-12-30.tar.gz) = 68afc25be8932a09b49ffd7150884826
>-SHA256 (alienarena-2006-i386-update-12-30.tar.gz) = 49fb2a478587e592893e50ea8ec7ce03498a265266c0045417b0aafc34c60083
>-SIZE (alienarena-2006-i386-update-12-30.tar.gz) = 962039
> MD5 (alienarena-2006-x86_64-update-12-30.tar.gz) = 9be8f0629ddfe990009a6df0150d42d4
> SHA256 (alienarena-2006-x86_64-update-12-30.tar.gz) = c4e60102fb20f3f879636b7e91ed35e4c0074463e298d5433fd10d48d4187d55
> SIZE (alienarena-2006-x86_64-update-12-30.tar.gz) = 1133740
>diff -urN /usr/ports/games/linux-alienarena/files/AlienArena.in sent/linux-alienarena/files/AlienArena.in
>--- /usr/ports/games/linux-alienarena/files/AlienArena.in	Tue Nov 22 22:37:50 2005
>+++ sent/linux-alienarena/files/AlienArena.in	Wed Dec 31 21:00:00 1969
>@@ -1,4 +0,0 @@
>-#!/bin/sh
>-
>-cd %%PREFIX%%/lib/alienarena || exit 1
>-exec ./crx +set game arena "$@"
>diff -urN /usr/ports/games/linux-alienarena/files/AlienArenaDedicated.in sent/linux-alienarena/files/AlienArenaDedicated.in
>--- /usr/ports/games/linux-alienarena/files/AlienArenaDedicated.in	Tue Nov 22 22:37:50 2005
>+++ sent/linux-alienarena/files/AlienArenaDedicated.in	Wed Dec 31 21:00:00 1969
>@@ -1,4 +0,0 @@
>-#!/bin/sh
>-
>-cd %%PREFIX%%/lib/alienarena || exit 1
>-exec ./crded +set game arena +set port 27910 "$@"
>diff -urN /usr/ports/games/linux-alienarena/files/alienarena-ded.in sent/linux-alienarena/files/alienarena-ded.in
>--- /usr/ports/games/linux-alienarena/files/alienarena-ded.in	Wed Dec 31 21:00:00 1969
>+++ sent/linux-alienarena/files/alienarena-ded.in	Sat Jan 14 13:02:52 2006
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+
>+cd %%LIBDIR%% || exit 1
>+
>+exec ./crded +set game arena "$@"
>diff -urN /usr/ports/games/linux-alienarena/files/alienarena-sdl.in sent/linux-alienarena/files/alienarena-sdl.in
>--- /usr/ports/games/linux-alienarena/files/alienarena-sdl.in	Wed Dec 31 21:00:00 1969
>+++ sent/linux-alienarena/files/alienarena-sdl.in	Sat Jan 14 13:03:10 2006
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+
>+cd %%LIBDIR%% || exit 1
>+
>+exec ./crx.sdl +set game arena "$@"
>diff -urN /usr/ports/games/linux-alienarena/files/alienarena.in sent/linux-alienarena/files/alienarena.in
>--- /usr/ports/games/linux-alienarena/files/alienarena.in	Wed Dec 31 21:00:00 1969
>+++ sent/linux-alienarena/files/alienarena.in	Sat Jan 14 13:02:24 2006
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+
>+cd %%LIBDIR%% || exit 1
>+
>+exec ./crx +set game arena "$@"
>diff -urN /usr/ports/games/linux-alienarena/pkg-message sent/linux-alienarena/pkg-message
>--- /usr/ports/games/linux-alienarena/pkg-message	Wed Dec 31 21:00:00 1969
>+++ sent/linux-alienarena/pkg-message	Sat Jan 14 14:18:02 2006
>@@ -0,0 +1,15 @@
>+==============================================================================
>+
>+Alien Arena 2006 (Linux version) has been installed.
>+
>+The OSS (native FreeBSD sound) version of Alien Arena 2006 (named
>+"linux-alienarena") uses by default a slow sound speed, which causes a notable
>+delay. To solve this you have to run it once like this:
>+
>+linux-alienarena +set sndspeed <speed>
>+
>+Where <speed> could be 22050 and 44100 for example (the default that has the
>+delay is 11025, and the SDL version uses 22050). The value of "sndspeed" will
>+be saved in the configuration file for future runs.
>+
>+==============================================================================
>diff -urN /usr/ports/games/linux-alienarena/pkg-plist sent/linux-alienarena/pkg-plist
>--- /usr/ports/games/linux-alienarena/pkg-plist	Wed Dec 31 21:00:00 1969
>+++ sent/linux-alienarena/pkg-plist	Sat Jan 14 13:09:28 2006
>@@ -0,0 +1,18 @@
>+bin/linux-alienarena
>+bin/linux-alienarena-ded
>+%%SDLSOUND%%bin/linux-alienarena-sdl
>+%%LIBDIR%%/arena/ctf.cfg
>+%%LIBDIR%%/arena/default.cfg
>+%%LIBDIR%%/arena/%%GAME_LIB%%
>+%%LIBDIR%%/arena/maps.lst
>+%%LIBDIR%%/arena/motd.txt
>+%%LIBDIR%%/arena/pics
>+%%LIBDIR%%/arena/server.cfg
>+%%LIBDIR%%/arena/video
>+%%LIBDIR%%/botinfo
>+%%LIBDIR%%/crded
>+%%LIBDIR%%/crx
>+%%SDLSOUND%%%%LIBDIR%%/crx.sdl
>+%%LIBDIR%%/data1
>+@dirrm %%LIBDIR%%/arena
>+@dirrm %%LIBDIR%%

Actions: View | Diff

Attachments on bug 91837: 61279