gifsicle, bump to 1.96 (#12450)

media-gfx/gifsicle/gifsicle-1.96.recipe

@@ -10,27 +10,36 @@ COPYRIGHT="1997-2018 Eddie Kohler"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.lcdf.org/gifsicle/gifsicle-$portVersion.tar.gz"
-CHECKSUM_SHA256="4bc97005c0789620de75f89997d3c2f70758c72c61aa0a2ef04f7a671a2ff89b"
+CHECKSUM_SHA256="fd23d279681a6dfe3c15264e33f344045b3ba473da4d19f49e67a50994b077fb"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	gifsicle = $portVersion
-	cmd:gifdiff = $portVersion
-	cmd:gifsicle = $portVersion
+	gifsicle$secondaryArchSuffix = $portVersion
+	cmd:gifdiff$commandSuffix = $portVersion
+	cmd:gifsicle$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:awk
 	cmd:autoreconf
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:sed
@@ -44,12 +53,8 @@ PATCH()
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure
-	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-		# avoid undefined reference to __sync_add_and_fetch
-		# from function scale_image_threaded in src/xform.c
-		sed -i -e "/HAVE___SYNC_ADD_AND_FETCH/ s/1/0/" config.h
-	fi
+	runConfigure --omit-dirs "binDir" ./configure \
+		--bindir=$commandBinDir
 	make
 }