From d30b625ce052eed42c512b7cffadc52cebd16a58 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 13 Sep 2018 10:37:53 +0200
Subject: [PATCH] zaz, fix recipe, cleanup (#3042)

* zaz, fix recipe, cleanup

* zaz,fix trailing whitespace
---
 games-puzzle/zaz/patches/zaz-1.0.0.patchset | 43 +++++++++++++++----
 games-puzzle/zaz/zaz-1.0.0.recipe           | 47 +++++++++------------
 2 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/games-puzzle/zaz/patches/zaz-1.0.0.patchset b/games-puzzle/zaz/patches/zaz-1.0.0.patchset
index 45b08abe8..8028fd2aa 100644
--- a/games-puzzle/zaz/patches/zaz-1.0.0.patchset
+++ b/games-puzzle/zaz/patches/zaz-1.0.0.patchset
@@ -1,4 +1,4 @@
-From 51dd25b58ac5d4d82363d24707087f68e97505c8 Mon Sep 17 00:00:00 2001
+From c4536b1bccaa26175ac6f8a482c4ab50baa86cdd Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 12 Nov 2015 22:10:00 +0100
 Subject: Fix detection of freetype.
@@ -39,10 +39,10 @@ index 0028693..83e4dd6 100644
 +zaz_LDADD = $(ZAZ_LIBS) $(FTGL_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) @LIBINTL@
  
 -- 
-2.7.0
+2.19.0
 
 
-From ba691e12784d6fbb2d3bdafdb2c49ee48a1c66a9 Mon Sep 17 00:00:00 2001
+From 027a2efbf8b1f4ced9dd2c59c8919a3a335a7557 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 12 Nov 2015 22:10:15 +0100
 Subject: Fix line endings.
@@ -109,10 +109,10 @@ index ff1c002..9334aa3 100755
      {
          WideCharToMultiByte(CP_UTF8, 0, pthname, -1, shrt, MAX_PATH, NULL, NULL);
 -- 
-2.7.0
+2.19.0
 
 
-From 4a7da1976fcaf80687dce6350046dd9c4c13a4a8 Mon Sep 17 00:00:00 2001
+From 0b020e2d7487cdabff8ff537a979ed097dffd150 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 24 Jan 2016 17:23:59 +0100
 Subject: gcc2 hacks.
@@ -196,10 +196,10 @@ index 9334aa3..016c029 100755
          }
      }
 -- 
-2.7.0
+2.19.0
 
 
-From daf0cab3fbd760a3a379523ab8d770bb41608b1d Mon Sep 17 00:00:00 2001
+From edcc50f3cf660a681e9c5c10d135a779f8417192 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 24 Jan 2016 17:38:11 +0100
 Subject: Look for libvorbis.
@@ -219,5 +219,32 @@ index 93ed5de..89f85c2 100644
  PKG_CHECK_MODULES(FREETYPE, freetype2)
  
 -- 
-2.7.0
+2.19.0
+
+
+From d655f7a68e10e53d278df2d01c25ecf1f8414f5f Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 12 Sep 2018 09:20:36 +0200
+Subject: Haiku doesn't have d_type/DT_REG
+
+
+diff --git a/src/directorylister.cpp b/src/directorylister.cpp
+index 90ef132..7282582 100644
+--- a/src/directorylister.cpp
++++ b/src/directorylister.cpp
+@@ -34,8 +34,10 @@ vector<string> ListFiles(string dir, const string extension)
+     {
+         bool isFile = false;
+ 
+-        if (file->d_type == DT_REG)
+-            isFile = true;
++        #ifndef __HAIKU__ // Haiku doesn't have d_type
++            if (file->d_type == DT_REG)
++                isFile = true;
++        #endif //__HAIKU__
+ 
+         if (!isFile)
+         { // do additional test
+-- 
+2.19.0
 
diff --git a/games-puzzle/zaz/zaz-1.0.0.recipe b/games-puzzle/zaz/zaz-1.0.0.recipe
index cd58fb773..f635cfd5a 100644
--- a/games-puzzle/zaz/zaz-1.0.0.recipe
+++ b/games-puzzle/zaz/zaz-1.0.0.recipe
@@ -9,19 +9,20 @@ other games of this type are that the balls have to be picked from the path \
 But one thing makes this game stand out most from it's predecessors - it's \
 free as in freedom ! You are free to download it, free to play it, free to \
 modify, love and hate it."
-HOMEPAGE="http://zaz.sourceforge.net" 
-SOURCE_URI="http://sourceforge.net/projects/zaz/files/zaz-$portVersion.tar.bz2"
-CHECKSUM_SHA256="e332cc1a6559e18a2b632940c53d20e2f2d2b583ba9dc1fd02a586437f9f0397"
-PATCHES="zaz$portVersion.patchset"
+HOMEPAGE="http://zaz.sourceforge.net"
+COPYRIGHT="2009-2010 Remigiusz Dybka, Leonard Ritter and Kinga Dybka"
+LICENSE="GNU GPL v3"
 REVISION="1"
+SOURCE_URI="https://sourceforge.net/projects/zaz/files/zaz-$portVersion.tar.bz2"
+CHECKSUM_SHA256="e332cc1a6559e18a2b632940c53d20e2f2d2b583ba9dc1fd02a586437f9f0397"
+PATCHES="zaz-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 ?x86 !x86_64"
 
 PROVIDES="
 	zaz = $portVersion
 	cmd:zaz
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libSDL_1.2
@@ -36,7 +37,7 @@ REQUIRES="
 	lib:libGL
 	lib:libvorbisenc
 	lib:libSDL_image_1.2
-"
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
@@ -48,42 +49,34 @@ BUILD_REQUIRES="
 	devel:libtheoradec
 	devel:libtheoraenc
 	devel:libvorbisfile
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
+	cmd:autoheader
 	cmd:automake
+	cmd:autoreconf
 	cmd:awk
 	cmd:find
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config
-"
+	"
 
-DEPEND="
-        media-libs/sdl-image >= 1.2.10
-"
-
-BUILD() {
-	# Gettextize wants the user to press enter after running it, remove that
-	# "feature" from it...
+BUILD()
+{
+#	Gettextize wants the user to press enter after running it, remove that
+#	"feature" from it...
 	grep -v '/dev/tty' < /bin/gettextize > gettextize
 	chmod +x gettextize
 
-#libtoolize --force --copy --install
-	automake --add-missing
-	aclocal
+	autoreconf -vfi
 	./gettextize -f
-	autoconf
-	automake
 	runConfigure ./configure
 	make $jobArgs
 }
 
-INSTALL() {
+INSTALL()
+{
 	make install
 }
-
-COPYRIGHT="2009-2010 Remigiusz Dybka, Leonard Ritter and Kinga Dybka"
-LICENSE="GNU GPL v3"