From a9a35a5ebafdd34ff30571a266732ae927ff50f7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Nov 2014 19:09:20 +0000
Subject: [PATCH] libpng: renamed the 1.6 recipe to libpng16.

* can be installed next to the 1.5 one.
* removed user documentation in the 1.5 package which conflicts with
the 1.6 user documentation.
* have 1.6 devel package conflicts with the 1.5 devel package.
---
 media-libs/libpng/libpng-1.5.12.recipe        |  4 +-
 media-libs/libpng/libpng-1.6.12.recipe        | 78 -------------------
 ...g-1.6.13.recipe => libpng16-1.6.13.recipe} | 10 ++-
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 media-libs/libpng/libpng-1.6.12.recipe
 rename media-libs/libpng/{libpng-1.6.13.recipe => libpng16-1.6.13.recipe} (87%)

diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe
index 1ad5e69c5..a4552a021 100644
--- a/media-libs/libpng/libpng-1.5.12.recipe
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz"
 CHECKSUM_SHA256="aae4c469f5f03e7c180708fc547335ad1e29854bfdda992196e9c39d2447e9f6"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -53,6 +53,8 @@ BUILD()
 INSTALL()
 {
 	make install
+	
+	rm -Rf $manDir/man5
 
 	prepareInstalledDevelLibs libpng libpng15
 	fixPkgconfig
diff --git a/media-libs/libpng/libpng-1.6.12.recipe b/media-libs/libpng/libpng-1.6.12.recipe
deleted file mode 100644
index 195712d20..000000000
--- a/media-libs/libpng/libpng-1.6.12.recipe
+++ /dev/null
@@ -1,78 +0,0 @@
-SUMMARY="Portable Network Graphics library"
-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-2014 Glenn Randers-Pehrson
-	1996-1997 Andreas Dilger
-	1995-1996 Guy Eric Schalnat, Group 42, Inc.
-	"
-LICENSE="LibPNG"
-SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="73bec855f265e86cf247c8e60069338bba7f16deade54b459b6465ffa86f7076"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libpng$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
-	lib:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libz$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libz$secondaryArchSuffix >= 1.0.4
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtool >= 2.4.2
-	cmd:make
-	"
-
-BUILD()
-{
-	autoreconf -f -i
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libpng libpng16
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$binDir \
-		$developDir \
-		$manDir/man3
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
-	devel:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
-	"
-REQUIRES_devel="
-	libpng$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libz$secondaryArchSuffix
-	"
diff --git a/media-libs/libpng/libpng-1.6.13.recipe b/media-libs/libpng/libpng16-1.6.13.recipe
similarity index 87%
rename from media-libs/libpng/libpng-1.6.13.recipe
rename to media-libs/libpng/libpng16-1.6.13.recipe
index d2b7766e4..39c15613a 100644
--- a/media-libs/libpng/libpng-1.6.13.recipe
+++ b/media-libs/libpng/libpng16-1.6.13.recipe
@@ -12,12 +12,13 @@ COPYRIGHT="
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
 CHECKSUM_SHA256="7cbeb2429a249464e8d529e955045e00d0a90637d25970a081258141630c8941"
+SOURCE_DIR="libpng-$portVersion"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libpng$secondaryArchSuffix = $portVersion compat >= 1.6
+	libpng16$secondaryArchSuffix = $portVersion compat >= 1.6
 	lib:libpng$secondaryArchSuffix = 16.13.0 compat >= 16
 	lib:libpng16$secondaryArchSuffix = 16.13.0 compat >= 16
 	"
@@ -63,7 +64,7 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	libpng16${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
 	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
@@ -72,7 +73,10 @@ PROVIDES_devel="
 	devel:libpng16$secondaryArchSuffix = 16.13.0 compat >= 16
 	"
 REQUIRES_devel="
-	libpng$secondaryArchSuffix == $portVersion base
+	libpng16$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libz$secondaryArchSuffix
 	"
+CONFLICTS_devel="
+	libpng${secondaryArchSuffix}_devel
+	"