From 2e9f991a4efa9c614402dab0ad1d75d25b338e46 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 4 Aug 2014 19:23:26 +0000
Subject: [PATCH] libpng: bump version

* remove old 1.6 recipes.
---
 ...png-1.6.10.recipe => libpng-1.6.12.recipe} | 17 ++--
 media-libs/libpng/libpng-1.6.8.recipe         | 81 -------------------
 2 files changed, 7 insertions(+), 91 deletions(-)
 rename media-libs/libpng/{libpng-1.6.10.recipe => libpng-1.6.12.recipe} (80%)
 delete mode 100644 media-libs/libpng/libpng-1.6.8.recipe

diff --git a/media-libs/libpng/libpng-1.6.10.recipe b/media-libs/libpng/libpng-1.6.12.recipe
similarity index 80%
rename from media-libs/libpng/libpng-1.6.10.recipe
rename to media-libs/libpng/libpng-1.6.12.recipe
index 5168fa134..195712d20 100644
--- a/media-libs/libpng/libpng-1.6.10.recipe
+++ b/media-libs/libpng/libpng-1.6.12.recipe
@@ -5,21 +5,21 @@ features, is extensible, and has been extensively tested for over 17 years
 "
 HOMEPAGE="http://www.libpng.org"
 COPYRIGHT="
-	1998-2013 Glenn Randers-Pehrson
+	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="b0206a22b49c91fc5521b2cfb1c251433a37aed0a645bc504ab3d061f27e4d51"
+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.10.0 compat >= 16
-	lib:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
+	lib:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
+	lib:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
@@ -41,10 +41,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	aclocal
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
+	autoreconf -f -i
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -71,8 +68,8 @@ PROVIDES_devel="
 	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.10.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
+	devel:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
+	devel:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
 	"
 REQUIRES_devel="
 	libpng$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libpng/libpng-1.6.8.recipe b/media-libs/libpng/libpng-1.6.8.recipe
deleted file mode 100644
index f5a0d382e..000000000
--- a/media-libs/libpng/libpng-1.6.8.recipe
+++ /dev/null
@@ -1,81 +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-2013 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-1.6.8.tar.gz"
-CHECKSUM_SHA256="32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libpng$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libpng$secondaryArchSuffix = 16.8.0 compat >= 16
-	lib:libpng16$secondaryArchSuffix = 16.8.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()
-{
-	aclocal
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	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.8.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.8.0 compat >= 16
-	"
-REQUIRES_devel="
-	libpng$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libz$secondaryArchSuffix
-	"