yquake2: Update to 7.45

Quake II 7.44 to 7.45:
- Fix a crash under windows when opening the games menu with mods
  installed.

Quake II 7.43 to 7.44:
- Fix some input option not getting saved.
- Limit busywaits to the full client. This lowers the cpu consumption
  of q2ded considerably.
- Rework the build system to be more distribution friendly. The base
  CFLAGS and LDFLAGS can now be overridden by the environment and by
  options passed to make. (by Simon McVittie)
- Fix some corner cases of broken IPv6 connectivity.
- Fix qport colliding between several Yamagi Quake II clients.
- Keyboard keys unknown to Yamagi Quake II can now be bound.
- Adaptive vsync is now supported by setting 'r_vsync' to '1'.
- Implement 'coop_pickup_weapons'. When set to '1', a weapon may be
  picked up by coop players if the player doesn't have the weapon in
  their inventory or no other player has already picked it up.
- In coop elevators wait for 'coop_elevator_delay' seconds.
- If 'cl_anglekick' is set '1' angle kicks are ignored. This breaks
  the gameplay a little bit, but helps against motion sickness. This
  cvar is cheat protected.
- Add 'listmaps' command and autocompletion for maps. (by JBerg)
- Make 'wait' in scripts wait for 17 ms. This fixes some movement
  makros.
- Support for Haiku. (by David Carlier)
- Add a 'mods' submenu. (by earth-metal)
- Add the 'vstr' command and 'nextdemo' cvar. Ported from ioquake3.
  (by Denis Pauk)

7 files changed, 54 insertions, 41 deletions

diff --git a/games/yquake2/MESSAGE b/games/yquake2/MESSAGE
index 07e9e78472e..b8bd1227439 100644
--- a/games/yquake2/MESSAGE
+++ b/games/yquake2/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2019/10/01 12:28:18 nia Exp $
+$NetBSD: MESSAGE,v 1.2 2020/11/24 13:04:52 nia Exp $
 
 To use Yamagi Quake II, you must have a set of data files from the original
 Quake II.
 
-Place them in the $PREFIX/share/yquake2/baseq2 directory.
+Place them in the ${PREFIX}/share/yquake2/baseq2 directory.
 
 Then run "quake2".
 
diff --git a/games/yquake2/Makefile b/games/yquake2/Makefile
index eb73df0e367..148c4d22351 100644
--- a/games/yquake2/Makefile
+++ b/games/yquake2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/08/18 17:57:59 leot Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/24 13:04:52 nia Exp $
 
-DISTNAME=	quake2-7.43
+DISTNAME=	quake2-7.45
 PKGNAME=	y${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	https://deponie.yamagi.org/quake2/
 EXTRACT_SUFX=	.tar.xz
@@ -12,14 +11,14 @@ HOMEPAGE=	https://www.yamagi.org/quake2/
 COMMENT=	Yamagi Quake II - alternative Quake II client
 LICENSE=	gnu-gpl-v2
 
-USE_CMAKE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c99 c++
+USE_TOOLS+=	gmake
+USE_LANGUAGES=	c99
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+=	-DSYSTEMWIDE_SUPPORT=ON
+MAKE_FLAGS+=	WITH_SYSTEMWIDE=yes
+MAKE_FLAGS+=	WITH_SYSTEMDIR=${PREFIX}/share/yquake2
 
-INSTALLATION_DIRS+=	bin libexec
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	libexec/yquake2
 INSTALLATION_DIRS+=	share/applications
 INSTALLATION_DIRS+=	share/pixmaps
 INSTALLATION_DIRS+=	share/yquake2/baseq2
@@ -33,19 +32,20 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/quake2.sh \
 	    ${DESTDIR}${PREFIX}/bin/q2ded
 	${INSTALL_PROGRAM} ${WRKSRC}/release/quake2 \
-	    ${DESTDIR}${PREFIX}/libexec/quake2
+	    ${DESTDIR}${PREFIX}/libexec/yquake2/quake2
 	${INSTALL_PROGRAM} ${WRKSRC}/release/q2ded \
-	    ${DESTDIR}${PREFIX}/libexec/q2ded
+	    ${DESTDIR}${PREFIX}/libexec/yquake2/q2ded
 	${INSTALL_LIB} ${WRKSRC}/release/baseq2/game.so \
 	    ${DESTDIR}${PREFIX}/share/yquake2/baseq2
 	${INSTALL_LIB} ${WRKSRC}/release/*.so \
-	    ${DESTDIR}${PREFIX}/share/yquake2
+	    ${DESTDIR}${PREFIX}/libexec/yquake2
 	${INSTALL_DATA} ${FILESDIR}/yquake2.desktop \
 	    ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/stuff/icon/Quake2.png \
 	    ${DESTDIR}${PREFIX}/share/pixmaps/quake2.png
 
 .include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/games/yquake2/PLIST b/games/yquake2/PLIST
index 298ec1562fe..35b92fb2a50 100644
--- a/games/yquake2/PLIST
+++ b/games/yquake2/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/01 12:28:18 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/24 13:04:52 nia Exp $
 bin/q2ded
 bin/quake2
-libexec/q2ded
-libexec/quake2
+libexec/yquake2/q2ded
+libexec/yquake2/quake2
+libexec/yquake2/ref_gl1.so
+libexec/yquake2/ref_gl3.so
+libexec/yquake2/ref_soft.so
 share/applications/yquake2.desktop
 share/pixmaps/quake2.png
 share/yquake2/baseq2/game.so
-share/yquake2/ref_gl1.so
-share/yquake2/ref_gl3.so
-share/yquake2/ref_soft.so
diff --git a/games/yquake2/distinfo b/games/yquake2/distinfo
index a976591e68d..c8140078d32 100644
--- a/games/yquake2/distinfo
+++ b/games/yquake2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/03/22 09:08:51 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/11/24 13:04:52 nia Exp $
 
-SHA1 (quake2-7.43.tar.xz) = 7336f1e9958bee28a6d3a9e26337a68de28a955f
-RMD160 (quake2-7.43.tar.xz) = 1e9d48416c757e2b27da125a83ace0ea450637b5
-SHA512 (quake2-7.43.tar.xz) = c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
-Size (quake2-7.43.tar.xz) = 1989812 bytes
-SHA1 (patch-CMakeLists.txt) = 9abf8f2345ed90379146a637bf79f4021777a67b
+SHA1 (quake2-7.45.tar.xz) = 1ad30e0a91606f2dfe6f960041e966111b9a3226
+RMD160 (quake2-7.45.tar.xz) = c3b5527486003e2bea9b5f2d55c72e124a4cd3cc
+SHA512 (quake2-7.45.tar.xz) = 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
+Size (quake2-7.45.tar.xz) = 1997816 bytes
+SHA1 (patch-Makefile) = c9ed23e0361c676d8fe560b591f217dd9f662516
diff --git a/games/yquake2/files/quake2.sh.in b/games/yquake2/files/quake2.sh.in
index 8e19e752f6f..e5d996b3984 100644
--- a/games/yquake2/files/quake2.sh.in
+++ b/games/yquake2/files/quake2.sh.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 BIN=$(basename "$0")
-cd "@PREFIX@/share/yquake2" && exec "@PREFIX@/libexec/$BIN" "$@"
+cd "@PREFIX@/share/yquake2" && exec "@PREFIX@/libexec/yquake2/$BIN" "$@"
diff --git a/games/yquake2/patches/patch-CMakeLists.txt b/games/yquake2/patches/patch-CMakeLists.txt
deleted file mode 100644
index f7bf3cc6bdd..00000000000
--- a/games/yquake2/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/01 12:28:19 nia Exp $
-
-Don't allow it to default to /usr/share/games/quake2.
-
---- CMakeLists.txt.orig	2019-09-26 13:14:20.599841947 +0000
-+++ CMakeLists.txt
-@@ -81,6 +81,7 @@ add_definitions(-DYQ2ARCH="${ARCH}")
- # Systemwide installation of game assets.
- if(${SYSTEMWIDE_SUPPORT})
-     add_definitions(-DSYSTEMWIDE)
-+    add_definitions(-DSYSTEMDIR="${CMAKE_INSTALL_PREFIX}/share/yquake2")
- endif()
- 
- # We need to pass some options to minizip / unzip.
diff --git a/games/yquake2/patches/patch-Makefile b/games/yquake2/patches/patch-Makefile
new file mode 100644
index 00000000000..619a9d1baea
--- /dev/null
+++ b/games/yquake2/patches/patch-Makefile
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile,v 1.1 2020/11/24 13:04:53 nia Exp $
+
+Add support for NetBSD.
+
+--- Makefile.orig	2020-10-17 13:37:27.000000000 +0000
++++ Makefile
+@@ -286,6 +286,8 @@ ifeq ($(YQ2_OSTYPE),Linux)
+ override LDFLAGS += -lm -ldl -rdynamic
+ else ifeq ($(YQ2_OSTYPE),FreeBSD)
+ override LDFLAGS += -lm
++else ifeq ($(YQ2_OSTYPE),NetBSD)
++override LDFLAGS += -lm
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
+ override LDFLAGS += -lm
+ else ifeq ($(YQ2_OSTYPE),Windows)
+@@ -452,6 +454,11 @@ release/quake2 : CFLAGS += -DHAVE_EXECIN
+ release/quake2 : LDFLAGS += -lexecinfo
+ endif
+ 
++ifeq ($(YQ2_OSTYPE), NetBSD)
++release/quake2 : CFLAGS += -DHAVE_EXECINFO
++release/quake2 : LDFLAGS += -lexecinfo
++endif
++
+ ifeq ($(YQ2_OSTYPE), OpenBSD)
+ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+ release/quake2 : LDFLAGS += -lexecinfo