From 521be40c0b2bf5d54255f8975a4193b7d5b9cbdd Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 2 Jun 2016 08:39:12 +0000
Subject: [PATCH] libpng: tune CONFLICTS_devel; cosmetic changes. (#618)

* libpng16: CONFLICTS_devel += libpng12_devel.
* libpng12: CONFLICTS_devel = libpng_devel + libpng16_devel.
* libpng: drop empty $manDir in the base package, libpng.
---
 media-libs/libpng/libpng-1.5.27.recipe   |  8 +++++---
 media-libs/libpng/libpng12-1.2.56.recipe | 22 +++++++++++++++++++---
 media-libs/libpng/libpng16-1.6.22.recipe |  5 +++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/media-libs/libpng/libpng-1.5.27.recipe b/media-libs/libpng/libpng-1.5.27.recipe
index 40f7edb33..0ae43b1ff 100644
--- a/media-libs/libpng/libpng-1.5.27.recipe
+++ b/media-libs/libpng/libpng-1.5.27.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="1998-2016 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
 CHECKSUM_SHA256="fa934f6ef7474889d408c66e26260b8dd34a048a239bff72372350425767d44b"
 
@@ -44,7 +44,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -70,7 +70,7 @@ INSTALL()
 		maybe_manDir_man3=$manDir/man3
 	else
 		maybe_manDir_man3=
-		rm -rf $manDir
+		rm -rf $manDir/man3
 	fi
 
 	# devel package
@@ -78,6 +78,8 @@ INSTALL()
 		$binDir \
 		$developDir \
 		$maybe_manDir_man3
+
+	rmdir $manDir
 }
 
 TEST()
diff --git a/media-libs/libpng/libpng12-1.2.56.recipe b/media-libs/libpng/libpng12-1.2.56.recipe
index 026f8fa4e..bb2cd72c2 100644
--- a/media-libs/libpng/libpng12-1.2.56.recipe
+++ b/media-libs/libpng/libpng12-1.2.56.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="1998-2015 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
 CHECKSUM_SHA256="0366f932883084a6972efa8eadfaa5584e94a7c9c8682a49590759951518801f"
 SOURCE_DIR="libpng-$portVersion"
@@ -39,6 +39,10 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libpng12$secondaryArchSuffix == $portVersion base
 	"
+CONFLICTS_devel="
+	libpng${secondaryArchSuffix}_devel
+	libpng16${secondaryArchSuffix}_devel
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -50,7 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -70,9 +74,21 @@ INSTALL()
 	prepareInstalledDevelLibs libpng libpng12
 	fixPkgconfig
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		maybe_manDir_man3=$manDir/man3
+	else
+		maybe_manDir_man3=
+		rm -rf $manDir
+	fi
+
 	# devel package
 	packageEntries devel \
 		$binDir \
 		$developDir \
-		$manDir/man3
+		$maybe_manDir_man3
+}
+
+TEST()
+{
+	make check
 }
diff --git a/media-libs/libpng/libpng16-1.6.22.recipe b/media-libs/libpng/libpng16-1.6.22.recipe
index 607d8414f..f4646ddcd 100644
--- a/media-libs/libpng/libpng16-1.6.22.recipe
+++ b/media-libs/libpng/libpng16-1.6.22.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="1998-2016 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42, Inc."
 LICENSE="LibPNG"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://downloads.sf.net/libpng/libpng-$portVersion.tar.gz"
 CHECKSUM_SHA256="7944056621477eca2eba31cf1e99fa484721216a8af03c124426fccb37665df9"
 SOURCE_DIR="libpng-$portVersion"
@@ -39,6 +39,7 @@ REQUIRES_devel="
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_devel="
+	libpng12${secondaryArchSuffix}_devel
 	libpng${secondaryArchSuffix}_devel
 	"
 
@@ -52,7 +53,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool >= 2.4.2
+	cmd:libtoolize$secondaryArchSuffix >= 2.4.2
 	cmd:make
 	"