From db0a06e1fc6023421e700976452ea7c6ef55d4fe Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 18 Jun 2013 03:38:42 +0200
Subject: [PATCH] subversion: update recipe

* Update [BUILD_]REQUIRES.
* Add USER_SETTINGS_FILES.
* Build separate devel package.
---
 dev-vcs/subversion/subversion-1.6.18.recipe | 70 ++++++++++++++++-----
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe
index 1be5d0a78..744cc87af 100644
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -12,7 +12,7 @@ LICENSE="Apache-Subversion"
 COPYRIGHT="2010 The Apache Software Foundation"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
 CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="subversion-1.6.18.patch"
@@ -42,28 +42,44 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku >= $haikuVersion
-	apr >= 1.3
-	apr_util >= 1.3
-	expat >= 2.0
-	libiconv >= 1.13
-	libxml2 >= 2.7
-	neon >= 0.29
-	sqlite >= 3.4
-	zlib
+	lib:libapr_1
+	lib:libaprutil_1
+	lib:libcrypto
+	lib:libexpat
+	lib:libiconv
+	lib:libneon
+	lib:libsqlite3
+	lib:libssl
+	lib:libxml2
+	lib:libz
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	expat_devel >= 2.0
+	libiconv_devel >= 1.13
+	neon_devel >= 0.29
+	python
+	sqlite_devel >= 3.4
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	devel:libapr_1 >= 0.3
+	devel:libaprutil_1 >= 0.3
+	devel:libcrypto
+	devel:libssl
+	devel:libxml2 >= 2.7
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	"
 
+USER_SETTINGS_FILES="
+	settings/subversion directory
+	"
+
 SOURCE_DIR="$portVersionedName"
 
 PATCH()
@@ -78,10 +94,10 @@ BUILD()
 	aclocal -I build -I build/ac-macros
 	autoconf
 	runConfigure ./configure \
-		--with-apr=$portPackageLinksDir/apr \
-		--with-apr-util=$portPackageLinksDir/apr_util \
-		--with-neon=$portPackageLinksDir/neon \
-		--with-zlib=$portPackageLinksDir/zlib \
+		--with-apr=$portPackageLinksDir/devel:libapr_1 \
+		--with-apr-util=$portPackageLinksDir/devel:libaprutil_1 \
+		--with-neon=$portPackageLinksDir/neon_devel \
+		--with-zlib=$portPackageLinksDir/devel:libz \
 		--with-editor=nano \
 		--disable-nls
 	make $jobArgs
@@ -117,9 +133,35 @@ INSTALL()
 		libsvn_repos-1 \
 		libsvn_subr-1 \
 		libsvn_wc-1
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
 {
 	make check
 }
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	subversion_devel = $portVersion compat >= 1.6
+	devel:libsvn_client_1 = 0.0.0 compat >= 0
+	devel:libsvn_delta_1 = 0.0.0 compat >= 0
+	devel:libsvn_diff_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_util_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_local_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_neon_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0
+	devel:libsvn_repos_1 = 0.0.0 compat >= 0
+	devel:libsvn_subr_1 = 0.0.0 compat >= 0
+	devel:libsvn_wc_1 = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	subversion == $portVersion base
+	"