tyrquake: Update to 0.62

Changes:

* Model animation/movement interpolation (r_lerpmodels, r_lerpmove cvars)
* SDL video/input/sound target, now default for MacOS instead of X11.
* sndio sound target for OpenBSD (thanks Tony Spets/Jacob Meuser)
* Support for BJP1/2/3 and FITZ(666) network/demo protocols
* Support for Darkplaces and RMQ style BSP2/2PSB file formats
* Work around buggy timers on some windows systems/drivers (thanks MH!)
* Removed vid_win dependency on SciTech MGL (thanks MH!)
* Netmasks can be used with qwsv's addip/removeip; e.g. "addip 192.168.0.0/24"
* Fixed remote screenshots from QWSV
* Improved build system including new OSX, Win64, SDL targets
* Lots more code sharing between NQ/QW
* Use non-power-of-two OpenGL textures when extension is available
* New cvar "m_freelook" to replace need for manual editing "+mlook" in config

3 files changed, 21 insertions, 24 deletions

diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index e0a58388ef4..628910008f1 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2019/07/03 19:02:59 nia Exp $
 
-DISTNAME=	tyrquake-0.61_20140630
-PKGREVISION=	2
+DISTNAME=	tyrquake-0.62
 CATEGORIES=	games x11
-#MASTER_SITES=	https://disenchant.net/files/engine/
-MASTER_SITES=	http://ftp.NetBSD.org/pub/NetBSD/misc/snj/tyrquake/
+MASTER_SITES=	https://disenchant.net/files/engine/
 
 MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	https://disenchant.net/tyrquake/
 COMMENT=	Conservative branch of Quake
-
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
 
-WRKSRC=		${WRKDIR}/tyrquake
+WRKSRC=		${WRKDIR}/tyrutils-${PKGVERSION_NOREV}
 
 LDFLAGS+=	${LIBOSSAUDIO}
 
@@ -35,5 +32,4 @@ do-install:
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tyrquake/distinfo b/games/tyrquake/distinfo
index 4e8bb42558b..201260e6dab 100644
--- a/games/tyrquake/distinfo
+++ b/games/tyrquake/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:57:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/07/03 19:02:59 nia Exp $
 
-SHA1 (tyrquake-0.61_20140630.tar.gz) = 62e4e36f193e8ce2f2d555a9ff8f156300f7762a
-RMD160 (tyrquake-0.61_20140630.tar.gz) = d5f8100ae108ae18bf898094e76f417f6f5e111f
-SHA512 (tyrquake-0.61_20140630.tar.gz) = 4664d62b3f36217039a8013f543e95ae071d27737f7417016725c237fcbf50c07af0d3a23b03d160a80c24a2c893ee0d7037052310baa5eea2473d3c8c5878ac
-Size (tyrquake-0.61_20140630.tar.gz) = 4077622 bytes
-SHA1 (patch-Makefile) = 38507b8ec0af0b929904cc2eb5894922b13fc0a6
+SHA1 (tyrquake-0.62.tar.gz) = 7d60ad70e13444d6f15e7df406a00813861cb4f8
+RMD160 (tyrquake-0.62.tar.gz) = 6412f1f6f8aa355e298d6ba17cbf86f4af996809
+SHA512 (tyrquake-0.62.tar.gz) = 16b4c5f6de2e77e09933248c030836ad07c129e8680f7f8b14e526fa865dad15cf94fce25bf2c3cc2e33da9a6ffa849475c02d0a8aa777e5037befd468d1ee4f
+Size (tyrquake-0.62.tar.gz) = 948269 bytes
+SHA1 (patch-Makefile) = 58cd46fcd266d7d766cf3f166c19dc60b1d93e72
diff --git a/games/tyrquake/patches/patch-Makefile b/games/tyrquake/patches/patch-Makefile
index 5464934401b..02e1def8504 100644
--- a/games/tyrquake/patches/patch-Makefile
+++ b/games/tyrquake/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.1 2015/02/10 22:10:33 snj Exp $
+$NetBSD: patch-Makefile,v 1.2 2019/07/03 19:02:59 nia Exp $
 
 - add DragonFly support
 - add Solaris support
 - honor pkgsrc LDFLAGS
 - don't invoke git to obtain version info
 
---- Makefile.orig	2015-02-10 13:43:40.000000000 -0800
-+++ Makefile	2015-02-10 14:00:56.000000000 -0800
+--- Makefile.orig	2019-06-09 11:15:40.000000000 +0000
++++ Makefile
 @@ -28,7 +28,7 @@ TARGET_UNIX      ?= $(if $(filter UNIX,$
  # ============================================================================
  
@@ -16,16 +16,16 @@ $NetBSD: patch-Makefile,v 1.1 2015/02/10 22:10:33 snj Exp $
  TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE))
  TYR_VERSION_NUM ?= $(patsubst v%,%,$(TYR_VERSION))
  
-@@ -52,7 +52,7 @@ TOPDIR := $(shell pwd)
- ifneq (,$(findstring MINGW32,$(SYSNAME)))
- HOST_OS = WIN32
+@@ -55,7 +55,7 @@ else
+ ifneq (,$(findstring MINGW64,$(SYSNAME)))
+ HOST_OS = WIN64
  else
 -ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD))
 +ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD DragonFly))
  HOST_OS = UNIX
  HOST_UNIX = bsd
  else
-@@ -68,12 +68,19 @@ ifneq (,$(findstring $(SYSNAME),Linux))
+@@ -71,6 +71,12 @@ ifneq (,$(findstring $(SYSNAME),Linux))
  HOST_OS = UNIX
  HOST_UNIX = linux
  else
@@ -38,6 +38,7 @@ $NetBSD: patch-Makefile,v 1.1 2015/02/10 22:10:33 snj Exp $
  $(error OS type not detected.)
  endif
  endif
+@@ -78,6 +84,7 @@ endif
  endif
  endif
  endif
@@ -45,16 +46,16 @@ $NetBSD: patch-Makefile,v 1.1 2015/02/10 22:10:33 snj Exp $
  
  # --------------------------------------------------------------------
  # Setup driver options, choosing sensible defaults based on target OS
-@@ -412,7 +419,7 @@ endef
+@@ -416,7 +423,7 @@ endef
  endif
  endif
  
 -git_date = $(shell git log -1 --date=short --format="%ad" -- $< 2>/dev/null)
-+git_date = 2014-06-30
++git_date = 2019-06-09
  doc_version = $(git_date) $(TYR_VERSION)
  
  quiet_cmd_man2man = '  MAN2MAN  $@'
-@@ -988,23 +995,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL
+@@ -989,23 +996,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL
  # ============================================================================
  
  $(BIN_DIR)/tyr-quake$(EXT):	$(patsubst %,$(NQSWDIR)/%,$(ALL_NQSW_OBJS))