From nobody Thu Jan 18 14:37:07 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TG51H3qt6z58R3w; Thu, 18 Jan 2024 14:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TG51H3M2Lz4dK5; Thu, 18 Jan 2024 14:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705588627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJiI/EjAyM/X/PLwPVtUVTpId0RrtYNECZzyQ38fwyo=; b=Ttd1+iMN7mIvoGwScnsT37UEbr1KZ9T9gnCRTsrrgeiGXXlqdmf8ChuEU38o22MbzxXRR/ rYVfFHl8wftIVf0iMMr2+m4/5oW2s31QN1QoOJ7ybPiO/wGtQcyCjO/NZgGamBM/8jye6A UVzMEfvfdeYeOYGSiqJsYX0z6K0ONnvQN+j1kgCyQb43e1oOsJW+6iPAifwyC60FwPGyI0 gEyx71KiGEnwH6QGWV7DIwJYexrItSRLE8Cd/h9zjzSA1CJLzgTLrFjqiAP+ezMHdFMeyw CIwgcE8+e2R7JpkcaiTIqYBqFXNdC/I4OnHbIAfa9nWNfX0eGdKIP2/68PK9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705588627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJiI/EjAyM/X/PLwPVtUVTpId0RrtYNECZzyQ38fwyo=; b=K72x3xfuqrYpEBqG8ItUupPQzM2scT0L0gjq9tlP4UgBwwZQywXAtGO3DxP7khqvPXOaiP a/Qpv9pc41YPWJ9DQsYSKeQu07LqPjlrl6T9fa0MpGvwsC+7k4uw4QxI+WyJIJerbEzAwK Ljn4FFIfL/BfPRMPXHRQMedNu+6K9GddhoGM2y48nmvdCcQPKTxGruJ3LmX8mH8hHkm/7v OQSE395JwplKUWvzLYK686M39TKH1m1MuyqH4B3IPxR7WJW26K42P+XaIIRO7Mz81V5D3o NU27cTr/71de+c02vQcssUSVMAEqAIVgJo06VP/N9rGVoWWvt5UZbqY9aER8VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705588627; a=rsa-sha256; cv=none; b=az3n8/l0bq//DU0ubSfM2ylB/trsoFpL807zqcs++MS+1qxJimVSKdVh3hyEsqI5nVgUlQ odZ88gFXz9d1trZ3TYQKoFVVr08Rfa3w2ajXQFA80eDRCYWuhQz7ioGoyX3H/PmIlaA4C5 LG6aVBxDVDpnGFiNN4mCRBydD3JPftFUk+4iBpflNYX5+OX87OYGNH8ovgvmil7LRK4bnB nq1IU5uQThO/uE1jL5/d9WrfpywJ3pTkz4XP26c1Us/O/RqBw8LeiFn4gWfzOFHG9/C+I4 J3cAmHDlrVp7oTxTp9A9cGkGvpdFAv2IO1DeMrkGCe7Z9NtIyCcloiLlNXzxAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TG51H2Q00z19gK; Thu, 18 Jan 2024 14:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IEb7GO093957; Thu, 18 Jan 2024 14:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IEb7ka093954; Thu, 18 Jan 2024 14:37:07 GMT (envelope-from git) Date: Thu, 18 Jan 2024 14:37:07 GMT Message-Id: <202401181437.40IEb7ka093954@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 027ea12fe514 - main - games/quake2max: regenerate existing patches before adding new ones. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027ea12fe5142cde766d45a933390bf575006126 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=027ea12fe5142cde766d45a933390bf575006126 commit 027ea12fe5142cde766d45a933390bf575006126 Author: Alexey Dokuchaev AuthorDate: 2024-01-18 14:35:34 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-18 14:35:34 +0000 games/quake2max: regenerate existing patches before adding new ones. --- games/quake2max/files/patch-client__menu.c | 8 ++++---- games/quake2max/files/patch-client__ref.h | 6 +++--- games/quake2max/files/patch-game__g_items.c | 6 +++--- games/quake2max/files/patch-qcommon__files.c | 10 +++++----- games/quake2max/files/patch-ref_gl__gl_model.c | 12 ++++++------ games/quake2max/files/patch-ref_gl__sul_png.c | 6 +++--- games/quake2max/files/patch-unix__gl_glx.c | 8 ++++---- games/quake2max/files/patch-unix__snd_unix.c | 4 ++-- games/quake2max/files/patch-unix__sys_unix.c | 12 ++++++------ games/quake2max/files/patch-unix__vid_menu.c | 6 +++--- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/games/quake2max/files/patch-client__menu.c b/games/quake2max/files/patch-client__menu.c index 80ba71b96d75..8c98a9c1da89 100644 --- a/games/quake2max/files/patch-client__menu.c +++ b/games/quake2max/files/patch-client__menu.c @@ -1,6 +1,6 @@ ---- client/menu.c.orig Tue Dec 27 10:06:52 2005 -+++ client/menu.c Thu Mar 22 00:36:51 2007 -@@ -898,7 +898,7 @@ +--- client/menu.c.orig 2005-12-27 13:06:52 UTC ++++ client/menu.c +@@ -898,7 +898,7 @@ static void StartNetworkServerFunc( void *unused ) void Multiplayer_MenuInit( void ) { @@ -9,7 +9,7 @@ if (!server_menu) server_menu = Cvar_Get ("server_menu", "1", 0); -@@ -4784,7 +4784,7 @@ +@@ -4784,7 +4784,7 @@ static qboolean IconOfSkinExists( char *skin, char **f return false; } diff --git a/games/quake2max/files/patch-client__ref.h b/games/quake2max/files/patch-client__ref.h index 8587e4b6feff..9f23d725f693 100644 --- a/games/quake2max/files/patch-client__ref.h +++ b/games/quake2max/files/patch-client__ref.h @@ -1,6 +1,6 @@ ---- ./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 @@ +--- client/ref.h.orig 2006-01-01 18:05:04 UTC ++++ client/ref.h +@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, #define MAX_LIGHTSTYLES 256 #define MAX_DECAL_VERTS 128 diff --git a/games/quake2max/files/patch-game__g_items.c b/games/quake2max/files/patch-game__g_items.c index 11cdcc957b72..914731483728 100644 --- a/games/quake2max/files/patch-game__g_items.c +++ b/games/quake2max/files/patch-game__g_items.c @@ -1,6 +1,6 @@ ---- game/g_items.c.orig Sat Dec 22 12:32:24 2001 -+++ game/g_items.c Thu Mar 22 00:34:42 2007 -@@ -40,9 +40,9 @@ +--- game/g_items.c.orig 2001-12-22 15:32:24 UTC ++++ game/g_items.c +@@ -40,9 +40,9 @@ gitem_armor_t jacketarmor_info = { 25, 50, .30, .00, gitem_armor_t combatarmor_info = { 50, 100, .60, .30, ARMOR_COMBAT}; gitem_armor_t bodyarmor_info = {100, 200, .80, .60, ARMOR_BODY}; diff --git a/games/quake2max/files/patch-qcommon__files.c b/games/quake2max/files/patch-qcommon__files.c index 45ed64ae7ab2..604260b49ddf 100644 --- a/games/quake2max/files/patch-qcommon__files.c +++ b/games/quake2max/files/patch-qcommon__files.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- qcommon/files.c.orig 2006-01-04 10:33:05 UTC ++++ qcommon/files.c +@@ -775,6 +775,9 @@ void FS_SetGamedir (char *dir) if (fs_cddir->string[0]) FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) ); @@ -10,7 +10,7 @@ #ifdef LIBDIR FS_AddGameDirectory(va("%s/%s", LIBDIR, dir)); #endif -@@ -999,16 +1002,7 @@ +@@ -999,16 +1002,7 @@ void FS_InitFilesystem (void) // basedir // allows the game to run from outside the data tree // @@ -27,7 +27,7 @@ sv_defaultpaks = Cvar_Get ("sv_defaultpaks", "0", CVAR_ARCHIVE); -@@ -1024,8 +1018,11 @@ +@@ -1024,8 +1018,11 @@ void FS_InitFilesystem (void) // // start up with baseq2 by default // diff --git a/games/quake2max/files/patch-ref_gl__gl_model.c b/games/quake2max/files/patch-ref_gl__gl_model.c index 9d2fd4530009..49ca0f473133 100644 --- a/games/quake2max/files/patch-ref_gl__gl_model.c +++ b/games/quake2max/files/patch-ref_gl__gl_model.c @@ -1,6 +1,6 @@ ---- ref_gl/gl_model.c.orig Sun Jan 1 15:07:39 2006 -+++ ref_gl/gl_model.c Thu Mar 22 00:33:43 2007 -@@ -227,7 +227,7 @@ +--- ref_gl/gl_model.c.orig 2006-01-01 18:07:39 UTC ++++ ref_gl/gl_model.c +@@ -227,7 +227,7 @@ static void R_GetTexSize (char *name, mtexinfo_t *out) } @@ -9,7 +9,7 @@ if (rs && rs->picsize.enable) { if (r_numTexSizes < MAX_IMAGES) -@@ -459,7 +459,7 @@ +@@ -459,7 +459,7 @@ model_t *Mod_ForName (const char *name, qboolean crash while (img != NULL) { strcpy(rs,mod->skins[i]->name); rs[strlen(rs)-4]=0; @@ -18,7 +18,7 @@ if (mod->script[i]) RS_ReadyScript((rscript_t *)mod->script[i]); i++; -@@ -1374,7 +1374,7 @@ +@@ -1374,7 +1374,7 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer) strcpy(rs,(char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME); rs[strlen(rs)-4]=0; @@ -27,7 +27,7 @@ if (mod->script[i]) RS_ReadyScript((rscript_t *)mod->script[i]); } -@@ -1465,7 +1465,7 @@ +@@ -1465,7 +1465,7 @@ void R_BeginRegistration (char *model) } diff --git a/games/quake2max/files/patch-ref_gl__sul_png.c b/games/quake2max/files/patch-ref_gl__sul_png.c index 9061bd5a9a32..0343c095892a 100644 --- a/games/quake2max/files/patch-ref_gl__sul_png.c +++ b/games/quake2max/files/patch-ref_gl__sul_png.c @@ -1,6 +1,6 @@ ---- ref_gl/sul_png.c.orig 2005-12-27 10:57:45.000000000 +0100 -+++ ref_gl/sul_png.c 2012-04-29 06:53:31.000000000 +0200 -@@ -177,7 +177,7 @@ +--- ref_gl/sul_png.c.orig 2005-12-27 09:57:45 UTC ++++ ref_gl/sul_png.c +@@ -177,7 +177,7 @@ void GL_ScreenShot_PNG (void) return; } diff --git a/games/quake2max/files/patch-unix__gl_glx.c b/games/quake2max/files/patch-unix__gl_glx.c index cd6f071d8b1f..2b6c2b6df653 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 11 10:04:12 2006 -+++ unix/gl_glx.c Sat Dec 30 18:21:42 2006 -@@ -475,7 +475,6 @@ +--- unix/gl_glx.c.orig 2006-01-11 13:04:12 UTC ++++ unix/gl_glx.c +@@ -475,7 +475,6 @@ static void HandleEvents(void) while (XPending(dpy)) { XNextEvent(dpy, &event); @@ -8,7 +8,7 @@ switch(event.type) { case KeyPress: myxtime = event.xkey.time; -@@ -490,15 +489,13 @@ +@@ -490,15 +489,13 @@ static void HandleEvents(void) case MotionNotify: if (mouse_active) { if (dgamouse) { diff --git a/games/quake2max/files/patch-unix__snd_unix.c b/games/quake2max/files/patch-unix__snd_unix.c index d05e65df0785..5f5eddbebaa1 100644 --- a/games/quake2max/files/patch-unix__snd_unix.c +++ b/games/quake2max/files/patch-unix__snd_unix.c @@ -1,5 +1,5 @@ ---- unix/snd_unix.c.orig 2006-01-01 20:46:30.000000000 +0800 -+++ unix/snd_unix.c 2013-09-05 13:28:24.000000000 +0800 +--- unix/snd_unix.c.orig 2006-01-01 12:46:30 UTC ++++ unix/snd_unix.c @@ -59,7 +59,7 @@ qboolean SNDDMA_Init(void) extern uid_t saved_euid; diff --git a/games/quake2max/files/patch-unix__sys_unix.c b/games/quake2max/files/patch-unix__sys_unix.c index a060ec7feefc..cb2cc06e213b 100644 --- a/games/quake2max/files/patch-unix__sys_unix.c +++ b/games/quake2max/files/patch-unix__sys_unix.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- unix/sys_unix.c.orig 2006-01-11 13:06:28 UTC ++++ unix/sys_unix.c +@@ -36,10 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, #include #include @@ -11,7 +11,7 @@ #include #include "../qcommon/qcommon.h" -@@ -220,15 +216,8 @@ +@@ -220,15 +216,8 @@ void *Sys_GetGameAPI (void *parms) void *(*GetGameAPI) (void *); char name[MAX_OSPATH]; @@ -28,7 +28,7 @@ setreuid(getuid(), getuid()); setegid(getgid()); -@@ -236,8 +225,6 @@ +@@ -236,8 +225,6 @@ void *Sys_GetGameAPI (void *parms) if (game_library) Com_Error (ERR_FATAL, "Sys_GetGameAPI without Sys_UnloadingGame"); @@ -37,7 +37,7 @@ Com_Printf("------- Loading %s -------\n", gamename); // now run through the search paths -@@ -247,7 +234,7 @@ +@@ -247,7 +234,7 @@ void *Sys_GetGameAPI (void *parms) path = FS_NextPath (path); if (!path) return NULL; // couldn't find one anywhere diff --git a/games/quake2max/files/patch-unix__vid_menu.c b/games/quake2max/files/patch-unix__vid_menu.c index d680bd2df549..0df5fdc152e5 100644 --- a/games/quake2max/files/patch-unix__vid_menu.c +++ b/games/quake2max/files/patch-unix__vid_menu.c @@ -1,6 +1,6 @@ ---- unix/vid_menu.c.orig Wed Dec 28 10:23:32 2005 -+++ unix/vid_menu.c Thu Mar 22 00:37:42 2007 -@@ -37,7 +37,7 @@ +--- unix/vid_menu.c.orig 2005-12-28 13:23:32 UTC ++++ unix/vid_menu.c +@@ -37,7 +37,7 @@ static cvar_t *gl_driver; static cvar_t *gl_picmip; static cvar_t *gl_texturemode; static cvar_t *gl_anisotropic;