UPDATE: xonotic-0.8.5

Hi,

Here's an update to xonotic.

kn@ is no longer interested in maintaining it, and has asked me to drop
MAINTAINER.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/xonotic/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 11 Mar 2022 19:05:22 -0000 1.5
+++ Makefile 10 Jul 2022 17:05:51 -0000
@@ -6,10 +6,8 @@ COMMENT-server = fast-paced first person

MULTI_PACKAGES = -main -data -server

-V = 0.8.2
-REVISION = 1
+V = 0.8.5
DISTNAME = xonotic-${V}
-PKGNAME-main = xonotic-${V}
PKGNAME-data = xonotic-data-${V}
PKGNAME-server = xonotic-server-${V}
EXTRACT_SUFX = .zip
@@ -18,8 +16,6 @@ CATEGORIES = games x11
MASTER_SITES = https://dl.xonotic.org/
HOMEPAGE = https://xonotic.org

-MAINTAINER = Klemens Nanni <kn@openbsd.org>
-
# GPLv3+
PERMIT_PACKAGE = Yes

@@ -65,7 +61,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/${d}/
.endfor
${INSTALL_DATA} ${WRKDIST}/data/*.pk3 ${PREFIX}/share/xonotic/data/
- ${INSTALL_DATA} ${WRKDIST}/server/{server,help}.cfg \
+ ${INSTALL_DATA} ${WRKDIST}/server/server.cfg \
${PREFIX}/share/examples/xonotic/
${INSTALL_DATA} ${WRKDIST}/server/rcon.pl \
${PREFIX}/share/xonotic/server/
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/xonotic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 5 Dec 2018 15:53:53 -0000 1.1.1.1
+++ distinfo 8 Jul 2022 16:34:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (xonotic-0.8.2.zip) = oi9yMPSGxYJbVc/a3XM5nJsPrpjJ4IHdisduygg1mtU=
-SIZE (xonotic-0.8.2.zip) = 991045679
+SHA256 (xonotic-0.8.5.zip) = D5KqI4NirrBZudkCapvTjWIXQjo1wZ8Sb7OeOHNuN+U=
+SIZE (xonotic-0.8.5.zip) = 1228561792
Index: patches/patch-source_darkplaces_makefile_inc
===================================================================
RCS file: /cvs/ports/games/xonotic/patches/patch-source_darkplaces_makefile_inc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source_darkplaces_makefile_inc
--- patches/patch-source_darkplaces_makefile_inc 11 Mar 2022 19:05:22 -0000 1.2
+++ patches/patch-source_darkplaces_makefile_inc 21 Mar 2022 14:54:23 -0000
@@ -1,16 +1,16 @@
Index: source/darkplaces/makefile.inc
--- source/darkplaces/makefile.inc.orig
+++ source/darkplaces/makefile.inc
-@@ -193,7 +193,7 @@ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
- #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
+@@ -194,7 +194,7 @@ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
+ #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
#OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
#OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
-OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE=-fno-strict-aliasing $(CPUOPTIMIZATIONS)
# NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
+ # Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x;

- DO_CC=$(CC) $(CFLAGS) -c $< -o $@
-@@ -210,9 +210,9 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test
+@@ -212,9 +212,9 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)

LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
Index: pkg/PLIST-data
===================================================================
RCS file: /cvs/ports/games/xonotic/pkg/PLIST-data,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-data
--- pkg/PLIST-data 10 Mar 2022 12:03:31 -0000 1.3
+++ pkg/PLIST-data 8 Jul 2022 17:19:05 -0000
@@ -1,9 +1,9 @@
@conflict Xonotic-data-*
share/xonotic/
share/xonotic/data/
-share/xonotic/data/font-unifont-20170401.pk3
-share/xonotic/data/font-xolonium-20170401.pk3
-share/xonotic/data/xonotic-20170401-data.pk3
-share/xonotic/data/xonotic-20170401-maps.pk3
-share/xonotic/data/xonotic-20170401-music.pk3
-share/xonotic/data/xonotic-20170401-nexcompat.pk3
+share/xonotic/data/font-unifont-20220627.pk3
+share/xonotic/data/font-xolonium-20220627.pk3
+share/xonotic/data/xonotic-20220627-data.pk3
+share/xonotic/data/xonotic-20220627-maps.pk3
+share/xonotic/data/xonotic-20220627-music.pk3
+share/xonotic/data/xonotic-20220627-nexcompat.pk3
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/games/xonotic/pkg/PLIST-server,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-server
--- pkg/PLIST-server 10 Mar 2022 12:03:31 -0000 1.3
+++ pkg/PLIST-server 21 Mar 2022 14:54:24 -0000
@@ -1,7 +1,6 @@
@conflict Xonotic-server-*
@bin bin/xonotic-dedicated
share/examples/xonotic/
-share/examples/xonotic/help.cfg
share/examples/xonotic/server.cfg
share/xonotic/server/
share/xonotic/server/rcon.pl

--
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk