- Update to 2011.751

- Remove obsolete patch files
- Remove obsolete OPTION

7 files changed, 32 insertions, 62 deletions

diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index 2e00736267d0..db329ffe30db 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2010.745
+PORTVERSION=	2011.751
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
 		http://ftp.jeuxlinux.fr/files/ \
@@ -16,21 +16,18 @@ MASTER_SITES=	ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
 		http://offload1.icculus.org:9090/alienarena/Files/ \
 		${MASTER_SITE_GENTOO:S|$|distfiles/|}
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}7_45-Linux20100726
+DISTNAME=	${PORTNAME}-7_51-linux20110311
+
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Alien Arena (data)
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	Package will be 270MB, set FORCE_PACKAGE if you want it
 PLIST=		${WRKDIR}/pkg-plist
-WRKSRC=		${WRKDIR}/${PORTNAME}7_45
+WRKSRC=		${WRKDIR}/${PORTNAME}-7.51
 
 .include <bsd.port.pre.mk>
 
-post-extract:
-	@cd ${WRKSRC} && ${RM} data1/*.so
-
 pre-install:
 	@${RM} -f ${PLIST}
 
@@ -55,7 +52,7 @@ do-install:
 	cd ${WRKSRC} && ${CP} -R arena botinfo data1 ${DATADIR}
 	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${INSTALL_DATA} ${WRKSRC}/aa.png \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
 		${PREFIX}/share/pixmaps/${PORTNAME}.png
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo
index f131ffec7a56..9e8c5ce8391e 100644
--- a/games/alienarena-data/distinfo
+++ b/games/alienarena-data/distinfo
@@ -1,3 +1,2 @@
-MD5 (alienarena7_45-Linux20100726.zip) = 7a02717b308f737b320586d3f1ea39e8
-SHA256 (alienarena7_45-Linux20100726.zip) = 89cbfe2c97d3297c9cb38a847cb20844e8c435323a9a5b4cdb305536cda8c4d0
-SIZE (alienarena7_45-Linux20100726.zip) = 378720472
+SHA256 (alienarena-7_51-linux20110311.tar.gz) = 9e1a871ef76ca4a1cc3243227de9dd55e50b4c5539c7c5b48d9160fdd465d931
+SIZE (alienarena-7_51-linux20110311.tar.gz) = 384712273
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 81526de0e5f1..05c4e7a34f31 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2010.745
+PORTVERSION=	2011.751
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
 		http://ftp.jeuxlinux.fr/files/ \
@@ -15,27 +15,33 @@ MASTER_SITES=	ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
 		http://offload2.icculus.org:9090/alienarena/Files/ \
 		http://offload1.icculus.org:9090/alienarena/Files/ \
 		${MASTER_SITE_GENTOO:S|$|distfiles/|}
-DISTNAME=	${PORTNAME}7_45-Linux20100726
+DISTNAME=	${PORTNAME}-7_51-linux20110311
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Alien Arena (native version)
 
 RUN_DEPENDS=	${DATADIR}/data1/default.cfg:${PORTSDIR}/games/alienarena-data
 
-USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.51/
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS+=--with-xf86vm \
+		--with-xf86dga
+		
+
+EXTRACT_AFTER_ARGS=	| ${TAR} --exclude "data1" -xf -
 
 MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
 		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
-WRKSRC=		${WRKDIR}/${PORTNAME}7_45/source
+WRKSRC=		${WRKDIR}/${PORTNAME}-7.51/source
 
 SUB_FILES=	pkg-message
-ALL_TARGET=	build-release
 
 OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+		DEDICATED "Build dedicated server" on
 
 PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
@@ -51,16 +57,14 @@ LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 USE_GL=		yes
 USE_OPENAL=	soft alut
-USE_XORG=	xxf86dga
+USE_XORG=	xxf86dga xxf86vm
 .endif
 
-.if defined(WITH_CLIENT) && defined(WITH_DEDICATED)
-MAKE_ENV+=	BUILD=ALL
-.elif defined(WITH_CLIENT)
-MAKE_ENV+=	BUILD=CLIENT
-.elif defined(WITH_DEDICATED)
-MAKE_ENV+=	BUILD=DEDICATED
-.else
+.if !defined(WITH_CLIENT) && defined(WITH_DEDICATED)
+CONFIGURE_ARGS+=--disable-client
+.endif
+
+.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED)
 IGNORE=		needs at least one executable (CLIENT or DEDICATED)
 .endif
 
@@ -76,31 +80,24 @@ PLIST_SUB+=	DEDICATED=""
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
-MAKE_ENV+=	OPTIMIZED_CFLAGS=no
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/client/snd_openal.c
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s|.codered|.config/alienarena|g" ${WRKSRC}/qcommon/qcommon.h
 # Resolve name collision with jpeg-8
 	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		${WRKSRC}/ref_gl/r_image.c
 
 do-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
-	cd ${WRKSRC}/release && \
-		${INSTALL_PROGRAM} arena/game.so ${LIBDIR}/arena && \
-		${INSTALL_PROGRAM} game.so ${LIBDIR}/data1
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
 .if defined(WITH_CLIENT)
-	${INSTALL_PROGRAM} ${WRKSRC}/release/crx \
+	${INSTALL_PROGRAM} ${WRKSRC}/crx \
 		${PREFIX}/bin/${PORTNAME}
 .endif
 .if defined(WITH_DEDICATED)
-	${INSTALL_PROGRAM} ${WRKSRC}/release/crded \
+	${INSTALL_PROGRAM} ${WRKSRC}/crx-ded \
 		${PREFIX}/bin/${PORTNAME}-ded
 .endif
 
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index f131ffec7a56..9e8c5ce8391e 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,2 @@
-MD5 (alienarena7_45-Linux20100726.zip) = 7a02717b308f737b320586d3f1ea39e8
-SHA256 (alienarena7_45-Linux20100726.zip) = 89cbfe2c97d3297c9cb38a847cb20844e8c435323a9a5b4cdb305536cda8c4d0
-SIZE (alienarena7_45-Linux20100726.zip) = 378720472
+SHA256 (alienarena-7_51-linux20110311.tar.gz) = 9e1a871ef76ca4a1cc3243227de9dd55e50b4c5539c7c5b48d9160fdd465d931
+SIZE (alienarena-7_51-linux20110311.tar.gz) = 384712273
diff --git a/games/alienarena/files/patch-qcommon_files.c b/games/alienarena/files/patch-qcommon_files.c
deleted file mode 100644
index aa540242a8ba..000000000000
--- a/games/alienarena/files/patch-qcommon_files.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- qcommon/files.c	2010-01-27 11:24:33.000000000 -0500
-+++ qcommon/files.c	2010-01-27 11:26:40.000000000 -0500
-@@ -568,7 +568,7 @@
- ================
- FS_AddHomeAsGameDirectory
- 
--Use ~/.codered/dir as fs_gamedir
-+Use ~/.config/alienarena/dir as fs_gamedir
- ================
- */
- void FS_AddHomeAsGameDirectory (char *dir)
-@@ -586,7 +586,7 @@
- 		homedir = getenv("HOME");
- 		if (!homedir)
- 			return;
--		len = snprintf(gdir,sizeof(gdir),"%s/.codered/%s/", homedir, dir);
-+		len = snprintf(gdir,sizeof(gdir),"%s/.config/alienarena/%s/", homedir, dir);
- 	}
- 
- 	Com_Printf("using %s for writing\n",gdir);
diff --git a/games/alienarena/files/pkg-message.in b/games/alienarena/files/pkg-message.in
index 171781480fe2..dc602b74b509 100644
--- a/games/alienarena/files/pkg-message.in
+++ b/games/alienarena/files/pkg-message.in
@@ -2,7 +2,7 @@
 
 Alien Arena (native version) has been installed.
 
-1) The OSS (native FreeBSD sound) version of Alien Arena 2009 (named
+1) The OSS (native FreeBSD sound) version of Alien Arena 2011 (named
 "alienarena") uses by default a slow sound speed, which causes a notable
 delay. To solve this you have to run it once like this:
 
diff --git a/games/alienarena/pkg-plist b/games/alienarena/pkg-plist
index 04ab26e61138..65a41a6f6b17 100644
--- a/games/alienarena/pkg-plist
+++ b/games/alienarena/pkg-plist
@@ -1,13 +1,11 @@
 %%CLIENT%%bin/alienarena
 %%DEDICATED%%bin/alienarena-ded
-%%LIBDIR%%/arena/game.so
 %%LIBDIR%%/arena/motd.txt
 %%LIBDIR%%/arena/server.cfg
 %%LIBDIR%%/botinfo
 %%LIBDIR%%/data1/default.cfg
 %%LIBDIR%%/data1/env
 %%LIBDIR%%/data1/fonts
-%%LIBDIR%%/data1/game.so
 %%LIBDIR%%/data1/gfx
 %%LIBDIR%%/data1/levelshots
 %%LIBDIR%%/data1/maps