Bug 91837
| Summary: | [UPDATE] games/linux-alienarena: integrate with alienarena-data | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Alejandro Pulver <alejandro> | ||||
| Component: | Individual Port(s) | Assignee: | Alejandro Pulver <alepulver> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Alejandro Pulver
2006-01-15 18:30:03 UTC
State Changed From-To: open->feedback Awaiting maintainers feedback On Sun, 15 Jan 2006 18:40:04 UT Edwin Groothuis <edwin@FreeBSD.org> wrote: > Maintainer of games/linux-alienarena, > > Please note that PR ports/91837 has just been submitted. > > If it contains a patch for an upgrade, an enhancement or a bug fix > you agree on, reply to this email stating that you approve the patch > and a committer will take care of it. > > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/91837 > > -- > Edwin Groothuis > edwin@FreeBSD.org > I approve the patch Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe State Changed From-To: feedback->open Maintainer approved >Submitter-Id: current-users >Originator: Alejandro Pulver >Organization: >Confidential: no >Synopsis: Re: ports/91837: [UPDATE] games/linux-alienarena: integrate with alienarena-data >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.4-RELEASE i386 >Environment: System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005 root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE >Description: * This follow-up also updates the port to "Gold Edition" (that's how the new version is called). >How-To-Repeat: >Fix: --- linux-alienarena.diff begins here --- diff -urN /usr/ports/games/linux-alienarena/Makefile linux-alienarena/Makefile --- /usr/ports/games/linux-alienarena/Makefile Wed Jan 11 07:45:24 2006 +++ linux-alienarena/Makefile Mon Feb 13 12:26:12 2006 @@ -6,62 +6,43 @@ # PORTNAME= alienarena -PORTVERSION= 2006 -PORTREVISION= 1 +PORTVERSION= 2006.ge +PORTEPOCH= 1 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://offload1.icculus.org/~ravage/alienarena2006/ 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 +DISTNAME= ${PORTNAME}-2006ge-i386 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 \ +RUN_DEPENDS= ${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data \ + ${LINUXBASE}/usr/X11R6/lib/libGLU.so.1.3:${PORTSDIR}/graphics/linux_dri \ ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= i386 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 +SUB_FILES= alienarena alienarena-ded +SUB_LIST= LIBDIR=${LIBDIR} +PLIST_SUB= 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.sdl 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 @@ -72,47 +53,16 @@ RUN_DEPENDS+= ${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx .endif -.if ${ARCH} == "i386" -ENGINE_ARCH= x86 -SDL_ARCH= i386 -.elif ${ARCH} == "amd64" -ENGINE_ARCH= x86_64 -SDL_ARCH= x86_64 -.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} - 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/gamei386.so ${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 linux-alienarena/distinfo --- /usr/ports/games/linux-alienarena/distinfo Wed Jan 11 07:45:24 2006 +++ linux-alienarena/distinfo Mon Feb 13 11:39:26 2006 @@ -1,12 +1,3 @@ -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 +MD5 (alienarena-2006ge-i386.tar.gz) = fd32c73202b3fe9f79c54588daa35430 +SHA256 (alienarena-2006ge-i386.tar.gz) = 4fa39209bb5501d5fc010782b18956a8df4ea15782d488665086b72b871f051e +SIZE (alienarena-2006ge-i386.tar.gz) = 967542 diff -urN /usr/ports/games/linux-alienarena/files/AlienArena.in linux-alienarena/files/AlienArena.in --- /usr/ports/games/linux-alienarena/files/AlienArena.in Tue Nov 22 22:37:50 2005 +++ 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 linux-alienarena/files/AlienArenaDedicated.in --- /usr/ports/games/linux-alienarena/files/AlienArenaDedicated.in Tue Nov 22 22:37:50 2005 +++ 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 linux-alienarena/files/alienarena-ded.in --- /usr/ports/games/linux-alienarena/files/alienarena-ded.in Wed Dec 31 21:00:00 1969 +++ linux-alienarena/files/alienarena-ded.in Sun Feb 12 21:22:47 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.in linux-alienarena/files/alienarena.in --- /usr/ports/games/linux-alienarena/files/alienarena.in Wed Dec 31 21:00:00 1969 +++ linux-alienarena/files/alienarena.in Mon Feb 13 12:19:38 2006 @@ -0,0 +1,5 @@ +#!/bin/sh + +cd %%LIBDIR%% || exit 1 + +exec ./crx.sdl +set game arena "$@" diff -urN /usr/ports/games/linux-alienarena/pkg-plist linux-alienarena/pkg-plist --- /usr/ports/games/linux-alienarena/pkg-plist Wed Dec 31 21:00:00 1969 +++ linux-alienarena/pkg-plist Mon Feb 13 12:19:07 2006 @@ -0,0 +1,16 @@ +bin/linux-alienarena +bin/linux-alienarena-ded +%%LIBDIR%%/arena/ctf.cfg +%%LIBDIR%%/arena/default.cfg +%%LIBDIR%%/arena/gamei386.so +%%LIBDIR%%/arena/maps.lst +%%LIBDIR%%/arena/motd.txt +%%LIBDIR%%/arena/pics +%%LIBDIR%%/arena/server.cfg +%%LIBDIR%%/arena/video +%%LIBDIR%%/botinfo +%%LIBDIR%%/crded +%%LIBDIR%%/crx.sdl +%%LIBDIR%%/data1 +@dirrm %%LIBDIR%%/arena +@dirrm %%LIBDIR%% --- linux-alienarena.diff ends here --- This patch doesn't apply, I updated linux-alienarena to gold edition time ago. I'm waiting for approve this PR http://www.freebsd.org/cgi/query-pr.cgi?pr=93783. You could to send me a cc when you submit a reply. I didn't receive a cc the last post Greetings ACM -- Grupo de Usuarios GNU/Linux Arequipa - AQPGLUG http://www.aqpglug.org.pe This patch doesn't apply, I updated linux-alienarena to gold edition time ago. I'm waiting for approve this PR http://www.freebsd.org/cgi/query-pr.cgi?pr=93783. You could to send me a cc when you submit a reply. I didn't receive a cc the last post Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe This patch doesn't apply, I updated linux-alienarena to gold edition time ago. I'm waiting for some commiter approve this PR http://www.freebsd.org/cgi/query-pr.cgi?pr=93783. You could to send me a cc when you submit a reply. I didn't receive a cc the last post Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe On Wed, 15 Mar 2006 19:49:04 -0500 Jose Alonso Cardenas Marquez <acardenas@aqpglug.org.pe> wrote: > This patch doesn't apply, I updated linux-alienarena to gold edition > time ago. I'm waiting for approve this PR > http://www.freebsd.org/cgi/query-pr.cgi?pr=93783. You could to send > me a cc when you submit a reply. I didn't receive a cc the last post > O.K. I will wait until the PR is committed to send the follow-up, and will CC you in the future. Best Regards, Ale Responsible Changed From-To: freebsd-ports-bugs->alepulver Assign my PRs to me. State Changed From-To: open->closed Committed. |
