From: Tom Murphy <openbsd@pertho.net>
Subject: Re: [Maintainer update] games/yquake2 v8.70
To: ports@openbsd.org
Date: Thu, 27 Aug 2026 18:03:58 +0100

Hi again,

  Updated patch below. Uses ${LOCALBASE} and ${X11BASE}
instead of the absolute paths in the Makefile patch.

Thanks,
Tom


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/yquake2/Makefile,v
diff -u -p -r1.33 Makefile
--- Makefile	15 Sep 2025 16:44:58 -0000	1.33
+++ Makefile	26 Aug 2026 15:48:54 -0000
@@ -1,6 +1,6 @@
 COMMENT=	Yamagi Quake II
 N=		yquake2
-V=		8.60
+V=		8.70
 PKGNAME=	${N}-${V}
 DISTNAME=	quake2-${V}
 CATEGORIES=	games
@@ -17,18 +17,19 @@ COMPILER=	base-clang ports-gcc
 COMPILER_LANGS=	c
 
 # curl and openal are dlopen()'d
-WANTLIB += GL SDL2 c curl execinfo m openal
+WANTLIB += GL SDL3 c curl execinfo m openal
 
 # Libraries loaded with dlopen(3)
 # Extra: curl.26 openal.4
 LIB_DEPENDS=	audio/openal \
-		devel/sdl2 \
+		devel/sdl3 \
 		net/curl
 
 MAKE_ENV+=	VERBOSE=1
 USE_GMAKE=	Yes
 
-MAKE_FLAGS = config WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=${PREFIX}/share/${N}
+MAKE_FLAGS =	config PKG_CONFIG=pkg-config WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR=${PREFIX}/share/${N}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/yquake2/distinfo,v
diff -u -p -r1.15 distinfo
--- distinfo	15 Sep 2025 16:44:58 -0000	1.15
+++ distinfo	26 Aug 2026 15:48:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (quake2-8.60.tar.xz) = j2hHN6UqdcCgxGXsJual0P3B1JU5LqgwFa7YRWP5Pg8=
-SIZE (quake2-8.60.tar.xz) = 2222192
+SHA256 (quake2-8.70.tar.xz) = N+QUPk02LXuTunqNLDapRfvK6CrvOGUSAyIAIzsXUMg=
+SIZE (quake2-8.70.tar.xz) = 2231636
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile	26 Aug 2026 15:48:54 -0000
@@ -0,0 +1,22 @@
+Update INCLUDE and LDFLAGS for OpenBSD section to include ${X11BASE}
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -368,7 +368,7 @@ INCLUDE ?= -I/usr/local/include
+ else ifeq ($(YQ2_OSTYPE),NetBSD)
+ INCLUDE ?= -I/usr/X11R7/include -I/usr/pkg/include
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
+-INCLUDE ?= -I/usr/local/include
++INCLUDE ?= -I${LOCALBASE}/include -I${X11BASE}/include
+ else ifeq ($(YQ2_OSTYPE),Windows)
+ INCLUDE ?= -I/usr/include
+ else ifeq ($(YQ2_OSTYPE),Darwin)
+@@ -385,7 +385,7 @@ LDFLAGS ?= -L/usr/local/lib
+ else ifeq ($(YQ2_OSTYPE),NetBSD)
+ LDFLAGS ?= -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
+-LDFLAGS ?= -L/usr/local/lib
++LDFLAGS ?= -L${LOCALBASE}/lib -L${X11BASE}/lib
+ else ifeq ($(YQ2_OSTYPE),Windows)
+ LDFLAGS ?= -L/usr/lib
+ else ifeq ($(YQ2_OSTYPE),Darwin)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/yquake2/pkg/PLIST,v
diff -u -p -r1.8 PLIST
--- pkg/PLIST	8 Nov 2022 11:14:48 -0000	1.8
+++ pkg/PLIST	26 Aug 2026 15:48:54 -0000
@@ -4,9 +4,6 @@
 bin/quake2
 lib/yquake2/
 share/doc/pkg-readmes/${PKGSTEM}
-share/yquake2/
-share/yquake2/baseq2/
-@so share/yquake2/baseq2/game.so
 @mode 750
 @owner _yquake2
 @group _yquake2
@@ -14,6 +11,9 @@ share/yquake2/baseq2/
 @mode
 @owner
 @group
+share/yquake2/
+share/yquake2/baseq2/
+@so share/yquake2/baseq2/game.so
 @bin share/yquake2/q2ded
 @bin share/yquake2/quake2
 @so share/yquake2/ref_gl1.so