diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile index 665d3b38940..85c16045782 100644 --- a/games/ioquake3/Makefile +++ b/games/ioquake3/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.21 2018/03/15 00:36:21 abieber Exp $ +# $OpenBSD: Makefile,v 1.22 2018/04/16 13:12:22 abieber Exp $ BROKEN-i386= need to free up a register ONLY_FOR_ARCHS= amd64 i386 COMMENT= clone of the original Quake III Arena -DISTNAME= ioquake3-2018.03.14 +DISTNAME= ioquake3-2018.04.13 GH_ACCOUNT= ioquake GH_PROJECT= ioq3 -GH_COMMIT= af6b1f8edf07f194233f6ad378e6691fe60a1105 +GH_COMMIT= 3377f9981a5c9a245422d6a1531f66fceb333f77 CATEGORIES= games @@ -33,8 +33,6 @@ ALL_TARGET= "release" USE_GMAKE= Yes NO_TEST= Yes -CFLAGS+= -pthread -g - QUAKE_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/} SUBST_VARS+= QUAKE_ARCH diff --git a/games/ioquake3/distinfo b/games/ioquake3/distinfo index b4544d1e84f..8ca4a50b6ef 100644 --- a/games/ioquake3/distinfo +++ b/games/ioquake3/distinfo @@ -1,2 +1,2 @@ -SHA256 (ioquake3-2018.03.14-af6b1f8e.tar.gz) = NY7T3iAPDzPIzOUppT3n8A7kj+MyWRZZI/+LwabEkAY= -SIZE (ioquake3-2018.03.14-af6b1f8e.tar.gz) = 11556488 +SHA256 (ioquake3-2018.04.13-3377f998.tar.gz) = U7lZ7KDrxn5b1c7whM6qCxER5/qGJWBx0Ujg2xpMz7s= +SIZE (ioquake3-2018.04.13-3377f998.tar.gz) = 11585781 diff --git a/games/ioquake3/patches/patch-Makefile b/games/ioquake3/patches/patch-Makefile index bb81100bf6a..96d091d06ab 100644 --- a/games/ioquake3/patches/patch-Makefile +++ b/games/ioquake3/patches/patch-Makefile @@ -1,9 +1,29 @@ -$OpenBSD: patch-Makefile,v 1.1 2017/05/26 10:36:44 mestre Exp $ +$OpenBSD: patch-Makefile,v 1.2 2018/04/16 13:12:22 abieber Exp $ Index: Makefile --- Makefile.orig +++ Makefile -@@ -1474,7 +1474,6 @@ Q3CPPOBJ = \ +@@ -743,16 +743,16 @@ ifeq ($(PLATFORM),openbsd) + -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + CLIENT_CFLAGS += $(SDL_CFLAGS) + +- OPTIMIZEVM = -O3 ++ OPTIMIZEVM = + OPTIMIZE = $(OPTIMIZEVM) -ffast-math + + ifeq ($(ARCH),x86_64) +- OPTIMIZEVM = -O3 ++ OPTIMIZEVM = + OPTIMIZE = $(OPTIMIZEVM) -ffast-math + HAVE_VM_COMPILED = true + else + ifeq ($(ARCH),x86) +- OPTIMIZEVM = -O3 -march=i586 ++ OPTIMIZEVM = -march=i586 + OPTIMIZE = $(OPTIMIZEVM) -ffast-math + HAVE_VM_COMPILED=true + else +@@ -1525,7 +1525,6 @@ Q3CPPOBJ = \ $(B)/tools/cpp/eval.o \ $(B)/tools/cpp/include.o \ $(B)/tools/cpp/hideset.o \