From b495a0fb3166ee8fe465caca0ff8ed3cf20ac962 Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Wed, 27 Oct 2004 03:28:35 +0000
Subject: [PATCH] Benjamin Schieder: 	Cleanups to subversion.conf 	Split
 into: 	subversion		(client and libraries) 	subversion:apache
 (apache module) 	subversion:server	(server binaries and
 man-pages)

[2004101517192129968] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4600 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/subversion/subversion.conf | 33 +++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/package/rene/subversion/subversion.conf b/package/rene/subversion/subversion.conf
index ac4f9ad15..c2b18dd6a 100644
--- a/package/rene/subversion/subversion.conf
+++ b/package/rene/subversion/subversion.conf
@@ -20,6 +20,9 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+# use system wide neon
+pkginstalled neon && var_append extraconfopt " " "--with-neon=$root/usr"
+
 if [ "$xpkg" = subversion-static ]
 then
 	# this is the subversion-static package
@@ -43,22 +46,20 @@ then
 	var_append extraconfopt " " "--enable-all-static"
 	hook_add postmake 3 svn_static_pm
 else
-	# use the apache prefix
-	. $base/package/*/apache/apache.conf
-
 	# all this is to build the apache server-side module
 	# and to make sure no locally included APR stuff get's installed
 	# as well as no modification to httpd.conf is done ...
 	if pkginstalled apache; then
-		var_append extraconfopt " " "--with-apxs=/$prefix/sbin/apxs \
---with-apr=/$prefix/bin/apr-config --with-apr-util=/$prefix \
---disable-mod-activation"
-# --with-berkeley-db=/usr/include/db40:/usr/lib
+		apacheprefix=${ROCKCFG_PKG_APACHE_PREFIX:-opt/apache}
+		var_append extraconfopt " " "--with-apxs=/$apacheprefix/sbin/apxs \
+			--with-apr=/$apacheprefix/bin/apr-config --with-apr-util=/$apacheprefix \
+			--disable-mod-activation"
+		if [ "$ROCKCFG_PKG_APACHE_BDB" ] ; then
+			var_append extraconfopt " " \
+			  "--with-berkeley-db=/usr/include/${ROCKCFG_PKG_APACHE_BDB#b}:/usr/lib"
+		fi
 	fi
 
-	# use system wide neon
-	var_append extraconfopt " " "--with-neon=$root/usr"
-
 	# build and install perl bindings
 	svn_inst_pl() {
 		make swig-pl-lib
@@ -89,5 +90,17 @@ EOF
 	pkginstalled swig && [ -n "$( type -p python )" ] && hook_add postmake 5 "svn_inst_py"
 
 	hook_add postmake 5 "svn_inst_profile"
+
+	if pkginstalled apache ; then
+		splitdesc_apache() {
+			desc_I="Apache module for subversion"
+		}
+		splitreg 50 apache ${apacheprefix}.*mod_.*so
+	fi
+	splitdesc_server() {
+		desc_I="$desc_I (server binaries)"
+	}
+	splitreg 51 server /svn[^.]\+[^th]$
+	splitreg 52 server rc\.d
 fi