From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 28 04:10:42 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0C69E71F;
 Wed, 28 Aug 2013 04:10:42 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D50F027A1;
 Wed, 28 Aug 2013 04:10:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S4AfQI006933;
 Wed, 28 Aug 2013 04:10:41 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7S4AfYE006923;
 Wed, 28 Aug 2013 04:10:41 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201308280410.r7S4AfYE006923@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 28 Aug 2013 04:10:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r325502 - in head/games/zaz: . 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 04:10:42 -0000

Author: amdmi3
Date: Wed Aug 28 04:10:40 2013
New Revision: 325502
URL: http://svnweb.freebsd.org/changeset/ports/325502

Log:
  - Fix build with clang

Added:
  head/games/zaz/files/
  head/games/zaz/files/patch-src-mixer.cpp   (contents, props changed)
  head/games/zaz/files/patch-src-mixer.h   (contents, props changed)
Modified:
  head/games/zaz/Makefile

Modified: head/games/zaz/Makefile
==============================================================================
--- head/games/zaz/Makefile	Wed Aug 28 04:10:32 2013	(r325501)
+++ head/games/zaz/Makefile	Wed Aug 28 04:10:40 2013	(r325502)
@@ -26,16 +26,16 @@ CONFIGURE_ARGS=	--with-icondir="${PREFIX
 
 PORTDOCS=	*
 
-# Unconditially disable NLS for now: the game segfaults with 8bit locales
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+# Unconditially disable NLS for now: the game segfaults with 8bit locales
+#.if ${PORT_OPTIONS:MNLS}
+#USES+=		gettext
+#PLIST_SUB+=	NLS=""
+#.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.endif
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^zazdocdir =/ s|$${prefix}/doc|$${prefix}/share/doc|' \

Added: head/games/zaz/files/patch-src-mixer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/zaz/files/patch-src-mixer.cpp	Wed Aug 28 04:10:40 2013	(r325502)
@@ -0,0 +1,11 @@
+--- src/mixer.cpp.orig	2010-01-31 06:55:48.000000000 +0300
++++ src/mixer.cpp	2013-08-28 03:29:50.975228551 +0400
+@@ -23,7 +23,7 @@
+ 
+ namespace Scenes
+ {
+-Mixer::Mixer(MixerMode mmode = Realtime)
++Mixer::Mixer(MixerMode mmode)
+         : mode(mmode), isPlaying(false)
+ {
+     mut_disposeList = SDL_CreateMutex();

Added: head/games/zaz/files/patch-src-mixer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/zaz/files/patch-src-mixer.h	Wed Aug 28 04:10:40 2013	(r325502)
@@ -0,0 +1,11 @@
+--- src/mixer.h.orig	2010-05-12 00:21:41.000000000 +0400
++++ src/mixer.h	2013-08-28 03:29:59.607226307 +0400
+@@ -46,7 +46,7 @@
+     bool audioHWInitialized;
+ 
+ public:
+-    Mixer(MixerMode mmode);
++    Mixer(MixerMode mmode = Realtime);
+     ~Mixer();
+     void Play();
+     void Pause();