From a0d05927d6522c657ccce0af96624bc0ac09ea61 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 17 Jul 2018 09:59:43 +0000
Subject: [PATCH] libpng16: bump to 1.6.35.

---
 ...6-1.6.34.recipe => libpng16-1.6.35.recipe} | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)
 rename media-libs/libpng/{libpng16-1.6.34.recipe => libpng16-1.6.35.recipe} (63%)

diff --git a/media-libs/libpng/libpng16-1.6.34.recipe b/media-libs/libpng/libpng16-1.6.35.recipe
similarity index 63%
rename from media-libs/libpng/libpng16-1.6.34.recipe
rename to media-libs/libpng/libpng16-1.6.35.recipe
index 6e43efccd..459c3056f 100644
--- a/media-libs/libpng/libpng16-1.6.34.recipe
+++ b/media-libs/libpng/libpng16-1.6.35.recipe
@@ -3,13 +3,13 @@ DESCRIPTION="libpng is the official PNG reference library. It supports almost \
 all PNG features, is extensible, and has been extensively tested for over 17 \
 years."
 HOMEPAGE="http://www.libpng.org/"
-COPYRIGHT="1998-2017 Glenn Randers-Pehrson
+COPYRIGHT="1998-2018 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42, Inc."
 LICENSE="LibPNG"
 REVISION="1"
-SOURCE_URI="http://downloads.sf.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="574623a4901a9969080ab4a2df9437026c8a87150dfd5c235e28c94b212964a7"
+SOURCE_URI="https://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
+CHECKSUM_SHA256="2b82ab3e996803b80bc73206857e826a155d3ebb374e8eb03a87a63c6f672cf7"
 SOURCE_DIR="libpng-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm ?ppc"
@@ -17,11 +17,13 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 # define libVersion as xy.z.0 when portVersion is x.y.z.
 libVersion="${portVersion/\./}.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 1.6"
 
 PROVIDES="
-	libpng16$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libpng$secondaryArchSuffix = $libVersion compat >= 16
-	lib:libpng16$secondaryArchSuffix = $libVersion compat >= 16
+	libpng16$secondaryArchSuffix = $portVersionCompat
+	lib:libpng$secondaryArchSuffix = $libVersionCompat
+	lib:libpng16$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -29,14 +31,14 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libpng16${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:pngcp$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
-	devel:libpng$secondaryArchSuffix = $libVersion compat >= 16
-	devel:libpng16$secondaryArchSuffix = $libVersion compat >= 16
+	libpng16${secondaryArchSuffix}_devel = $portVersionCompat
+	cmd:libpng_config$secondaryArchSuffix = $portVersionCompat
+	cmd:libpng16_config$secondaryArchSuffix = $portVersionCompat
+	cmd:pngcp$secondaryArchSuffix = $portVersionCompat
+	cmd:pngfix$secondaryArchSuffix = $portVersionCompat
+	cmd:png_fix_itxt$secondaryArchSuffix = $portVersionCompat
+	devel:libpng$secondaryArchSuffix = $libVersionCompat
+	devel:libpng16$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libpng16$secondaryArchSuffix == $portVersion base