From 34bca6355f98dc91e9cb62167a4c2dc56807b4e3 Mon Sep 17 00:00:00 2001 From: alepulver Date: Sat, 30 Dec 2006 21:31:36 +0000 Subject: - Update to version 0.45. - Remove PORTSCOUT for avoiding version 0.45. - Reduce too high default mouse sensivity in game. - Change USE_GCC from 3.2+ to 3.4+ because it is supported in more archs. --- games/quake2max/Makefile | 12 +++------ games/quake2max/distinfo | 6 ++--- games/quake2max/files/patch-client__ref.h | 11 +++++++++ games/quake2max/files/patch-qcommon__files.c | 14 +++++------ games/quake2max/files/patch-unix__gl_glx.c | 23 ++++++++++++----- games/quake2max/files/patch-unix__sys_unix.c | 37 ++++++++++++---------------- 6 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 games/quake2max/files/patch-client__ref.h (limited to 'games') diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile index c1ad81263641..b30d8afa19ff 100644 --- a/games/quake2max/Makefile +++ b/games/quake2max/Makefile @@ -6,8 +6,7 @@ # PORTNAME= quake2max -PORTVERSION= 0.44 -PORTREVISION= 1 +PORTVERSION= 0.45 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \ ${MASTER_SITE_LOCAL:S/$/:data/} @@ -24,9 +23,9 @@ EXTRACT_DEPENDS=unrar:${PORTSDIR}/archivers/unrar USE_BZIP2= yes USE_GMAKE= yes -USE_GCC= 3.2+ +USE_GCC= 3.4+ ALL_TARGET= release -WRKSRC= ${WRKDIR}/Quake2maX-44-src_unix +WRKSRC= ${WRKDIR}/${DISTNAME:S/quake2max/Quake2maX/} OPTIONS= CLIENT "Build client" on \ DEDICATED "Build dedicated server" on \ @@ -40,10 +39,7 @@ MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} -Q2MAX_DATA= ${PORTNAME}.${PORTVERSION:S/.//}.rar - -# The data is not available and compiled executables do not work for 0.45. -PORTSCOUT= skipv:0.45 +Q2MAX_DATA= ${PORTNAME}.044.rar .include "${.CURDIR}/../quake2-data/Makefile.include" diff --git a/games/quake2max/distinfo b/games/quake2max/distinfo index 96c90581f573..7a4510e7335b 100644 --- a/games/quake2max/distinfo +++ b/games/quake2max/distinfo @@ -1,6 +1,6 @@ -MD5 (Quake2maX_0.44-src_unix.tar.bz2) = 862d114541a49df2ef78f2700fde636b -SHA256 (Quake2maX_0.44-src_unix.tar.bz2) = 579aa80b1f26ebb5e7cd4dff4096504c378c7b225dd6c05fd5f076e3a4b5c8b7 -SIZE (Quake2maX_0.44-src_unix.tar.bz2) = 535440 +MD5 (Quake2maX_0.45-src_unix.tar.bz2) = 1bbc2611a8d84711f6a2416d04480430 +SHA256 (Quake2maX_0.45-src_unix.tar.bz2) = daca65e62a359f4ec526d85e809f9f22e66f7d2e70e6b8e0047daa4434499942 +SIZE (Quake2maX_0.45-src_unix.tar.bz2) = 528143 MD5 (quake2max.044.rar) = 8a18fa4a431acbe1891a9666abb210e7 SHA256 (quake2max.044.rar) = a8fd147c747e283438780bc8a4700df9c6173f4417e7ace0c67975036a08bce1 SIZE (quake2max.044.rar) = 2071329 diff --git a/games/quake2max/files/patch-client__ref.h b/games/quake2max/files/patch-client__ref.h new file mode 100644 index 000000000000..8587e4b6feff --- /dev/null +++ b/games/quake2max/files/patch-client__ref.h @@ -0,0 +1,11 @@ +--- ./client/ref.h.orig Sun Jan 1 15:05:04 2006 ++++ ./client/ref.h Sat Dec 30 17:36:46 2006 +@@ -36,7 +36,7 @@ + #define MAX_LIGHTSTYLES 256 + + #define MAX_DECAL_VERTS 128 +-#define MAX_DECAL_FRAGMENTS 64 ++#define MAX_DECAL_FRAGMENTS 32 + + #define POWERSUIT_SCALE 4.0F + diff --git a/games/quake2max/files/patch-qcommon__files.c b/games/quake2max/files/patch-qcommon__files.c index 1b5dfad39816..45ed64ae7ab2 100644 --- a/games/quake2max/files/patch-qcommon__files.c +++ b/games/quake2max/files/patch-qcommon__files.c @@ -1,16 +1,16 @@ ---- ./qcommon/files.c.orig Wed Jan 4 07:14:49 2006 -+++ ./qcommon/files.c Fri Jul 28 13:30:29 2006 -@@ -778,6 +778,9 @@ - Cvar_FullSet ("gamedir", dir, CVAR_SERVERINFO|CVAR_NOSET); +--- qcommon/files.c.orig Wed Jan 4 07:33:05 2006 ++++ qcommon/files.c Sat Dec 30 02:02:16 2006 +@@ -775,6 +775,9 @@ if (fs_cddir->string[0]) - FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) ); + + FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) ); +#ifdef DATADIR + FS_AddGameDirectory(va("%s/%s", DATADIR, dir)); +#endif #ifdef LIBDIR FS_AddGameDirectory(va("%s/%s", LIBDIR, dir)); #endif -@@ -1002,16 +1005,7 @@ +@@ -999,16 +1002,7 @@ // basedir // allows the game to run from outside the data tree // @@ -27,7 +27,7 @@ sv_defaultpaks = Cvar_Get ("sv_defaultpaks", "0", CVAR_ARCHIVE); -@@ -1027,8 +1021,11 @@ +@@ -1024,8 +1018,11 @@ // // start up with baseq2 by default // diff --git a/games/quake2max/files/patch-unix__gl_glx.c b/games/quake2max/files/patch-unix__gl_glx.c index e434e5b7a8cb..cd6f071d8b1f 100644 --- a/games/quake2max/files/patch-unix__gl_glx.c +++ b/games/quake2max/files/patch-unix__gl_glx.c @@ -1,6 +1,6 @@ ---- ./unix/gl_glx.c.orig Wed Jan 4 08:01:06 2006 -+++ ./unix/gl_glx.c Fri Jul 28 13:33:32 2006 -@@ -476,7 +476,6 @@ +--- unix/gl_glx.c.orig Wed Jan 11 10:04:12 2006 ++++ unix/gl_glx.c Sat Dec 30 18:21:42 2006 +@@ -475,7 +475,6 @@ while (XPending(dpy)) { XNextEvent(dpy, &event); @@ -8,12 +8,23 @@ switch(event.type) { case KeyPress: myxtime = event.xkey.time; -@@ -498,8 +497,6 @@ +@@ -490,15 +489,13 @@ + case MotionNotify: + if (mouse_active) { + if (dgamouse) { +- mx += (event.xmotion.x + win_x) * 2; +- my += (event.xmotion.y + win_y) * 2; ++ mx += (event.xmotion.x + win_x); ++ my += (event.xmotion.y + win_y); + } + else { - mx += ((int)event.xmotion.x - mwx) * 2; - my += ((int)event.xmotion.y - mwy) * 2; +- mx += ((int)event.xmotion.x - mwx) * 2; +- my += ((int)event.xmotion.y - mwy) * 2; - mwx = event.xmotion.x; - mwy = event.xmotion.y; ++ mx += ((int)event.xmotion.x - mwx); ++ my += ((int)event.xmotion.y - mwy); if (mx || my) dowarp = true; diff --git a/games/quake2max/files/patch-unix__sys_unix.c b/games/quake2max/files/patch-unix__sys_unix.c index 2f0f81782a93..a060ec7feefc 100644 --- a/games/quake2max/files/patch-unix__sys_unix.c +++ b/games/quake2max/files/patch-unix__sys_unix.c @@ -1,6 +1,17 @@ ---- ./unix/sys_unix.c.orig Wed Jan 4 07:57:40 2006 -+++ ./unix/sys_unix.c Fri Jul 28 13:30:29 2006 -@@ -220,15 +220,8 @@ +--- unix/sys_unix.c.orig Wed Jan 11 10:06:28 2006 ++++ unix/sys_unix.c Sat Dec 30 02:03:37 2006 +@@ -36,10 +36,6 @@ + #include + #include + +-#ifdef __linux__ +-#include +-#endif +- + #include + + #include "../qcommon/qcommon.h" +@@ -220,15 +216,8 @@ void *(*GetGameAPI) (void *); char name[MAX_OSPATH]; @@ -17,7 +28,7 @@ setreuid(getuid(), getuid()); setegid(getgid()); -@@ -236,8 +229,6 @@ +@@ -236,8 +225,6 @@ if (game_library) Com_Error (ERR_FATAL, "Sys_GetGameAPI without Sys_UnloadingGame"); @@ -26,7 +37,7 @@ Com_Printf("------- Loading %s -------\n", gamename); // now run through the search paths -@@ -247,7 +238,7 @@ +@@ -247,7 +234,7 @@ path = FS_NextPath (path); if (!path) return NULL; // couldn't find one anywhere @@ -35,19 +46,3 @@ game_library = dlopen (name, RTLD_LAZY ); if (game_library) { -@@ -319,6 +310,7 @@ - - void Sys_CopyProtect(void) - { -+#if 0 - FILE *mnt; - struct mntent *ent; - char path[MAX_OSPATH]; -@@ -366,6 +358,7 @@ - Com_Error (ERR_FATAL, "Could not find a Quake2 CD in your CD drive."); - Com_Error (ERR_FATAL, "Unable to find a mounted iso9660 file system.\n" - "You must mount the Quake2 CD in a cdrom drive in order to play."); -+#endif - } - - #if 0 -- cgit