[88562] trunk/dports/games

ryandesign at macports.org ryandesign at macports.org
Wed Jan 4 03:05:28 PST 2012


Revision: 88562
          http://trac.macports.org/changeset/88562
Author:   ryandesign at macports.org
Date:     2012-01-04 03:05:24 -0800 (Wed, 04 Jan 2012)
Log Message:
-----------
alienarena: update to 7.53-20111227, add descriptions, add bots, make alienarena-data a subport

Modified Paths:
--------------
    trunk/dports/games/alienarena/Portfile

Added Paths:
-----------
    trunk/dports/games/alienarena/files/patch-Makefile.am.diff
    trunk/dports/games/alienarena/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/games/alienarena/files/patch-Makefile.diff
    trunk/dports/games/alienarena/files/patch-client-qal.h.diff
    trunk/dports/games/alienarena/files/patch-client-snd_openal.c.diff
    trunk/dports/games/alienarena/files/patch-game-q_shared.h.diff
    trunk/dports/games/alienarena/files/patch-qcommon-common.c.diff
    trunk/dports/games/alienarena/files/patch-ref_gl-r_main.c.diff
    trunk/dports/games/alienarena/files/patch-ref_gl-r_model.h.diff
    trunk/dports/games/alienarena/files/patch-unix-q_shunix.c.diff
    trunk/dports/games/alienarena/files/patch-unix-qal_unix.c.diff
    trunk/dports/games/alienarena/files/patch-unix-sys_unix.c.diff
    trunk/dports/games/alienarena-data/

Modified: trunk/dports/games/alienarena/Portfile
===================================================================
--- trunk/dports/games/alienarena/Portfile	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/Portfile	2012-01-04 11:05:24 UTC (rev 88562)
@@ -4,9 +4,7 @@
 PortSystem              1.0
 
 name                    alienarena
-# Keep version in sync between alienarena and alienarena-data.
-version                 7.45-20100726
-revision                3
+version             7.53-20111227
 set version_number      [lindex [split ${version} -] 0]
 set version_date        [lindex [split ${version} -] 1]
 categories              games
@@ -14,36 +12,31 @@
 maintainers             ryandesign
 license                 GPL-2+
 
+description         retro sci-fi old school deathmatch game similar to Quake \
+                    III and Unreal Tournament
+
+long_description    Alien Arena combines some of the very best aspects of \
+                    such games as Quake III and Unreal Tournament and wraps \
+                    them up with a retro alien theme, while adding tons of \
+                    original ideas to make the game quite unique. Alien Arena \
+                    is a furious frag fest with arenas ranging from the \
+                    small, to the massive. With a large built-in player base, \
+                    it's never hard to find a good match going on, at any \
+                    hour of the day. The community is friendly, as well as \
+                    prolific. Dozens of maps, models, and various accessories \
+                    have been created by community members to add on to the \
+                    game experience.
+
 homepage                http://red.planetarena.org/
 master_sites            http://icculus.org/alienarena/Files/ \
                         gentoo
 
-worksrcdir              alienarena[join [split ${version_number} .] _]
-distname                ${worksrcdir}-Linux${version_date}
+worksrcdir          alienarena-${version_number}
+distname            ${worksrcdir}-linux${version_date}
 
-# Manually emulate "use_zip yes" because we want to extract specific directories only.
-#use_zip                 yes
-extract.cmd             [findBinary unzip ${portutil::autoconf::unzip_path}]
-extract.suffix          .zip
-extract.pre_args        -q
-extract.post_args       -d ${extract.dir} ${worksrcdir}/source/* ${worksrcdir}/arena/* ${worksrcdir}/data1/*.cfg
+checksums           rmd160  d0435e7b58bee8743264f042b2e42e0b5020ae43 \
+                    sha256  68bb1539c09cc572345ffc64a470dacbc27eb0074c76946694369fdb009c639f
 
-checksums               sha1    9c982d097d885af0cbd06bfbe6c4185936c43c4d \
-                        rmd160  d20e167c66dec8ec072ecbf5833a4a4b46458a17
-
-depends_build           port:pkgconfig
-
-depends_lib             port:curl \
-                        port:jpeg \
-                        port:libvorbis \
-                        port:mesa \
-                        port:xorg-libX11 \
-                        port:xorg-libXext \
-                        port:xorg-libXxf86dga \
-                        port:xorg-libXxf86vm
-
-depends_run             port:alienarena-data
-
 platform darwin {
     pre-fetch {
         # 10.4.11:
@@ -60,85 +53,108 @@
     }
 }
 
-patch.dir               ${worksrcpath}/source
-
-post-extract {
-    # DOS to UNIX line endings so we can patch properly.
-    fs-traverse file ${patch.dir} {
-        switch [file extension ${file}] {
-            .c -
-            .cpp -
-            .h {
-                reinplace "s|\r||g" ${file}
-            }
-        }
+if {${name} == ${subport}} {
+    depends_build               port:pkgconfig
+    
+    depends_lib                 port:curl \
+                                port:jpeg \
+                                port:libvorbis \
+                                port:ode \
+                                port:openal \
+                                port:mesa \
+                                port:xorg-libX11 \
+                                port:xorg-libXext \
+                                port:xorg-libXxf86dga \
+                                port:xorg-libXxf86vm
+    
+    depends_run                 port:alienarena-data
+    
+    # Extract only the specific directories we need, to avoid extracting the huge data1 directory.
+    extract.post_args-append    --wildcards \
+                                ${worksrcdir}/COPYING \
+                                ${worksrcdir}/Makefile.in \
+                                ${worksrcdir}/README \
+                                ${worksrcdir}/arena \
+                                ${worksrcdir}/botinfo \
+                                ${worksrcdir}/config \
+                                ${worksrcdir}/configure \
+                                ${worksrcdir}/data1/*.cfg \
+                                ${worksrcdir}/docs \
+                                ${worksrcdir}/source
+    
+    # Needed for autoreconf.
+    extract.post_args-append    ${worksrcdir}/Makefile.am \
+                                ${worksrcdir}/aclocal.m4 \
+                                ${worksrcdir}/configure.ac \
+                                ${worksrcdir}/m4
+    
+    configure.args              --disable-silent-rules \
+                                --x-includes=${prefix}/include \
+                                --x-libraries=${prefix}/lib \
+                                --with-system-libode \
+                                --with-xf86dga \
+                                --with-xf86vm
+    
+    patchfiles                  patch-Makefile.am.diff \
+                                patch-configure.ac.diff
+    
+    post-patch {
+        reinplace "s|@FRAMEWORKS_DIR@|${frameworks_dir}|g" ${worksrcpath}/configure.ac
     }
-}
+    
+    use_autoreconf              yes
+    
+    # On Leopard and presumably Tiger:
+    # In file included from client/snd_openal.c:37:
+    # client/qal.h:34: error: syntax error before 'pqalEnable'
+    #configure.cflags-append -DAL_NO_PROTOTYPES
+    
+    post-destroot {
+        xinstall -d ${destroot}${prefix}/share/${name}
+        copy ${worksrcpath}/arena ${worksrcpath}/botinfo ${worksrcpath}/data1 ${destroot}${prefix}/share/${name}
+    }
+    
+    variant debug description {Enable debugging symbols} {
+        configure.args-append --enable-debugging-symbols
+    }
+    
+    notes "
+To play Alien Arena, type:
 
-patchfiles              patch-game-q_shared.h.diff \
-                        patch-unix-q_shunix.c.diff
+crx
 
-use_configure           no
+To run your own dedicated Alien Arena server, use:
 
-# On Leopard and presumably Tiger:
-# In file included from client/snd_openal.c:37:
-# client/qal.h:34: error: syntax error before 'pqalEnable'
-configure.cflags-append -DAL_NO_PROTOTYPES
-
-platform darwin {
-    patchfiles-append   patch-Makefile.diff \
-                        patch-client-qal.h.diff \
-                        patch-client-snd_openal.c.diff \
-                        patch-qcommon-common.c.diff \
-                        patch-ref_gl-r_main.c.diff \
-                        patch-ref_gl-r_model.h.diff \
-                        patch-unix-qal_unix.c.diff \
-                        patch-unix-sys_unix.c.diff
-    post-patch {
-        reinplace "s|@PREFIX@|${prefix}|g" ${patch.dir}/ref_gl/r_main.c
-    }
-    configure.cflags-append -D__unix__
+crx-ded
+"
+    
+    livecheck.version           ${version_number}
+    livecheck.type              regex
+    livecheck.url               ${homepage}aquire.html
+    livecheck.regex             {Alien Arena ([0-9.]+)}
 }
 
-variant universal {}
-if {[variant_isset universal]} {
-    set archflags ${configure.universal_cflags}
-} else {
-    set archflags ${configure.cc_archflags}
-}
-
-build.dir               ${patch.dir}
-
-build.target            build-release
-destroot.dir            ${build.dir}/release
-
-build.env               CC="${configure.cc}" \
-                        CFLAGS="${configure.cflags} ${archflags}" \
-                        LDFLAGS="${configure.ldflags} ${archflags}" \
-                        PREFIX="${prefix}" \
-                        LOCALBASE="${prefix}" \
-                        X11BASE="${prefix}" \
-                        WITH_DATADIR=yes \
-                        WITH_LIBDIR=yes
-
-destroot {
-    xinstall -W ${destroot.dir} crx ${destroot}${prefix}/bin
-    xinstall -W ${destroot.dir} crded ${destroot}${prefix}/sbin
+subport alienarena-data {
+    license                     Restrictive
+    supported_archs             noarch
     
-    xinstall -d ${destroot}${prefix}/lib/${name}/data1
-    xinstall -W ${destroot.dir} -m 644 game.dylib ${destroot}${prefix}/lib/${name}/data1
+    description                 Assets for the Alien Arena game
     
-    xinstall -d ${destroot}${prefix}/share/${name}
-    copy ${worksrcpath}/arena ${worksrcpath}/data1 ${destroot}${prefix}/share/${name}
+    long_description            ${description}
+    
+    extract.post_args-append    ${worksrcdir}/data1
+    
+    post-extract {
+        eval delete [glob ${worksrcpath}/data1/*.cfg]
+    }
+    
+    use_configure               no
+    
+    build {}
+    
+    destroot {
+        xinstall -d ${destroot}${prefix}/share/${name}
+        copy ${worksrcpath}/data1 ${destroot}${prefix}/share/${name}
+    }
 }
 
-notes "
-To play Alien Arena, type:
-
-crx
-"
-
-livecheck.version       ${version_number}
-livecheck.type          regex
-livecheck.url           ${homepage}aquire.html
-livecheck.regex         {Alien Arena ([0-9.]+)}

Added: trunk/dports/games/alienarena/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/games/alienarena/files/patch-Makefile.am.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2011-03-05 18:34:07.000000000 -0600
++++ Makefile.am	2012-01-04 03:24:33.000000000 -0600
+@@ -92,5 +92,4 @@
+ #
+ # game data for distribution package
+ # 
+-include game_data.am
+ 

Deleted: trunk/dports/games/alienarena/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-Makefile.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-Makefile.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,28 +0,0 @@
---- Makefile	(revision 1999)
-+++ Makefile	(working copy)
-@@ -46,11 +46,7 @@
- NULL_DIR=		$(MOUNT_DIR)/null
- ARENA_DIR=		$(GAME_DIR)
- 
--ifeq ($(ARCH),x86_64)
--	_LIB := lib64
--else
--	_LIB := lib
--endif
-+_LIB := lib
- 
- BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -fno-strict-aliasing -fmerge-constants -DHAVE_CURL -lpthread
- 
-@@ -108,9 +104,9 @@
- 
- GLXLDFLAGS=-L$(X11BASE)/$(_LIB) -L$(LOCALBASE)/$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
- 
--SHLIBEXT=so
--SHLIBCFLAGS=-fPIC
--SHLIBLDFLAGS=-shared
-+SHLIBEXT=dylib
-+SHLIBCFLAGS=
-+SHLIBLDFLAGS=-dynamiclib -install_name $(PREFIX)/lib/alienarena/data1/game.$(SHLIBEXT)
- 
- OPPENALCFLAGS+=$(shell pkg-config --cflags openal)
- 

Deleted: trunk/dports/games/alienarena/files/patch-client-qal.h.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-client-qal.h.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-client-qal.h.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,13 +0,0 @@
---- client/qal.h	(revision 1999)
-+++ client/qal.h	(working copy)
-@@ -24,8 +24,8 @@
- #include <al.h>
- #include <alc.h>
- #else
--#include <AL/al.h>
--#include <AL/alc.h>
-+#include </System/Library/Frameworks/OpenAL.framework/Headers/al.h>
-+#include </System/Library/Frameworks/OpenAL.framework/Headers/alc.h>
- #endif
- 
- /*

Deleted: trunk/dports/games/alienarena/files/patch-client-snd_openal.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-client-snd_openal.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-client-snd_openal.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- client/snd_openal.c	(revision 1999)
-+++ client/snd_openal.c	(working copy)
-@@ -30,7 +30,7 @@
-  */
- 
- #include <stdio.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include <string.h>
- 
- #include "client.h"

Added: trunk/dports/games/alienarena/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/games/alienarena/files/patch-configure.ac.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -0,0 +1,31 @@
+--- configure.ac.orig	2011-12-26 23:05:14.000000000 -0600
++++ configure.ac	2012-01-04 03:27:00.000000000 -0600
+@@ -88,7 +88,7 @@
+ #
+ # Environment variable for specifying libGL.dylib path for Darwin when it
+ # is not in the dlopen() search path. see dlopen (3) for Mac OS X.
+-# Either export or in command line: GL_LIBDIR=/usr/Xll/lib, for example.
++# Either export or in command line: GL_LIBDIR=/usr/X11/lib, for example.
+ # If this GL_LIBDIR is not given, use the shell variable x_libraries from
+ # the AC_PATH_X macro (which may be empty)
+ #
+@@ -436,7 +436,7 @@
+ 			[AS_IF([ test x"${gl_dlopen_path}" = xdefault ],
+ 				[AC_DEFINE([OPENGL_DRIVER],
+ 					["libGL.dylib"],
+-					[OpenAL dynamic lib name])
++					[OpenGL dynamic lib name])
+ 				],
+ 				[AC_DEFINE_UNQUOTED([OPENGL_DRIVER],
+ 					["${gl_dlopen_path}/libGL.dylib"],
+@@ -444,8 +444,8 @@
+ 			])
+ 
+ 			AC_DEFINE([OPENAL_DRIVER],
+-				["/System/Library/Frameworks/OpenAL.framework/OpenAL"],
+-				[OpenAl dynamic lib path])
++				["@FRAMEWORKS_DIR@/OpenAL.framework/OpenAL"],
++				[OpenAL dynamic lib path])
+ 			],
+ 
+ 		[

Deleted: trunk/dports/games/alienarena/files/patch-game-q_shared.h.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-game-q_shared.h.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-game-q_shared.h.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,15 +0,0 @@
---- game/q_shared.h	(revision 1999)
-+++ game/q_shared.h	(working copy)
-@@ -60,7 +60,11 @@
- #endif
- 
- typedef unsigned char 		byte;
--typedef enum {false, true}	qboolean;
-+#ifndef true
-+# define false 0
-+# define true 1
-+#endif
-+typedef byte qboolean;
- 
- 
- #ifndef NULL

Deleted: trunk/dports/games/alienarena/files/patch-qcommon-common.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-qcommon-common.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-qcommon-common.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- qcommon/common.c	(revision 1999)
-+++ qcommon/common.c	(working copy)
-@@ -1494,6 +1494,8 @@
- 	if (setjmp (abortframe) )
- 		Sys_Error ("Error during initialization");
- 
-+	round_page_init ();
-+
- 	z_chain.next = z_chain.prev = &z_chain;
- 
- 	// prepare enough of the subsystems to handle

Deleted: trunk/dports/games/alienarena/files/patch-ref_gl-r_main.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-ref_gl-r_main.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-ref_gl-r_main.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- ref_gl/r_main.c	(revision 1999)
-+++ ref_gl/r_main.c	(working copy)
-@@ -1185,7 +1185,7 @@
- 	gl_flashblend = Cvar_Get ("gl_flashblend", "0", CVAR_ARCHIVE);
- 	gl_playermip = Cvar_Get ("gl_playermip", "0", 0);
- #ifdef __unix__
--	gl_driver = Cvar_Get( "gl_driver", "libGL.so.1", CVAR_ARCHIVE );
-+	gl_driver = Cvar_Get( "gl_driver", "@PREFIX@/lib/libGL.dylib", CVAR_ARCHIVE );
- #else
- 	gl_driver = Cvar_Get( "gl_driver", "opengl32", CVAR_ARCHIVE );
- #endif

Deleted: trunk/dports/games/alienarena/files/patch-ref_gl-r_model.h.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-ref_gl-r_model.h.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-ref_gl-r_model.h.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- ref_gl/r_model.h	(revision 1999)
-+++ ref_gl/r_model.h	(working copy)
-@@ -389,3 +389,8 @@
- 
- void	Mod_FreeAll (void);
- void	Mod_Free (model_t *mod);
-+
-+//============================================================================
-+
-+void	round_page_init ();
-+size_t	round_page (size_t size);

Deleted: trunk/dports/games/alienarena/files/patch-unix-q_shunix.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-unix-q_shunix.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-unix-q_shunix.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,27 +0,0 @@
---- unix/q_shunix.c	(revision 1999)
-+++ unix/q_shunix.c	(working copy)
-@@ -39,6 +39,24 @@
- 
- //===============================================================================
- 
-+size_t pagesize, pagesize_mask;
-+
-+void round_page_init () {
-+	pagesize = sysconf (_SC_PAGESIZE);
-+	pagesize_mask = -pagesize;
-+}
-+
-+size_t round_page (size_t size) {
-+	if (size) {
-+		size--;
-+		size &= pagesize_mask;
-+		size += pagesize;
-+	}
-+	return size;
-+}
-+
-+//===============================================================================
-+
- byte *membase;
- int maxhunksize;
- int curhunksize;

Deleted: trunk/dports/games/alienarena/files/patch-unix-qal_unix.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-unix-qal_unix.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-unix-qal_unix.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- unix/qal_unix.c	(revision 1999)
-+++ unix/qal_unix.c	(working copy)
-@@ -32,7 +32,7 @@
-  * OpenAL Library
-  *  OpenAL 1.1 required.  TODO: make soname configurable
-  */
--const char libopenal_name[] = "libopenal.so.1";
-+const char libopenal_name[] = "/System/Library/Frameworks/OpenAL.framework/Versions/Current/OpenAL";
- void *dynlib;
- qboolean dlsym_error;
- 

Deleted: trunk/dports/games/alienarena/files/patch-unix-sys_unix.c.diff
===================================================================
--- trunk/dports/games/alienarena/files/patch-unix-sys_unix.c.diff	2012-01-04 10:29:45 UTC (rev 88561)
+++ trunk/dports/games/alienarena/files/patch-unix-sys_unix.c.diff	2012-01-04 11:05:24 UTC (rev 88562)
@@ -1,11 +0,0 @@
---- unix/sys_unix.c	(revision 1999)
-+++ unix/sys_unix.c	(working copy)
-@@ -217,7 +217,7 @@
- 	char	name[MAX_OSPATH];
- 	char	*path;
- 	char	*str_p;
--	const char *gamename = "game.so";
-+	const char *gamename = "game.dylib";
- 
- 	setreuid(getuid(), getuid());
- 	setegid(getgid());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120104/0061305a/attachment-0001.html>


More information about the macports-changes mailing list