From 7e7bfa9ead11005206bc307f8601c82604372e41 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 16 Jun 2013 00:41:23 +0200
Subject: [PATCH] apr: update recipe

* provides:
  - Remove lib:libapr. A library with that base name doesn't exist.
  - lib:libapr_1: Fix version.
* Remove lib/apr.exp.
* Build separate devel package.
* Remove explicit source package declaration.
---
 dev-libs/apr/apr-1.4.6.recipe | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe
index e55147f38..a0e172c37 100644
--- a/dev-libs/apr/apr-1.4.6.recipe
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -4,16 +4,14 @@ SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
 CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
-REVISION="6"
+REVISION="7"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="apr-1.4.6.patch"
 
 PROVIDES="
 	apr = $portVersion compat >= 1
-	cmd:apr_1_config
-	lib:libapr = $portVersion compat >= 1
-	lib:libapr_1 = $portVersion compat >= 1
+	lib:libapr_1 = 0.4.6 compat >= 0
 	"
 REQUIRES="
 	haiku >= $haikuVersion
@@ -57,6 +55,15 @@ INSTALL()
 
 	# fix apr-1-config
 	fixDevelopLibDirReferences $binDir/apr-1-config
+
+	# remove superfluous .exp file
+	rm $libDir/apr.exp
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$dataDir \
+		$developDir
 }
 
 TEST()
@@ -64,10 +71,6 @@ TEST()
 	make test
 }
 
-# ----- source package -------------------------------------------------------
-
-PROVIDES_source="apr_source = $portVersion compat = $portVersion"
-
 # ----- description ----------------------------------------------------------
 
 DESCRIPTION="
@@ -95,3 +98,14 @@ DESCRIPTION="
 	- thread and Process management
 	- various data structures (tables, hashes, priority queues, etc) 
 	"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	apr_devel = portVersion compat >= 1
+	cmd:apr_1_config = portVersion compat >= 1
+	devel:libapr_1 = 0.4.6 compat >= 0
+	"
+REQUIRES_devel="
+	apr == $portVersion base
+	"