update sauerbraten to 20201227

games/sauerbraten/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2020/06/02 09:22:26 jsg Exp $
+# $OpenBSD: Makefile,v 1.10 2021/02/16 00:25:37 jsg Exp $
 
 ONLY_FOR_ARCHS=	i386 amd64 macppc
 
@@ -13,12 +13,11 @@ MAINTAINER=	Jonathan Gray <jsg@openbsd.org>
 MULTI_PACKAGES=	-main -data
 
 N=		sauerbraten
-V=		20130203
-REVISION=	3
+V=		20201227
 PKGNAME=	${N}-${V}
 PKGNAME-main=	${N}-${V}
 PKGNAME-data=	${N}-data-${V}
-DISTNAME=	${N}_2013_02_03_collect_edition_linux
+DISTNAME=	${N}_2020_12_27_linux
 EXTRACT_SUFX=	.tar.bz2
 
 PKG_ARCH-data=	*
@@ -34,10 +33,11 @@ NO_TEST=		Yes
 
 RUN_DEPENDS-main +=	${BASE_PKGPATH},-data
 
-LIB_DEPENDS-main=	devel/sdl-mixer \
-			devel/sdl-image \
+LIB_DEPENDS-main=	devel/sdl2-mixer \
+			devel/sdl2-image \
 			net/enet
-WANTLIB-main=		GL X11 SDL SDL_image SDL_mixer c enet m pthread ${COMPILER_LIBCXX} z
+WANTLIB-main=		GL X11 SDL2 SDL2_image SDL2_mixer c enet m pthread \
+			${COMPILER_LIBCXX} z
 
 COMPILER =		base-clang ports-gcc base-gcc
 

games/sauerbraten/distinfo

@@ -1,2 +1,2 @@
-SHA256 (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = RcIFIePlY3RJCy2REqIRU46AHPAWEZfzVHazC3tYp44=
-SIZE (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 589941180
+SHA256 (sauerbraten_2020_12_27_linux.tar.bz2) = klq/GY8aTljfxnNCNwgIEyXMDaPzxVSIJnOxrg/yRfY=
+SIZE (sauerbraten_2020_12_27_linux.tar.bz2) = 985815649

games/sauerbraten/patches/patch-Makefile

@@ -1,12 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2013/04/29 01:56:43 jsg Exp $
---- Makefile.orig	Tue Aug 28 15:30:07 2012
-+++ Makefile	Fri Apr 12 16:38:03 2013
+$OpenBSD: patch-Makefile,v 1.2 2021/02/16 00:25:37 jsg Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -1,10 +1,10 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS?= -O3 -fomit-frame-pointer
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
++CXXFLAGS?= -O3 -fomit-frame-pointer -ffast-math
  override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
  
- PLATFORM= $(shell uname -s)
+ PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
  PLATFORM_PREFIX= native
  
 -INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
@@ -14,40 +15,41 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2013/04/29 01:56:43 jsg Exp $
  
  STRIP=
  ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -36,8 +36,8 @@ STD_LIBS= -static-libgcc -static-libstdc++
+@@ -66,7 +66,7 @@ CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAud
+ CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet
+ else
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
++CLIENT_LIBS= `pkg-config --libs libenet` -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
  endif
- CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
- else	
--CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
-+CLIENT_LIBS= `pkg-config --libs libenet` `sdl-config --libs` -lX11 -lSDL_image -lSDL_mixer -lz -lGL
  endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
-@@ -106,7 +106,7 @@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WIN
+ ifeq ($(PLATFORM),LINUX)
+@@ -141,7 +141,7 @@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WIN
  MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
  else
  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
--SERVER_LIBS= -Lenet/.libs -lenet -lz
+-SERVER_LIBS= -Lenet -lenet -lz
 +SERVER_LIBS= `pkg-config --libs libenet` -lz
  MASTER_LIBS= $(SERVER_LIBS)
  endif
  SERVER_OBJS= \
-@@ -176,13 +176,13 @@ master: $(MASTER_OBJS)
+@@ -200,16 +200,16 @@ master: $(MASTER_OBJS)
  
  install: all
  else
 -client:	libenet $(CLIENT_OBJS)
 +client:	$(CLIENT_OBJS)
  	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+ 	install_name_tool -add_rpath @executable_path/../Frameworks sauer_client
+ endif
  
 -server:	libenet $(SERVER_OBJS)
 +server:	$(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
- 	
+ 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
+ 
 -master: libenet $(MASTER_OBJS)
 +master: $(MASTER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
+ 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
  
  shared/cube2font.o: shared/cube2font.c

games/sauerbraten/patches/patch-engine_serverbrowser_cpp

@@ -1,7 +1,8 @@
-$OpenBSD: patch-engine_serverbrowser_cpp,v 1.1 2015/04/11 13:49:14 jsg Exp $
---- engine/serverbrowser.cpp.orig	Sat Apr 11 22:52:25 2015
-+++ engine/serverbrowser.cpp	Sat Apr 11 22:52:45 2015
-@@ -39,12 +39,10 @@ int resolverloop(void * data)
+$OpenBSD: patch-engine_serverbrowser_cpp,v 1.2 2021/02/16 00:25:37 jsg Exp $
+Index: engine/serverbrowser.cpp
+--- engine/serverbrowser.cpp.orig
++++ engine/serverbrowser.cpp
+@@ -38,12 +38,10 @@ int resolverloop(void * data)
          while(resolverqueries.empty()) SDL_CondWait(querycond, resolvermutex);
          rt->query = resolverqueries.pop();
          rt->starttime = totalmillis;