On 2025/02/23 13:43, Tom Murphy wrote:
> Hi,
>
> Here's a patch for games/mvdsv to update the server to 1.10.
> Changelog is here: https://github.com/QW-Group/mvdsv/releases/tag/v1.10
>
> The project that covers ezquake/mvdsv uses a shared separate
> repository called 'qwprot' and so I had to update that to using a newer
> commit, otherwise just some minor changes in the patch for line offsets.
Upstream have an uploaded archive including the correct submodules.
Here's a diff switching to use that (and simplify the bits around the
Quake checkout).
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/mvdsv/Makefile,v
diff -u -p -r1.11 Makefile
--- Makefile 23 Jun 2024 15:50:53 -0000 1.11
+++ Makefile 23 Feb 2025 16:29:57 -0000
@@ -2,10 +2,12 @@ COMMENT = QuakeWorld server
CATEGORIES = games
-QUAKE_COMMIT = bf4ac424ce754894ac8f1dae6a3981954bc9852d
-DIST_TUPLE += github QW-Group mvdsv v1.00 .
-DIST_TUPLE += github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af
src/qwprot
-DIST_TUPLE += github id-software Quake ${QUAKE_COMMIT} .
+V = 1.10
+DISTNAME = mvdsv-$V
+DISTFILES = mvdsv-$V{mvdsv-source-with-submodules}.zip
+EXTRACT_CASES = *.zip) ${UNZIP} -Laq ${FULLDISTDIR}/$$archive -d
${WRKSRC};;
+DIST_TUPLE += github id-software Quake \
+ bf4ac424ce754894ac8f1dae6a3981954bc9852d Quake
# GPLv2+
PERMIT_PACKAGE = Yes
@@ -13,6 +15,7 @@ PERMIT_PACKAGE = Yes
MAINTAINER = Tom Murphy <open...@pertho.net>
HOMEPAGE = https://mvdsv.quake.se/
+SITES = https://github.com/QW-Group/mvdsv/releases/download/v$V/
WANTLIB += c curl m pcre pthread
@@ -29,7 +32,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/mvdsv ${PREFIX}/bin
${INSTALL_DATA_DIR} ${SAMPLES_DIR}
${INSTALL_DATA} ${FILESDIR}/server.cfg ${SAMPLES_DIR}
- ${INSTALL_DATA} ${WRKDIR}/Quake-${QUAKE_COMMIT}/QW/progs/qwprogs.dat \
- ${SAMPLES_DIR}/qwprogs.dat
+ ${INSTALL_DATA} ${WRKSRC}/Quake/QW/progs/qwprogs.dat \
+ ${SAMPLES_DIR}/qwprogs.dat
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/mvdsv/distinfo,v
diff -u -p -r1.6 distinfo
--- distinfo 23 Jun 2024 15:50:53 -0000 1.6
+++ distinfo 23 Feb 2025 16:29:57 -0000
@@ -1,6 +1,4 @@
-SHA256 (QW-Group-mvdsv-v1.00.tar.gz) =
Lon/SIERCWIpompgImcB5yQfQ6vI6/6YWmwmaqs39MM=
-SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) =
+nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
SHA256 (id-software-Quake-bf4ac424ce754894ac8f1dae6a3981954bc9852d.tar.gz) =
+5joyZdAEj8/rIMME4dYTsH2hNuJCMv0K3GH0G05kBM=
-SIZE (QW-Group-mvdsv-v1.00.tar.gz) = 552652
-SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 8815
+SHA256 (mvdsv-1.10.zip) = pjp4Flp1+9ODCHMEq1RQxW0PlL8xxnvNKBDYfpuzXLs=
SIZE (id-software-Quake-bf4ac424ce754894ac8f1dae6a3981954bc9852d.tar.gz) =
2958901
+SIZE (mvdsv-1.10.zip) = 617252
Index: patches/patch-src_server_h
===================================================================
RCS file: /cvs/ports/games/mvdsv/patches/patch-src_server_h,v
diff -u -p -r1.3 patch-src_server_h
--- patches/patch-src_server_h 12 Nov 2023 17:58:31 -0000 1.3
+++ patches/patch-src_server_h 23 Feb 2025 16:29:57 -0000
@@ -6,7 +6,7 @@ at: https://github.com/deurk/mvdsv/pull/
Index: src/server.h
--- src/server.h.orig
+++ src/server.h
-@@ -1088,7 +1088,6 @@ void SV_SetClientConnectionTime(client_t* client);
+@@ -1095,7 +1095,6 @@ void SV_SetClientConnectionTime(client_t* client);
#ifdef SERVERONLY
// mvdsv not changed over to enums yet, which was more about documentation
#define SV_CommandLineEnableCheats() (COM_CheckParm("-cheats"))
@@ -14,7 +14,7 @@ Index: src/server.h
#define SV_CommandLineDemoCacheArgument() (COM_CheckParm("-democache"))
#define SV_CommandLineProgTypeArgument() (COM_CheckParm("-progtype"))
#define SV_CommandLineUseMinimumMemory() (COM_CheckParm("-minmemory"))
-@@ -1096,7 +1095,6 @@ void SV_SetClientConnectionTime(client_t* client);
+@@ -1103,7 +1102,6 @@ void SV_SetClientConnectionTime(client_t* client);
#define SV_CommandLineHeapSizeMemoryMB() (COM_CheckParm("-mem"))
#else
#define SV_CommandLineEnableCheats()
(COM_CheckParm(cmdline_param_server_enablecheats))
