Hi Thomas,
On Sun, Oct 23, 2022 at 12:46:26PM -0400, Thomas Frohwein wrote:
> Looks good, but there is a bundled .orig file that gets picked up by
> make update-patches: vstudio-libs/include/SDL_config_macosx.h.orig
>
> Therefore, I propose making use of PATCHORIG=.orig.port as in the diff
> below.
Tested this diff and it works a treat and doesn't consider that file
any more.
Thanks!
-Tom
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 11 Mar 2022 19:04:20 -0000 1.12
> +++ Makefile 23 Oct 2022 16:36:35 -0000
> @@ -1,9 +1,9 @@
> N = ezquake
> -V = 3.2.3
> +V = 3.6.0
> COMMENT = modern QuakeWorld client
>
> PKGNAME = ${N}-${V}
> -GH_ACCOUNT = ezQuake
> +GH_ACCOUNT = QW-Group
> GH_PROJECT = ${N}-source
> GH_TAGNAME = ${V}
>
> @@ -15,10 +15,11 @@ MAINTAINER = Tom Murphy <openbsd@pertho.
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += GL SDL2 c curl expat jansson jpeg m pcre png pthread
> -WANTLIB += speex speexdsp z
> +WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
> +WANTLIB += sndfile speex speexdsp z
>
> -LIB_DEPENDS = audio/speex \
> +LIB_DEPENDS = audio/libsndfile \
> + audio/speex \
> graphics/jpeg \
> graphics/png \
> devel/sdl2 \
> @@ -33,6 +34,7 @@ NO_TEST = Yes
>
> GAMEDIR = ${PREFIX}/share/ezquake
> SUBST_VARS += GAMEDIR
> +PATCHORIG = .orig.port
>
> do-configure:
> ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 20 Mar 2021 18:28:52 -0000 1.7
> +++ distinfo 23 Oct 2022 16:36:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ezquake-source-3.2.3.tar.gz) =
> 7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
> -SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
> +SHA256 (ezquake-source-3.6.0.tar.gz) =
> TBok1cXFQj0dKdxJQLJkuDMNpHz6MhozRreIqvj8+VA=
> +SIZE (ezquake-source-3.6.0.tar.gz) = 23487067
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile 11 Mar 2022 19:04:20 -0000 1.4
> +++ patches/patch-Makefile 23 Oct 2022 16:36:35 -0000
> @@ -13,11 +13,11 @@ Index: Makefile
> LIBS ?=
>
> #Temporarily disable tree vectorization optimization enabled at O3 due to
> gcc bug
> -@@ -379,7 +379,7 @@ endif
> +@@ -567,7 +567,7 @@ endif
> ifdef CONFIG_WINDOWS
> - TARG_c := ezquake.exe
> + TARG_c := ezquake$(EZ_POSTFIX).exe
> else
> -- TARG_c := ezquake-$(LSYS)-$(CPU)
> +- TARG_c := ezquake-$(LSYS)-$(CPU)$(EZ_POSTFIX)
> + TARG_c := ezquake
> endif
>
