4 files changed, 36 insertions, 24 deletions
diff --git a/games/vkquake/files/patch-Quake_common.c b/games/vkquake/files/patch-Quake_common.c
new file mode 100644
index 000000000000..8e09d95b6ada
--- /dev/null
+++ b/games/vkquake/files/patch-Quake_common.c
@@ -0,0 +1,17 @@
+ vkQuake is packaged with .orig files in ${WRKSRC}/Misc/vq_pak/maps, these
+ files will conflict with the makepatch script in
+ ${PORTSDIR}/Mk/Scripts/smart_makepatch.sh, which results in a makepatch
+ process that does not generate this patch. To get around this, remove
+ ${WRKSRC}/Misc/vq_pak/maps when the patches need to be regenerated.
+
+--- Quake/common.c.orig	2025-05-01 11:30:09 UTC
++++ Quake/common.c
+@@ -2454,7 +2454,7 @@ void COM_InitFilesystem (void) // johnfitz -- modified
+ 	if (i && i < com_argc - 1)
+ 		q_strlcpy (com_basedir, com_argv[i + 1], sizeof (com_basedir));
+ 	else
+-		q_strlcpy (com_basedir, host_parms->basedir, sizeof (com_basedir));
++		q_strlcpy (com_basedir, DATADIR, sizeof (com_basedir));
+ 
+ 	j = strlen (com_basedir);
+ 	if (j < 1)
diff --git a/games/vkquake/files/patch-Quake_pr__edict.c b/games/vkquake/files/patch-Quake_pr__edict.c
new file mode 100644
index 000000000000..d033133a2acc
--- /dev/null
+++ b/games/vkquake/files/patch-Quake_pr__edict.c
@@ -0,0 +1,19 @@
+ vkQuake is packaged with .orig files in ${WRKSRC}/Misc/vq_pak/maps, these
+ files will conflict with the makepatch script in
+ ${PORTSDIR}/Mk/Scripts/smart_makepatch.sh, which results in a makepatch
+ process that does not generate this patch. To get around this, remove
+ ${WRKSRC}/Misc/vq_pak/maps when the patches need to be regenerated.
+
+--- Quake/pr_edict.c.orig	2025-05-01 11:30:09 UTC
++++ Quake/pr_edict.c
+@@ -883,8 +883,8 @@ void ED_PrintEdicts (void)
+ */
+ void ED_PrintEdicts (void)
+ {
+-	int free_edicts_count = 0;
+-	int free_list_count = 0;
++	int free_edicts_count __attribute__((unused)) = 0;
++	int free_list_count __attribute__((unused)) = 0;
+ 
+ 	if (!sv.active)
+ 		return;
diff --git a/games/vkquake/files/patch-common.c b/games/vkquake/files/patch-common.c
deleted file mode 100644
index be4140860252..000000000000
--- a/games/vkquake/files/patch-common.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common.c.orig	2022-07-08 05:51:08 UTC
-+++ common.c
-@@ -2233,7 +2233,7 @@ void COM_InitFilesystem (void) // johnfitz -- modified
- 	if (i && i < com_argc - 1)
- 		q_strlcpy (com_basedir, com_argv[i + 1], sizeof (com_basedir));
- 	else
--		q_strlcpy (com_basedir, host_parms->basedir, sizeof (com_basedir));
-+		q_strlcpy (com_basedir, DATADIR, sizeof (com_basedir));
- 
- 	j = strlen (com_basedir);
- 	if (j < 1)
diff --git a/games/vkquake/files/patch-pr__edict.c b/games/vkquake/files/patch-pr__edict.c
deleted file mode 100644
index bf5d29685b97..000000000000
--- a/games/vkquake/files/patch-pr__edict.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pr_edict.c.orig	2025-04-24 00:38:02 UTC
-+++ pr_edict.c
-@@ -883,8 +883,8 @@ void ED_PrintEdicts (void)
- */
- void ED_PrintEdicts (void)
- {
--	int free_edicts_count = 0;
--	int free_list_count = 0;
-+	int free_edicts_count __attribute__((unused)) = 0;
-+	int free_list_count __attribute__((unused)) = 0;
- 
- 	if (!sv.active)
- 		return;