From 2ee13dc205b3a846e61b6cedf845c6f4fe0f5dac Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 9 Jan 2014 00:10:43 -0800
Subject: [PATCH] Remove libpng-1.5.13 which hadn't been fully converted to a
 working recipe, and update libpng to 1.6.8

---
 media-libs/libpng/libpng-1.5.12.recipe |  2 +-
 media-libs/libpng/libpng-1.5.13.recipe | 33 -----------
 media-libs/libpng/libpng-1.6.8.recipe  | 81 ++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 34 deletions(-)
 delete mode 100644 media-libs/libpng/libpng-1.5.13.recipe
 create mode 100644 media-libs/libpng/libpng-1.6.8.recipe

diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe
index 82bca83a2..d5a71e263 100644
--- a/media-libs/libpng/libpng-1.5.12.recipe
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -28,10 +28,10 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libpng/libpng-1.5.13.recipe b/media-libs/libpng/libpng-1.5.13.recipe
deleted file mode 100644
index 99bfdb083..000000000
--- a/media-libs/libpng/libpng-1.5.13.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="Portable Network Graghpics library" 
-HOMEPAGE="http://www.libpng.org" 
-SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.13.tar.gz?download"
-CHECKSUM_MD5="9c5a584d4eb5fe40d0f1bc2090112c65"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd libpng-1.5.13
-	libtoolize --force --copy
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
-}
-
-INSTALL()
-{
-	cd libpng-1.5.13
-	make install
-}
-
-TEST()
-{
-	cd libpng-1.5.13
-	make test
-}
-
-COPYRIGHT="1998-2012 Glenn Randers-Pehrson
-		1996-1997 Andreas Dilger
-		1995-1996 Guy Eric Schalnat, Group 42, Inc."
-LICENSE="LibPNG"
diff --git a/media-libs/libpng/libpng-1.6.8.recipe b/media-libs/libpng/libpng-1.6.8.recipe
new file mode 100644
index 000000000..b768b365d
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.8.recipe
@@ -0,0 +1,81 @@
+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_MD5="29b7065906e2551508a0d7eacd19174e"
+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
+	"