- Fix build with clang

3 files changed, 28 insertions, 6 deletions

diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 9dda7383c6cd..245ef9dcb19e 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -26,16 +26,16 @@ CONFIGURE_ARGS=	--with-icondir="${PREFIX}/share/pixmaps"
 
 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|' \
diff --git a/games/zaz/files/patch-src-mixer.cpp b/games/zaz/files/patch-src-mixer.cpp
new file mode 100644
index 000000000000..bd74776c24d4
--- /dev/null
+++ b/games/zaz/files/patch-src-mixer.cpp
@@ -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();
diff --git a/games/zaz/files/patch-src-mixer.h b/games/zaz/files/patch-src-mixer.h
new file mode 100644
index 000000000000..42e1f11a9e2c
--- /dev/null
+++ b/games/zaz/files/patch-src-mixer.h
@@ -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();