From 361506fd8a1eeda4589c2c349395adc37d1f8b55 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 16 Mar 2005 13:44:26 +0000
Subject: [PATCH] Clifford Wolf: 	Fixed package xfce4

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



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5730 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/avm/xfce4/xfce4.conf | 90 +++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/package/avm/xfce4/xfce4.conf b/package/avm/xfce4/xfce4.conf
index 6be56fc41..5a5ef5c06 100644
--- a/package/avm/xfce4/xfce4.conf
+++ b/package/avm/xfce4/xfce4.conf
@@ -32,57 +32,53 @@ sysconfdir="${sysconfdir%xfce4}"
 [ "$ROCKCFG_DISABLE_NLS" = 1 ] && postmake="rm -rf $datadir/xfce4/doc/??{,_??}"
 
 xfce4_custmain() {
-    if [ "$prefix_auto" = 1 ] ; then
-	prefix="opt/xfce4"
-	var_append confopt " " "--prefix=$root/$prefix"
-    fi
+	if [ "$prefix_auto" = 1 ]
+	then
+		prefix="opt/xfce4"
+		set_confopt
+	fi
 
-    # these need to be built first in that order
-    xfce4_prebuild="libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager\
-	                xfce4-panel"
-    
-    for i in $xfce4_prebuild; do 
-	echo "Building $i ..."
-	echo "extracting src/${i}*.tar.gz ..."
-	tar xzf src/${i}*.tar.gz
-	cd ${i}*
-	hook_eval preconf
-	echo "./configure $confopt"
-	eval ./configure $confopt
+	# we create the $prefix here - so it's not in the env yet..
+	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$libdir/pkgconfig"
+	export PATH="$PATH:$bindir"
 
-	hook_eval premake
-	echo "make $makeopt"
-	eval make $makeopt
-	echo "evaluating inmake"
+	# sometimes xfce is unsure if its own header files are
+	# in /$prefix/include/ or /$prefix/include/xfce4/ ..
+	var_append CC_WRAPPER_APPEND " " "-I$includedir"
 
-	hook_eval inmake
-	echo "make $makeopt $makeinstopt"
-	eval make $makeopt $makeinstopt
-	hook_eval postmake
-	cd ..
-	echo "Finished building $i"
-    done
+	for i in \
+			src/libxfce4util-*.tar.gz	\
+			src/dbh-*.tar.gz		\
+			src/libxfcegui4-*.tar.gz	\
+			src/libxfce4mcs-*.tar.gz	\
+			src/xfce-mcs-manager-*.tar.gz	\
+			src/xfce4-panel-*.tar.gz	\
+			src/*.tar.gz
+	do 
+		if [ ! -d $(basename ${i%.tar.gz}) ]; then
+			echo
+			echo "Building $i ..."
+			tar xzf ${i}
+			cd $(basename ${i%.tar.gz})
 
-    for i in src/*.tar.gz; do
-	i=$(basename ${i/.tar.gz})
-	if [[ ${xfce4_prebuild} != *${i} ]]; then
-		echo "Building $i ..."
-		tar xzf src/${i}*.tar.gz
-		cd ${i}*
-		hook_eval preconf
-		echo "./configure $confopt"
-		eval ./configure $confopt
-		hook_eval premake
-		echo "make $makeopt"
-		eval make $makeopt
-		hook_eval inmake
-		echo "make $makeopt $makeinstopt"
-		eval make $makeopt $makeinstopt
-		hook_eval postmake
-		cd ..
-		echo "Finished building $i"
-	fi
-    done
+			hook_eval preconf
+			echo "./configure $confopt"
+			eval ./configure $confopt
+
+			hook_eval premake
+			echo "make $makeopt"
+			eval make $makeopt
+			echo "evaluating inmake"
+
+			hook_eval inmake
+			echo "make $makeopt $makeinstopt"
+			eval make $makeopt $makeinstopt
+			hook_eval postmake
+			echo "Finished building $i"
+			echo
+			cd ..
+		fi
+	done
 }
 
 custmain="xfce4_custmain"