On Sun, Feb 23, 2025 at 04:46:28AM -0800, Nam Nguyen wrote:
> Here is a diff to update games/ezquake to 3.6.6. I had to move to github
> /releases/ because upstream official supports release tarballs only, and
> I experienced a teaminfo bug when using DIST_TUPLE.
> 
> see: https://github.com/QW-Group/ezquake-source/pull/1026
> 
> The release tarball contains version.json and qwprot (so no need for git
> submodules and no need for network access).
> 
> Alternatively, we could host our own tarball using this script that
> creates the release tarball.
> see: https://github.com/QW-Group/ezquake-source/blob/master/dist/gen-release.sh
> 
> This diff:
> - updates to 3.6.6
>   changelog: https://github.com/QW-Group/ezquake-source/releases/tag/3.6.6
> - moves back to release tarball using a combination of SITES and
>   DISTNAME. it also defines DISTFILES. only release tarballs are
>   officially supported.
> - installs binary from ${WRKBUILD}/ezquake
> - updates patch for CMakeLists.txt
> 
> This builds with the new cmake split port, but I had to uninstall my
> old cmake before installing the new cmake. Team overlay works in my
> testing connecting two clients to a ktx server.
> 
> Feedback and tests are welcome. OK?
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/Makefile,v
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile	23 Nov 2024 16:06:18 -0000	1.19
> +++ Makefile	23 Feb 2025 12:21:36 -0000
> @@ -3,10 +3,9 @@ COMMENT =	modern QuakeWorld client
>  CATEGORIES =	games
>  
>  N =		ezquake
> -V =		3.6.5
> +V =		3.6.6
> +DISTNAME =	${N}-source-${V}
>  PKGNAME =	${N}-${V}
> -DIST_TUPLE +=	github QW-Group ${N}-source ${V} . # GPLv2+
> -DIST_TUPLE +=	github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af src/qwprot # GPLv2+
>  
>  # GPLv2+
>  PERMIT_PACKAGE =	Yes
> @@ -18,6 +17,10 @@ HOMEPAGE =	https://ezquake.com/
>  WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
>  WANTLIB += pthread sndfile speex speexdsp z
>  
> +SITES =		https://github.com/QW-Group/${N}-source/releases/download/${V}/
> +
> +DISTFILES =	${DISTNAME}${EXTRACT_SUFX}
> +
>  MODULES =	devel/cmake
>  
>  LIB_DEPENDS =	archivers/minizip \
> @@ -39,7 +42,7 @@ pre-configure:
>  	${SUBST_CMD} ${WRKSRC}/src/EX_browser_sources.c
>  
>  do-install:
> -	${INSTALL_PROGRAM}  ${WRKSRC}/ezquake ${PREFIX}/bin
> +	${INSTALL_PROGRAM}  ${WRKBUILD}/ezquake ${PREFIX}/bin
>  	${INSTALL_DATA_DIR} ${GAMEDIR}
>  	@cp ${WRKSRC}/misc/sb/*.txt ${GAMEDIR}/
>  
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/distinfo,v
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo	23 Nov 2024 16:06:18 -0000	1.11
> +++ distinfo	23 Feb 2025 12:21:36 -0000
> @@ -1,4 +1,2 @@
> -SHA256 (QW-Group-ezquake-source-3.6.5.tar.gz) = rM3ZmJPwHeevDoyUMxAs45khDRtjwxreY+6CUgGTIxM=
> -SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = +nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
> -SIZE (QW-Group-ezquake-source-3.6.5.tar.gz) = 1920510
> -SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 8815
> +SHA256 (ezquake-source-3.6.6.tar.gz) = bdKvdUi5yPyao2eWiqKnrqg1TNMBSllgk5iQGj1x3H8=
> +SIZE (ezquake-source-3.6.6.tar.gz) = 2052593
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/patches/patch-CMakeLists_txt,v
> diff -u -p -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt	23 Nov 2024 16:06:18 -0000	1.1
> +++ patches/patch-CMakeLists_txt	23 Feb 2025 12:21:36 -0000
> @@ -3,7 +3,7 @@ Set binary name to ezquake instead of ez
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> -@@ -885,6 +885,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
> +@@ -898,6 +898,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
>       string(TOLOWER "ezQuake" EXECUTABLE_NAME)
>   elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>       string(TOLOWER "ezquake" EXECUTABLE_NAME)


Compiles and runs perfect well here. I tested it with games/mvdsv.
I like that you got rid of the DIST_TUPLE. I think that is the way
forward.

I'm going to have to redo my games/mvdsv update in line with removing
the DIST_TUPLE so it uses the source with submodules as suggested.

This patch looks good to me and a good update for games/ezquake.

Thanks,
Tom