diff --git a/games/yquake2/Makefile b/games/yquake2/Makefile index 29da8eacc1e0..1c2c52953e77 100644 --- a/games/yquake2/Makefile +++ b/games/yquake2/Makefile @@ -1,44 +1,44 @@ PORTNAME= yquake2 -DISTVERSION= 8.60 +DISTVERSION= 8.70 CATEGORIES= games MASTER_SITES= https://deponie.yamagi.org/quake2/ DISTNAME= quake2-${DISTVERSION} MAINTAINER= shamaz.mazum@gmail.com COMMENT= Improved version of Icculus Quake II WWW= https://www.yamagi.org/quake2/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE # Quake II loads optional libraries via dlopen(3) BUILD_DEPENDS= ${LOCALBASE}/include/curl/curl.h:ftp/curl RUN_DEPENDS= ${LOCALBASE}/lib/libcurl.so:ftp/curl -USES= gl gmake openal sdl tar:xz +USES= gl gmake openal pkgconfig sdl tar:xz USE_GL= gl -USE_SDL= sdl2 +USE_SDL= sdl3 MAKE_ARGS= VERBOSE=1 WITH_SYSTEMWIDE=yes \ WITH_SYSTEMDATADIR="${Q2DIR}" \ WITH_SYSTEMLIBDIR="${PREFIX}/lib/${PORTNAME}" OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/release/q2ded \ ${STAGEDIR}${PREFIX}/bin/yq2ded ${INSTALL_PROGRAM} ${WRKSRC}/release/quake2 \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/baseq2 ${INSTALL_LIB} ${WRKSRC}/release/baseq2/game.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/baseq2 ${INSTALL_LIB} ${WRKSRC}/release/ref_*.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/doc/*.md \ ${STAGEDIR}${DOCSDIR} .include "${.CURDIR}/../quake2-data/Makefile.include" .include diff --git a/games/yquake2/distinfo b/games/yquake2/distinfo index ad0450013447..96576b6bb71a 100644 --- a/games/yquake2/distinfo +++ b/games/yquake2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763917917 -SHA256 (quake2-8.60.tar.xz) = 8f684737a52a75c0a0c465ec26e6a5d0fdc1d495392ea83015aed84563f93e0f -SIZE (quake2-8.60.tar.xz) = 2222192 +TIMESTAMP = 1779165048 +SHA256 (quake2-8.70.tar.xz) = 37e4143e4d362d7b93ba7a8d2c36a945fbcae82aef386512032200233b1750c8 +SIZE (quake2-8.70.tar.xz) = 2231636 diff --git a/games/yquake2/files/patch-Makefile b/games/yquake2/files/patch-Makefile index d86ad7e6424d..5db7f079d644 100644 --- a/games/yquake2/files/patch-Makefile +++ b/games/yquake2/files/patch-Makefile @@ -1,28 +1,28 @@ ---- Makefile.orig 2025-09-14 05:35:31 UTC +--- Makefile.orig 2026-05-19 04:32:33 UTC +++ Makefile -@@ -253,10 +253,13 @@ override CFLAGS += -DSYSTEMWIDE +@@ -317,10 +317,13 @@ override CFLAGS += -DSYSTEMWIDE # Systemwide installation. ifeq ($(WITH_SYSTEMWIDE),yes) override CFLAGS += -DSYSTEMWIDE -ifneq ($(WITH_SYSTEMDIR),"") -override CFLAGS += -DSYSTEMDIR=\"$(WITH_SYSTEMDIR)\" +ifneq ($(WITH_SYSTEMDATADIR),"") +override CFLAGS += -DSYSTEMDATADIR=\"$(WITH_SYSTEMDATADIR)\" endif +ifneq ($(WITH_SYSTEMLIBDIR),"") +override CFLAGS += -DSYSTEMLIBDIR=\"$(WITH_SYSTEMLIBDIR)\" endif +endif # ---------- -@@ -429,7 +432,8 @@ config: +@@ -493,7 +496,8 @@ config: @echo "WITH_RPATH = $(WITH_RPATH)" @echo "WITH_SDL3 = $(WITH_SDL3)" @echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)" - @echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)" + @echo "WITH_SYSTEMDATADIR = $(WITH_SYSTEMDATADIR)" + @echo "WITH_SYSTEMLIBDIR = $(WITH_SYSTEMLIBDIR)" + @echo "WITH_XDG = $(WITH_XDG)" @echo "============================" @echo "" - diff --git a/games/yquake2/files/patch-src_common_filesystem.c b/games/yquake2/files/patch-src_common_filesystem.c index cccb308b3866..1f91e7281b5f 100644 --- a/games/yquake2/files/patch-src_common_filesystem.c +++ b/games/yquake2/files/patch-src_common_filesystem.c @@ -1,12 +1,12 @@ ---- src/common/filesystem.c.orig 2025-09-14 05:35:31 UTC +--- src/common/filesystem.c.orig 2026-05-14 07:18:11 UTC +++ src/common/filesystem.c -@@ -2131,7 +2131,8 @@ FS_BuildRawPath(void) +@@ -2226,7 +2226,8 @@ FS_BuildRawPath(void) // binary compiled with SYSTEMWIDE (installed from // packages), but no systemwide game data. #ifdef SYSTEMWIDE - FS_AddDirToRawPath(SYSTEMDIR, false, false); + FS_AddDirToRawPath(SYSTEMDATADIR, false, false); + FS_AddDirToRawPath(SYSTEMLIBDIR, false, false); #endif // The CD must be the last directory of the path,