From f71dc78fae4095af9aef7958b38fd5bb424a08b7 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 18 Apr 2018 13:26:00 +0000
Subject: [PATCH] libpng12: bump to 1.2.59, add debuginfo, move man5 to devel.
 (#2460)

---
 ...2-1.2.57.recipe => libpng12-1.2.59.recipe} | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)
 rename media-libs/libpng/{libpng12-1.2.57.recipe => libpng12-1.2.59.recipe} (60%)

diff --git a/media-libs/libpng/libpng12-1.2.57.recipe b/media-libs/libpng/libpng12-1.2.59.recipe
similarity index 60%
rename from media-libs/libpng/libpng12-1.2.57.recipe
rename to media-libs/libpng/libpng12-1.2.59.recipe
index 676ca28e2..73e306446 100644
--- a/media-libs/libpng/libpng12-1.2.57.recipe
+++ b/media-libs/libpng/libpng12-1.2.59.recipe
@@ -7,13 +7,13 @@ This is libpng 1.2, an older version which may be needed for compatibility \
 with BeOS application. For new developments please use the current libpng \
 package."
 HOMEPAGE="http://www.libpng.org/"
-COPYRIGHT="1998-2016 Glenn Randers-Pehrson
+COPYRIGHT="1998-2017 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
 REVISION="1"
-SOURCE_URI="http://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="09ec37869fc5b130f5eb06ffb9bf949796e8d2d78e0788f78ab1c78624c6e9da"
+SOURCE_URI="https://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
+CHECKSUM_SHA256="4bd4b5ce04ce634c281ae76174714fa02b053b573ac2181c985db06aa57e1e9e"
 SOURCE_DIR="libpng-$portVersion"
 
 ARCHITECTURES="x86_gcc2"
@@ -21,11 +21,18 @@ SECONDARY_ARCHITECTURES="x86_gcc2"
 
 # define libVersion as 3.z.0 when portVersion is 1.2.z.
 libVersion="3.${portVersion#1\.2\.}.0"
+libVersionCompat="$libVersion compat >= 3"
+
+# define lib12Version as 0.z.0 when portVersion is 1.2.z.
+lib12Version="0.${portVersion#1\.2\.}.0"
+lib12VersionCompat="$lib12Version compat >= 0"
+
+portVersionCompat="$portVersion compat >= 1.2"
 
 PROVIDES="
-	libpng12$secondaryArchSuffix = $portVersion compat >= 1.2
-	lib:libpng$secondaryArchSuffix = $libVersion compat >= 3
-	lib:libpng12$secondaryArchSuffix = $libVersion compat >= 3
+	libpng12$secondaryArchSuffix = $portVersionCompat
+	lib:libpng$secondaryArchSuffix = $libVersionCompat
+	lib:libpng12$secondaryArchSuffix = $lib12VersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,11 +40,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	devel:libpng$secondaryArchSuffix = $libVersion compat >= 3
-	devel:libpng12$secondaryArchSuffix = $libVersion compat >= 3
+	libpng12${secondaryArchSuffix}_devel = $portVersionCompat
+	cmd:libpng_config$secondaryArchSuffix = $portVersionCompat
+	cmd:libpng12_config$secondaryArchSuffix = $portVersionCompat
+	devel:libpng$secondaryArchSuffix = $libVersionCompat
+	devel:libpng12$secondaryArchSuffix = $lib12VersionCompat
 	"
 REQUIRES_devel="
 	libpng12$secondaryArchSuffix == $portVersion base
@@ -61,6 +68,10 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage libpng12$secondaryArchSuffix \
+	"$libDir"/libpng.so.$libVersion \
+	"$libDir"/libpng12.so.$lib12Version
+
 BUILD()
 {
 	aclocal
@@ -80,9 +91,9 @@ INSTALL()
 	fixPkgconfig
 
 	if [ -z "$secondaryArchSuffix" ]; then
-		maybe_manDir_man3=$manDir/man3
+		maybe_manDir=$manDir
 	else
-		maybe_manDir_man3=
+		maybe_manDir=
 		rm -rf $manDir
 	fi
 
@@ -90,7 +101,7 @@ INSTALL()
 	packageEntries devel \
 		$binDir \
 		$developDir \
-		$maybe_manDir_man3
+		$maybe_manDir
 }
 
 TEST()