From owner-svn-ports-head@freebsd.org  Wed Sep 30 15:23:17 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58FD3A0C04C;
 Wed, 30 Sep 2015 15:23:17 +0000 (UTC)
 (envelope-from novel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A1B11833;
 Wed, 30 Sep 2015 15:23:17 +0000 (UTC)
 (envelope-from novel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8UFNH5r055107;
 Wed, 30 Sep 2015 15:23:17 GMT (envelope-from novel@FreeBSD.org)
Received: (from novel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8UFNHqc055105;
 Wed, 30 Sep 2015 15:23:17 GMT (envelope-from novel@FreeBSD.org)
Message-Id: <201509301523.t8UFNHqc055105@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: novel set sender to
 novel@FreeBSD.org using -f
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Wed, 30 Sep 2015 15:23:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398219 - head/games/openarena/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2015 15:23:17 -0000

Author: novel
Date: Wed Sep 30 15:23:16 2015
New Revision: 398219
URL: https://svnweb.freebsd.org/changeset/ports/398219

Log:
  Fix build when system libspeex is installed
  
  The fix is identical to ioquake3 fix in r398218.

Modified:
  head/games/openarena/files/patch-Makefile

Modified: head/games/openarena/files/patch-Makefile
==============================================================================
--- head/games/openarena/files/patch-Makefile	Wed Sep 30 15:18:06 2015	(r398218)
+++ head/games/openarena/files/patch-Makefile	Wed Sep 30 15:23:16 2015	(r398219)
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-12-12 23:48:49.000000000 +0100
-+++ Makefile	2012-03-07 23:00:53.000000000 +0100
+--- Makefile.orig	2011-12-13 02:48:49.000000000 +0400
++++ Makefile	2015-09-30 17:16:31.951089000 +0300
 @@ -205,6 +205,8 @@
      OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
      SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
@@ -59,3 +59,12 @@
    endif
  
    # cross-compiling tweaks
+@@ -897,7 +902,7 @@
+   CLIENT_CFLAGS += -DUSE_VOIP
+   SERVER_CFLAGS += -DUSE_VOIP
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+-    CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
++    CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
+   else
+     CLIENT_LIBS += -lspeex -lspeexdsp
+   endif