CVS commit: pkgsrc/games/tyrquake

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/tyrquake
From: "Kevin Bloom" <ktnb%netbsd.org@localhost>
Date: Thu, 6 Jun 2024 17:33:14 +0000

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Thu Jun  6 17:33:14 UTC 2024

Modified Files:
        pkgsrc/games/tyrquake: Makefile distinfo
        pkgsrc/games/tyrquake/patches: patch-Makefile
Added Files:
        pkgsrc/games/tyrquake/patches: patch-include_common.h

Log Message:
tyrquake: update to 0.71

Fixed a bug and FSF's address in license


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/tyrquake/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/tyrquake/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/tyrquake/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/tyrquake/patches/patch-include_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/tyrquake/Makefile
diff -u pkgsrc/games/tyrquake/Makefile:1.11 pkgsrc/games/tyrquake/Makefile:1.12
--- pkgsrc/games/tyrquake/Makefile:1.11 Wed Jul  3 19:02:59 2019
+++ pkgsrc/games/tyrquake/Makefile      Thu Jun  6 17:33:14 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2019/07/03 19:02:59 nia Exp $
+# $NetBSD: Makefile,v 1.12 2024/06/06 17:33:14 ktnb Exp $
 
-DISTNAME=      tyrquake-0.62
+DISTNAME=      tyrquake-0.71
 CATEGORIES=    games x11
 MASTER_SITES=  https://disenchant.net/files/engine/
 
@@ -11,8 +11,6 @@ LICENSE=      gnu-gpl-v2
 
 USE_TOOLS+=    gmake
 
-WRKSRC=                ${WRKDIR}/tyrutils-${PKGVERSION_NOREV}
-
 LDFLAGS+=      ${LIBOSSAUDIO}
 
 SUBST_CLASSES+=                audio

Index: pkgsrc/games/tyrquake/distinfo
diff -u pkgsrc/games/tyrquake/distinfo:1.8 pkgsrc/games/tyrquake/distinfo:1.9
--- pkgsrc/games/tyrquake/distinfo:1.8  Tue Oct 26 10:44:28 2021
+++ pkgsrc/games/tyrquake/distinfo      Thu Jun  6 17:33:14 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:44:28 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/06/06 17:33:14 ktnb Exp $
 
-BLAKE2s (tyrquake-0.62.tar.gz) = 150540d4cb8af17b9863141341b36d656d07185e0e082c6819c5e3ee105f84d7
-SHA512 (tyrquake-0.62.tar.gz) = 16b4c5f6de2e77e09933248c030836ad07c129e8680f7f8b14e526fa865dad15cf94fce25bf2c3cc2e33da9a6ffa849475c02d0a8aa777e5037befd468d1ee4f
-Size (tyrquake-0.62.tar.gz) = 948269 bytes
-SHA1 (patch-Makefile) = 58cd46fcd266d7d766cf3f166c19dc60b1d93e72
+BLAKE2s (tyrquake-0.71.tar.gz) = a3a1030f5b17bfbe6fd3d710d71a0b5b55096f2917f440d9acb1042cf3584d13
+SHA512 (tyrquake-0.71.tar.gz) = ecceeecb43866c10c0669b4362ce2eda7a790c502764b3d644566e7637ffbde0548676c9dcea07963db0d91d83c248e3497603c0a3a2e1a12a1418a82c07179a
+Size (tyrquake-0.71.tar.gz) = 2287864 bytes
+SHA1 (patch-Makefile) = d34b44cfa4c12cdda4a67dfddccd8e2a9ed1bec2
+SHA1 (patch-include_common.h) = e5b3402ff366da2c53fbeedafac83951b4f07ca7

Index: pkgsrc/games/tyrquake/patches/patch-Makefile
diff -u pkgsrc/games/tyrquake/patches/patch-Makefile:1.2 pkgsrc/games/tyrquake/patches/patch-Makefile:1.3
--- pkgsrc/games/tyrquake/patches/patch-Makefile:1.2    Wed Jul  3 19:02:59 2019
+++ pkgsrc/games/tyrquake/patches/patch-Makefile        Thu Jun  6 17:33:14 2024
@@ -1,22 +1,23 @@
-$NetBSD: patch-Makefile,v 1.2 2019/07/03 19:02:59 nia Exp $
+$NetBSD: patch-Makefile,v 1.3 2024/06/06 17:33:14 ktnb Exp $
 
 - add DragonFly support
 - add Solaris support
 - honor pkgsrc LDFLAGS
 - don't invoke git to obtain version info
 
---- Makefile.orig      2019-06-09 11:15:40.000000000 +0000
+--- Makefile.orig      2022-09-06 10:23:53.000000000 +0000
 +++ Makefile
-@@ -28,7 +28,7 @@ TARGET_UNIX      ?= $(if $(filter UNIX,$
+@@ -28,8 +28,7 @@ TARGET_UNIX      ?= $(if $(filter UNIX,$
  # ============================================================================
  
- TYR_RELEASE := v0.62-pre
+ TYR_RELEASE := v0.71
 -TYR_GIT := $(shell git describe --dirty 2> /dev/null)
-+TYR_GIT := v0.61-1226-g0ca7766-dirty
- TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE))
+-TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE))
++TYR_VERSION := TYR_RELEASE
  TYR_VERSION_NUM ?= $(patsubst v%,%,$(TYR_VERSION))
  
-@@ -55,7 +55,7 @@ else
+ # Ensure the build directory exists
+@@ -72,7 +71,7 @@ else
  ifneq (,$(findstring MINGW64,$(SYSNAME)))
  HOST_OS = WIN64
  else
@@ -25,7 +26,7 @@ $NetBSD: patch-Makefile,v 1.2 2019/07/03
  HOST_OS = UNIX
  HOST_UNIX = bsd
  else
-@@ -71,6 +71,12 @@ ifneq (,$(findstring $(SYSNAME),Linux))
+@@ -90,6 +89,12 @@ ifneq (,$(findstring $(SYSNAME),Linux))
  HOST_OS = UNIX
  HOST_UNIX = linux
  else
@@ -38,7 +39,7 @@ $NetBSD: patch-Makefile,v 1.2 2019/07/03
  $(error OS type not detected.)
  endif
  endif
-@@ -78,6 +84,7 @@ endif
+@@ -97,6 +102,7 @@ endif
  endif
  endif
  endif
@@ -46,16 +47,16 @@ $NetBSD: patch-Makefile,v 1.2 2019/07/03
  
  # --------------------------------------------------------------------
  # Setup driver options, choosing sensible defaults based on target OS
-@@ -416,7 +423,7 @@ endef
+@@ -468,7 +474,7 @@ endef
  endif
  endif
  
 -git_date = $(shell git log -1 --date=short --format="%ad" -- $< 2>/dev/null)
-+git_date = 2019-06-09
++git_date = 2022-09-06
  doc_version = $(git_date) $(TYR_VERSION)
  
  quiet_cmd_man2man = '  MAN2MAN  $@'
-@@ -989,23 +996,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL
+@@ -1074,23 +1080,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL
  # ============================================================================
  
  $(BIN_DIR)/tyr-quake$(EXT):   $(patsubst %,$(NQSWDIR)/%,$(ALL_NQSW_OBJS))
@@ -70,17 +71,17 @@ $NetBSD: patch-Makefile,v 1.2 2019/07/03
  
  $(BIN_DIR)/tyr-qwcl$(EXT):    $(patsubst %,$(QWSWDIR)/%,$(ALL_QWSW_OBJS))
 -      $(call do_cc_link,$(ALL_QWSW_LFLAGS))
-+      $(call do_cc_link,$(ALL_QWSW_LFLAGS)) $(LDFLAGS)
++      $(call do_cc_link,$(ALL_NQGL_LFLAGS)) $(LDFLAGS)
        $(call do_strip,$@)
  
  $(BIN_DIR)/tyr-glqwcl$(EXT):  $(patsubst %,$(QWGLDIR)/%,$(ALL_QWGL_OBJS))
 -      $(call do_cc_link,$(ALL_QWGL_LFLAGS))
-+      $(call do_cc_link,$(ALL_QWGL_LFLAGS)) $(LDFLAGS)
++      $(call do_cc_link,$(ALL_NQGL_LFLAGS)) $(LDFLAGS)
        $(call do_strip,$@)
  
  $(BIN_DIR)/tyr-qwsv$(EXT):    $(patsubst %,$(QWSVDIR)/%,$(ALL_QWSV_OBJS))
 -      $(call do_cc_link,$(ALL_QWSV_LFLAGS))
-+      $(call do_cc_link,$(ALL_QWSV_LFLAGS)) $(LDFLAGS)
++      $(call do_cc_link,$(ALL_NQGL_LFLAGS)) $(LDFLAGS)
        $(call do_strip,$@)
  
  # Build man pages, text and html docs from source

Added files:

Index: pkgsrc/games/tyrquake/patches/patch-include_common.h
diff -u /dev/null pkgsrc/games/tyrquake/patches/patch-include_common.h:1.1
--- /dev/null   Thu Jun  6 17:33:14 2024
+++ pkgsrc/games/tyrquake/patches/patch-include_common.h        Thu Jun  6 17:33:14 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-include_common.h,v 1.1 2024/06/06 17:33:14 ktnb Exp $
+
+NetBSD has bswap in stdlib which conflicts with upstream's
+definitions. Using the upstream definitions causes a conflict
+throughout the rest of the program.
+
+--- include/common.h.orig      2022-09-06 10:23:53.000000000 +0000
++++ include/common.h
+@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fi
+ 
+ #include <stdarg.h>
+ #include <stdio.h>
++#ifdef __NetBSD__
++#include <stdlib.h>
++#endif
+ 
+ #include "qtypes.h"
+ #include "shell.h"
+@@ -105,6 +108,7 @@ void InsertLinkAfter(link_t *l, link_t *
+  * ========================================================================
+  */
+ 
++#ifndef __NetBSD__
+ static inline short bswap16(short s)
+ {
+     return ((s & 255) << 8) | ((s >> 8) & 255);
+@@ -117,6 +121,7 @@ static inline int bswap32(int l)
+         | (((l >> 16) & 255) <<  8)
+         | (((l >> 24) & 255) <<  0);
+ }
++#endif
+ 
+ #ifdef __BIG_ENDIAN__
+ static inline short BigShort(short s) { return s; }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index