From 7e01e858d5f12c305b602e71319052901d166930 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 7 Feb 2016 20:47:40 +0100
Subject: [PATCH] =?UTF-8?q?optipng:=200.7.4=E2=86=920.7.5=20(bump=20versio?=
 =?UTF-8?q?n=20&=20reformat=20recipe)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ipng-0.7.4.recipe => optipng-0.7.5.recipe} | 22 ++++-----
 .../optipng/patches/optipng-0.7.4.patchset    | 45 -------------------
 .../optipng/patches/optipng-0.7.5.patchset    | 24 ++++++++++
 3 files changed, 33 insertions(+), 58 deletions(-)
 rename media-gfx/optipng/{optipng-0.7.4.recipe => optipng-0.7.5.recipe} (56%)
 delete mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patchset
 create mode 100644 media-gfx/optipng/patches/optipng-0.7.5.patchset

diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.5.recipe
similarity index 56%
rename from media-gfx/optipng/optipng-0.7.4.recipe
rename to media-gfx/optipng/optipng-0.7.5.recipe
index c7783d387..5c91616b3 100644
--- a/media-gfx/optipng/optipng-0.7.4.recipe
+++ b/media-gfx/optipng/optipng-0.7.5.recipe
@@ -1,22 +1,21 @@
 SUMMARY="A PNG optimizer, making PNG files smaller"
-DESCRIPTION="
-OptiPNG is a PNG optimizer, recompressing PNG files so they become smaller, \
-without losing any information. Additionally, OptiPNG can convert other image \
-formats, such as BMP, GIF, PNM and TIFF, to PNG files.
-"
+DESCRIPTION="OptiPNG is a PNG optimizer, recompressing PNG files so they \
+become smaller, without losing any information. Additionally, OptiPNG can \
+convert other image formats, such as BMP, GIF, PNM and TIFF, to PNG files."
 HOMEPAGE="http://optipng.sourceforge.net/"
-SOURCE_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz"
-CHECKSUM_SHA256="520b5d5a9405dbdc5c905dd0cff87211e69c4ed2059744037510e613fe8237ff"
+COPYRIGHT="2001-2014 Cosmin Truta"
 LICENSE="Zlib"
-COPYRIGHT="2001-2012 Cosmin Truta"
-REVISION="2"
+REVISION="1"
+SOURCE_URI="http://downloads.sf.net/optipng/optipng-$portVersion.tar.gz"
+CHECKSUM_SHA256="74e54b798b012dff8993fb8d90185ca83f18cfa4935f4a93b0bcfc33c849619d"
+PATCHES="optipng-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	optipng$secondaryArchSuffix = $portVersion
 	cmd:optipng$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libpng
@@ -28,7 +27,6 @@ BUILD_REQUIRES="
 	devel:libpng
 	devel:libz
 	"
-
 BUILD_PREREQUIRES="
 	cmd:ar
 	cmd:gcc$secondaryArchSuffix
@@ -36,8 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:ranlib
 	"
 
-PATCHES="optipng-0.7.4.patchset"
-
 BUILD()
 {
 	./configure -bindir=$binDir -mandir=$manDir \
diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patchset b/media-gfx/optipng/patches/optipng-0.7.4.patchset
deleted file mode 100644
index aeb75492f..000000000
--- a/media-gfx/optipng/patches/optipng-0.7.4.patchset
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9aeb37585d609791981ff00956a99d54a9bf446e Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 23 Dec 2013 12:13:23 -0700
-Subject: applying patch optipng-0.7.4.patch
-
-
-diff --git a/configure b/configure
-index 5437b74..f7087fe 100755
---- a/configure
-+++ b/configure
-@@ -305,7 +305,7 @@ sed_config="
-     s#@ARFLAGS@#${ARFLAGS-cru}#g
-     s#@RANLIB@#${RANLIB-ranlib}#g
-     s#@LIBS@#${LIBS-}#g
--    s#@LIBM@#${LIBM--lm}#g
-+    s#@LIBM@#${LIBM-}#g
-     s#@LIBZ@#${LIBZ--lz}#g
-     s#@LIBPNG@#${LIBPNG--lpng}#g
-     s#@DIFF@#${DIFF-diff -b -u}#g
--- 
-1.8.3.4
-
-
-From 02727f980a432201225b91c51f7f76fad3d12cca Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 23 Dec 2013 12:16:17 -0700
-Subject: Remove Wextra from CFLAGS to make gcc2 happy
-
-
-diff --git a/configure b/configure
-index f7087fe..f3bca47 100755
---- a/configure
-+++ b/configure
-@@ -192,7 +192,7 @@ rm -f $test.c $test.o
- if test $gccish -ne 0
- then
-     CC="${CC-$cc}"
--    CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
-+    CFLAGS="${CFLAGS--O2 -Wall}"
- else
-     CC="${CC-cc}"
-     CFLAGS="${CFLAGS--O}"
--- 
-1.8.3.4
-
diff --git a/media-gfx/optipng/patches/optipng-0.7.5.patchset b/media-gfx/optipng/patches/optipng-0.7.5.patchset
new file mode 100644
index 000000000..b45d99218
--- /dev/null
+++ b/media-gfx/optipng/patches/optipng-0.7.5.patchset
@@ -0,0 +1,24 @@
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 23 Dec 2013 12:13:23 -0700
+Subject: applying patch optipng-0.7.5.patch
+
+--- optipng-0.7.5/configure	2014-03-24 10:45:00.000000000 +0000
++++ optipng-0.7.5-haiku/configure
+@@ -183,7 +183,7 @@ rm -f $test.c $test.o
+ if test "$gccish" -ne 0
+ then
+     CC="${CC-$cc}"
+-    CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
++    CFLAGS="${CFLAGS--O2 -Wall}"
+ else
+     CC="${CC-cc}"
+     CFLAGS="${CFLAGS--O}"
+@@ -397,7 +397,7 @@ sed_config="
+     s|@ARFLAGS@|${ARFLAGS-cru}|g
+     s|@RANLIB@|${RANLIB-ranlib}|g
+     s|@LIBS@|${LIBS-}|g
+-    s|@LIBM@|${LIBM--lm}|g
++    s|@LIBM@|${LIBM-}|g
+     s|@LIBZ@|${LIBZ--lz}|g
+     s|@LIBPNG@|${LIBPNG--lpng}|g
+     s|@DIFF@|${DIFF-diff -b -u}|g