- Integrate with alienarena-data.

- Adjust PORTVERSION to match alienarena and alienarena-data.
- Only download the patch.
- Remove support for amd64 (no SDL binaries, and OSS is broken).
- Add support for WITH_NVIDIA_GL knob.
- Remove RESTRICTED and NO_PACKAGE (data is on a separate port).
- Add pkg-plist.
- Rename scripts to "linux-alienarena" and "linux-alienarena-ded".

PR:		ports/91837
Approved by:	garga (mentor, implicitly)

6 files changed, 69 insertions, 78 deletions

diff --git a/games/linux-alienarena/Makefile b/games/linux-alienarena/Makefile
index 3a885ca3d2f0..622c8244716a 100644
--- a/games/linux-alienarena/Makefile
+++ b/games/linux-alienarena/Makefile
@@ -6,98 +6,58 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2006
-PORTREVISION=	3
+DISTVERSION=	2006.ge
+PORTEPOCH=	1
 CATEGORIES=	games linux
-MASTER_SITES=	http://www.forsakenweb.com/gamepage/loaders/games/:full \
-		http://offload1.icculus.org/~ravage/alienarena2006/:patch
+MASTER_SITES=	http://offload1.icculus.org/~ravage/alienarena2006/
 PKGNAMEPREFIX=	linux-
-DISTFILES=	${PORTNAME}-${PORTVERSION}-x86.run:full \
-		${PORTNAME}-${PORTVERSION}ge-i386.tar.gz:patch
+DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}-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 \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
+		${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
-ONLY_FOR_ARCHS=	i386 amd64
+.if defined(WITH_NVIDIA_GL)
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.endif
+
+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
+SUB_FILES=	linux-alienarena linux-alienarena-ded
+SUB_LIST=	LIBDIR=${LIBDIR}
+PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
-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
+LIBDIR=		${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
 
-DESKTOP_ENTRIES="Alien Arena 2006" \
-		"Play Alien Arena 2006" \
+DESKTOP_ENTRIES="Alien Arena 2006 (Linux version)" \
+		"Play Alien Arena 2006 (Linux version)" \
 		"alienarena.xpm" \
-		"AlienArena" \
+		"linux-alienarena" \
 		"Application;Game;" \
 		false
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
-.endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
-
-.if ${ARCH} == "i386"
-ENGINE_ARCH=	x86
-.elif ${ARCH} == "amd64"
-ENGINE_ARCH=	x86_64
-.endif
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && \
-		${TAIL} -c +8814 ${_DISTDIR}/${PORTNAME}-${PORTVERSION}-x86.run | ${TAR} xfz -
-	@${TAR} xfj ${WRKSRC}/alienarena-2006ge-data.tar.bz2 -C ${WRKSRC}
-	@${CP} -R ${WRKSRC}/engine/${ENGINE_ARCH}/* ${WRKSRC}
-	@${TAR} xfz ${_DISTDIR}/alienarena-2006ge-i386.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:
+	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
 	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
+		${INSTALL_PROGRAM} arena/gamei386.so ${LIBDIR}/arena && \
+		${INSTALL_PROGRAM} data1/gamei386.so ${LIBDIR}/data1
+	${LN} -sf ${DATADIR}/arena/* ${LIBDIR}/arena
+	${LN} -sf ${DATADIR}/botinfo ${LIBDIR}
+	${LN} -sf ${DATADIR}/data1/* ${LIBDIR}/data1
+.for f in crx.sdl crded
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${LIBDIR}
+.endfor
+.for f in linux-alienarena linux-alienarena-ded
+	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-alienarena/distinfo b/games/linux-alienarena/distinfo
index f9d2d40d6aef..781f9de87410 100644
--- a/games/linux-alienarena/distinfo
+++ b/games/linux-alienarena/distinfo
@@ -1,6 +1,3 @@
-MD5 (alienarena-2006-x86.run) = f27923b13dc586b649134d7a4bfc0709
-SHA256 (alienarena-2006-x86.run) = ce6b47c86bde5b3aefc572897c0e46fc5e8b2cafa178293835ee074951b50e1a
-SIZE (alienarena-2006-x86.run) = 164160207
 MD5 (alienarena-2006ge-i386.tar.gz) = fd32c73202b3fe9f79c54588daa35430
 SHA256 (alienarena-2006ge-i386.tar.gz) = 4fa39209bb5501d5fc010782b18956a8df4ea15782d488665086b72b871f051e
 SIZE (alienarena-2006ge-i386.tar.gz) = 967542
diff --git a/games/linux-alienarena/files/AlienArena.in b/games/linux-alienarena/files/AlienArena.in
deleted file mode 100644
index ce011b6c1ad1..000000000000
--- a/games/linux-alienarena/files/AlienArena.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd %%PREFIX%%/lib/alienarena || exit 1
-exec ./crx +set game arena "$@"
diff --git a/games/linux-alienarena/files/AlienArenaDedicated.in b/games/linux-alienarena/files/linux-alienarena-ded.in
index 09dc9f89966d..59170f845405 100644
--- a/games/linux-alienarena/files/AlienArenaDedicated.in
+++ b/games/linux-alienarena/files/linux-alienarena-ded.in
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-cd %%PREFIX%%/lib/alienarena || exit 1
+cd %%LIBDIR%% || exit 1
+
 exec ./crded +set game arena +set port 27910 "$@"
diff --git a/games/linux-alienarena/files/linux-alienarena.in b/games/linux-alienarena/files/linux-alienarena.in
new file mode 100644
index 000000000000..d09ae2fdf5c2
--- /dev/null
+++ b/games/linux-alienarena/files/linux-alienarena.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd %%LIBDIR%% || exit 1
+
+exec ./crx.sdl +set game arena "$@"
diff --git a/games/linux-alienarena/pkg-plist b/games/linux-alienarena/pkg-plist
new file mode 100644
index 000000000000..dcca1d79ba5b
--- /dev/null
+++ b/games/linux-alienarena/pkg-plist
@@ -0,0 +1,32 @@
+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/default.cfg
+%%LIBDIR%%/data1/env
+%%LIBDIR%%/data1/gamei386.so
+%%LIBDIR%%/data1/gfx
+%%LIBDIR%%/data1/levelshots
+%%LIBDIR%%/data1/maps
+%%LIBDIR%%/data1/maps.lst
+%%LIBDIR%%/data1/models
+%%LIBDIR%%/data1/particles
+%%LIBDIR%%/data1/pics
+%%LIBDIR%%/data1/players
+%%LIBDIR%%/data1/scripts
+%%LIBDIR%%/data1/sound
+%%LIBDIR%%/data1/sprites
+%%LIBDIR%%/data1/textures
+%%LIBDIR%%/data1/vehicles
+@dirrm %%LIBDIR%%/data1
+@dirrm %%LIBDIR%%/arena
+@dirrm %%LIBDIR%%