libggz, fix build, switch to secondary architecture on 32bit, disable static library (#8050)

dev-games/libggz/libggz-0.99.5.recipe

@@ -7,39 +7,98 @@ debug (debugging)."
 HOMEPAGE="http://dev.ggzgamingzone.org/libraries/libggz/"
 COPYRIGHT="2003-2009 The GGZ Development Team"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-0.99.5.tar.gz"
 CHECKSUM_SHA256="b32dae84ea47db6dfb8dbae24fb20fcc71b958ea2d7efb9eff66c8e5c0db81b3"
 SOURCE_DIR="ggz-base-libs-snapshot-$portVersion"
+PATCHES="libggz-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersionGGZ="2.3.0"
+libVersionCompatGGZ="$libVersionGGZ compat >= ${libVersionGGZ%%.*}"
+libVersionGGZCORE="9.0.0"
+libVersionCompatGGZCORE="$libVersionGGZCORE compat >= ${libVersionGGZCORE%%.*}"
+libVersionGGZCORE="4.1.0"
+libVersionCompatGGZMOD="$libVersionGGZCORE compat >= ${libVersionGGZCORE%%.*}"
+
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/menus/applications-merged/ggz.merge.menu keep-old
+	settings/xdg/menus/ggz.menu keep-old
+	"
 
 PROVIDES="
-	libggz = $portVersion
-"
+	libggz$secondaryArchSuffix = $portVersion
+	lib:libggz$secondaryArchSuffix = $libVersionCompatGGZ
+	lib:libggzcore$secondaryArchSuffix = $libVersionCompatGGZCORE
+	lib:libggzmod$secondaryArchSuffix = $libVersionCompatGGZMOD
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libggz${secondaryArchSuffix}_devel = $portVersion
+	cmd:ggz_config$commandSuffix
+	devel:libggz$secondaryArchSuffix = $libVersionCompatGGZ
+	devel:libggzcore$secondaryArchSuffix = $libVersionCompatGGZCORE
+	devel:libggzmod$secondaryArchSuffix = $libVersionCompatGGZMOD
+	"
+REQUIRES_devel="
+	libggz$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix # for ggz_config
+	lib:libexpat$secondaryArchSuffix # for ggz_config
+	lib:libgcrypt$secondaryArchSuffix # for ggz_config
+	lib:libintl$secondaryArchSuffix # for ggz_config
+	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libintl
-"
+	haiku${secondaryArchSuffix}_devel
+	devel:libexpat$secondaryArchSuffix
+	devel:libgcrypt$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:libtoolize
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
-	libtoolize -fci
-	aclocal -I m4 -I m4/ggz
-	autoconf
-	runConfigure ./configure
+	autoreconf -fi
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--datarootdir=$dataDir \
+		--disable-static
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+
+	mkdir -p $dataDir
+	mv $prefix/share/locale $dataDir/
+	rmdir $prefix/share
+
+	prepareInstalledDevelLibs libggz libggzcore libggzmod
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$commandBinDir
 }

dev-games/libggz/patches/libggz-0.99.5.patch

@@ -5,8 +5,8 @@ diff -Naur ggz-base-libs-snapshot-0.99.5/ggzcore/netxml.c ggz-base-libs-snapshot
  #include <sys/types.h>
  #include <unistd.h>
  
-+#ifdef (__HAIKU__)
-+#include <sys/select.h>
++#ifdef __HAIKU__
++ #include <sys/select.h>
 +#endif
 +
 +