- Update to 0.3.1

- WITHOUT_NLS was fixed
- Patches were merged upstream

5 files changed, 40 insertions, 80 deletions

diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index e1861f2c96f6..da63357d0907 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zaz
-PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTVERSION=	0.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -31,19 +30,19 @@ CONFIGURE_ARGS=	--with-icondir="${PREFIX}/share/pixmaps"
 PORTDOCS=	*
 
 # Unconditially disable NLS for now: the game segfaults with 8bit locales
-#.if !defined(WITHOUT_NLS)
-#USE_GETTEXT=	yes
-#PLIST_SUB+=	NLS=""
-#.else
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+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|' \
 		${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-zazdocDATA||' \
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docDATA||' \
 		${WRKSRC}/Makefile.in
 .endif
 
diff --git a/games/zaz/distinfo b/games/zaz/distinfo
index 6907d93b160b..a89488821955 100644
--- a/games/zaz/distinfo
+++ b/games/zaz/distinfo
@@ -1,3 +1,3 @@
-MD5 (zaz-0.3.0.tar.gz) = d0e625ee9b8d4823955686048ac69d0a
-SHA256 (zaz-0.3.0.tar.gz) = bd6b4c568f17740bbd6ef552b8355094e49ed873a0bf9e1bb74db1e6f80fa31d
-SIZE (zaz-0.3.0.tar.gz) = 49571511
+MD5 (zaz-0.3.1.tar.gz) = 534b78032dd888abe39f482b5707eb4f
+SHA256 (zaz-0.3.1.tar.gz) = 3b5b37b658fae5d7734d9cf1bd7e0b7142833e4ac0e921f0b4c5ab24d234af19
+SIZE (zaz-0.3.1.tar.gz) = 16930998
diff --git a/games/zaz/files/patch-src-common.h b/games/zaz/files/patch-src-common.h
deleted file mode 100644
index 705620aeaf4e..000000000000
--- a/games/zaz/files/patch-src-common.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common.h.orig	2009-08-21 02:53:16.000000000 +0400
-+++ src/common.h	2009-08-25 19:01:52.000000000 +0400
-@@ -26,11 +26,12 @@
- #ifdef WIN32
- #include <windows.h>
- #include <direct.h>
--typedef unsigned int uint;
--typedef unsigned long ulong;
- #pragma warning(disable:4996)
- #endif
- 
-+typedef unsigned int uint;
-+typedef unsigned long ulong;
-+
- #include <cmath>
- #include <cstdio>
- #include <cstdlib>
diff --git a/games/zaz/files/patch-src-lineeditor.cpp b/games/zaz/files/patch-src-lineeditor.cpp
deleted file mode 100644
index fb3b03d9a9f4..000000000000
--- a/games/zaz/files/patch-src-lineeditor.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/lineeditor.cpp.orig	2009-09-27 04:09:24.000000000 +0400
-+++ src/lineeditor.cpp	2009-10-10 03:52:38.000000000 +0400
-@@ -39,7 +39,8 @@
- {
-     SDL_EnableUNICODE(SDL_DISABLE);
- #ifndef WIN32
--    iconv_close(convdesc);
-+	if (convdesc != (iconv_t)(-1))
-+		iconv_close(convdesc);
- #endif
- }
- 
-@@ -161,7 +162,7 @@
-                 Uint16 uni = *i;
-                 size_t in_left = 2;
-                 size_t out_left = 2;
--                char *in_ptr = (char *)&uni;
-+                const char *in_ptr = (char *)&uni;
-                 char uc[3];
-                 char *out_ptr = uc;
- 
diff --git a/games/zaz/pkg-plist b/games/zaz/pkg-plist
index ea815117c43b..6460471ea991 100644
--- a/games/zaz/pkg-plist
+++ b/games/zaz/pkg-plist
@@ -1,20 +1,15 @@
 bin/zaz
 share/applications/zaz.desktop
+share/pixmaps/zaz.xpm
 %%NLS%%share/locale/de/LC_MESSAGES/zaz.mo
 %%NLS%%share/locale/es/LC_MESSAGES/zaz.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/zaz.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/zaz.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/zaz.mo
-share/pixmaps/zaz.xpm
 %%DATADIR%%/FreeMonoBold.ttf
 %%DATADIR%%/FreeSans.ttf
 %%DATADIR%%/balls1.png
 %%DATADIR%%/balls2.png
-%%DATADIR%%/balls3.png
-%%DATADIR%%/balls4.png
-%%DATADIR%%/balls5.png
-%%DATADIR%%/balls6.png
-%%DATADIR%%/balls7.png
-%%DATADIR%%/balls8.png
 %%DATADIR%%/bonus.ogg
 %%DATADIR%%/bonus1.png
 %%DATADIR%%/bonus2.png
@@ -22,50 +17,52 @@ share/pixmaps/zaz.xpm
 %%DATADIR%%/bonus4.png
 %%DATADIR%%/bonus5.png
 %%DATADIR%%/combo.ogg
+%%DATADIR%%/easy.set
 %%DATADIR%%/eliminate.ogg
 %%DATADIR%%/explosion.png
 %%DATADIR%%/extraball.ogg
 %%DATADIR%%/extralife.ogg
+%%DATADIR%%/failedlevel.ogg
 %%DATADIR%%/font1.ttf
 %%DATADIR%%/gpl3.png
+%%DATADIR%%/level1.jpg
 %%DATADIR%%/level1.lvl
-%%DATADIR%%/level1.png
+%%DATADIR%%/level10.jpg
 %%DATADIR%%/level10.lvl
-%%DATADIR%%/level10.png
-%%DATADIR%%/level10_thumb.png
+%%DATADIR%%/level10_thumb.jpg
+%%DATADIR%%/level11.jpg
 %%DATADIR%%/level11.lvl
-%%DATADIR%%/level11.png
-%%DATADIR%%/level11_thumb.png
+%%DATADIR%%/level11_thumb.jpg
+%%DATADIR%%/level12.jpg
 %%DATADIR%%/level12.lvl
-%%DATADIR%%/level12.png
 %%DATADIR%%/level12_overlay.png
-%%DATADIR%%/level12_thumb.png
-%%DATADIR%%/level1_thumb.png
+%%DATADIR%%/level12_thumb.jpg
+%%DATADIR%%/level1_thumb.jpg
+%%DATADIR%%/level2.jpg
 %%DATADIR%%/level2.lvl
-%%DATADIR%%/level2.png
-%%DATADIR%%/level2_thumb.png
+%%DATADIR%%/level2_thumb.jpg
+%%DATADIR%%/level3.jpg
 %%DATADIR%%/level3.lvl
-%%DATADIR%%/level3.png
-%%DATADIR%%/level3_thumb.png
+%%DATADIR%%/level3_thumb.jpg
+%%DATADIR%%/level4.jpg
 %%DATADIR%%/level4.lvl
-%%DATADIR%%/level4.png
-%%DATADIR%%/level4_thumb.png
+%%DATADIR%%/level4_thumb.jpg
+%%DATADIR%%/level5.jpg
 %%DATADIR%%/level5.lvl
-%%DATADIR%%/level5.png
-%%DATADIR%%/level5_thumb.png
+%%DATADIR%%/level5_thumb.jpg
+%%DATADIR%%/level6.jpg
 %%DATADIR%%/level6.lvl
-%%DATADIR%%/level6.png
-%%DATADIR%%/level6_thumb.png
+%%DATADIR%%/level6_thumb.jpg
+%%DATADIR%%/level7.jpg
 %%DATADIR%%/level7.lvl
-%%DATADIR%%/level7.png
-%%DATADIR%%/level7_thumb.png
+%%DATADIR%%/level7_thumb.jpg
+%%DATADIR%%/level8.jpg
 %%DATADIR%%/level8.lvl
-%%DATADIR%%/level8.png
-%%DATADIR%%/level8_thumb.png
+%%DATADIR%%/level8_thumb.jpg
+%%DATADIR%%/level9.jpg
 %%DATADIR%%/level9.lvl
-%%DATADIR%%/level9.png
 %%DATADIR%%/level9_overlay.png
-%%DATADIR%%/level9_thumb.png
+%%DATADIR%%/level9_thumb.jpg
 %%DATADIR%%/levels.list
 %%DATADIR%%/logo.png
 %%DATADIR%%/menu.lvl
@@ -73,8 +70,10 @@ share/pixmaps/zaz.xpm
 %%DATADIR%%/mus2.ogg
 %%DATADIR%%/mus3.ogg
 %%DATADIR%%/mus4.ogg
+%%DATADIR%%/newcolor.ogg
 %%DATADIR%%/ouch.ogg
 %%DATADIR%%/player.png
+%%DATADIR%%/pro.set
 %%DATADIR%%/pull.ogg
 %%DATADIR%%/push.ogg
 %%DATADIR%%/roll.ogg