--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/02/18 13:56:34	1762
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2013/08/14 14:07:00	2167
@@ -102,12 +102,50 @@
 	return ${retval}
 }
 
+unpack_package()
+{
+	local magefile="$1"
+	local pkg
+	local pkgtype
+	local tar_opts
+
+	pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"
+	pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
+
+	xtitle "[ Unpacking ${pkg} ]"
+
+	# abort on virtual pkg
+	if [[ ${pkgtype} = virtual ]]
+	then
+		echo -ne " ${COLBLUE}---${COLDEFAULT}"
+		echo " !unpack virtual ${pkg/.${PKGSUFFIX}/} ... "
+		continue
+	fi
+
+	# abort on sources pkg
+	if [[ ${pkgtype} = sources ]]
+	then
+		echo -ne " ${COLBLUE}---${COLDEFAULT}"
+		echo " !unpack sources ${pkg/.${PKGSUFFIX}/} ... "
+		continue
+	fi
+
+	# busybox?
+	if need_busybox_support tar
+	then
+		tar_opts="xjf"
+	else
+		tar_opts="xjmf"
+	fi
+
+	echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkg} ... "
+	tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
+}
+
 unpack_packages()
 {
 	local list="$@"
 	local magefile
-	local pkg
-	local pkgtype
 	local count_current
 	local count_total
 	local tar_opts
@@ -120,38 +158,8 @@
 
 	for magefile in ${list}
 	do
-		pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"
-		pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
-
+		unpack_package "${magefile}"
 		(( count_current++ ))
-		xtitle "[ (${count_current}/${count_total}) Unpacking ${pkg} ]"
-
-		# abort on virtual pkg
-		if [[ ${pkgtype} = virtual ]]
-		then
-			echo -ne " ${COLBLUE}---${COLDEFAULT}"
-			echo " !unpack virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "
-			continue
-		fi
-
-		# abort on sources pkg
-		if [[ ${pkgtype} = sources ]]
-		then
-			echo -ne " ${COLBLUE}---${COLDEFAULT}"
-			echo " !unpack sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "
-			continue
-		fi
-
-		# busybox?
-		if need_busybox_support tar
-		then
-			tar_opts="xjf"
-		else
-			tar_opts="xjmf"
-		fi
-
-		echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... "
-		tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
 	done
 
 	# add a crlf for a better view
@@ -1605,7 +1613,7 @@
 			then
 				if ! mcheckemptydir ${MAGEDIR}
 				then
-					find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xarg --no-run-if-empty rm -r
+					find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xargs --no-run-if-empty rm -r
 				fi
 			else
 				rm -rf ${MAGEDIR}
@@ -1887,8 +1895,9 @@
 		count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
 	done
 
-	# dirty hack to convert 0001 -> 1; 0120 -> 120 etc
-	x="${#count}"
+	# convert 0001 -> 1; 0120 -> 120 etc
+	# use bash internal base functions to this task
+	x="$((10#${count}))"
 	for (( i=0; i<x; i++ ))
 	do
 		if [[ ${count:${i}:1} != 0 ]]
@@ -2688,6 +2697,7 @@
 	if [[ ${PKGTYPE} != virtual ]] && \
 		[[ ${PKGTYPE} != sources ]]
 	then
+		unpack_package "${magefile}"
 		echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
 		build_doinstall ${PKGNAME}
 	fi
@@ -3119,7 +3129,12 @@
 				"") continue;;
 			esac
 
-			deps="${deps} $(basename ${dep%-*})"
+			if [[ -z ${deps} ]]
+			then
+				deps="$(basename ${dep%-*})"
+			else
+				deps="${deps} $(basename ${dep%-*})"
+			fi
 		done << EOF
 ${depsfull}
 EOF
@@ -3130,7 +3145,12 @@
 				"") continue;;
 			esac
 
-			sdeps="${sdeps} $(basename ${dep%-*})"
+			if [[ -z ${sdeps} ]]
+			then
+				sdeps="$(basename ${dep%-*})"
+			else
+				sdeps="${sdeps} $(basename ${dep%-*})"
+			fi
 		done << EOF
 ${sdepsfull}
 EOF
@@ -3144,7 +3164,7 @@
 		then
 			echo "      License:  ${license}"
 		fi
-		echo "      Depends: ${deps}"
+		echo "      Depends:  ${deps}"
 		echo "      SDepends: ${sdeps}"
 		echo
 
@@ -3261,16 +3281,20 @@
 need_busybox_support()
 {
 	local cmd
+	local busybox
 	cmd="$1"
 
-	if [[ -x /bin/busybox ]]
-	then
-		if [[ $(readlink $(which ${cmd})) = /bin/busybox ]]
+	for busybox in {,/usr}/bin/busybox
+	do
+		if [[ -x ${busybox} ]]
 		then
-			# needs busybox support
-			return 0
+			if [[ $(readlink $(which ${cmd})) = ${busybox} ]]
+			then
+				# needs busybox support
+				return 0
+			fi
 		fi
-	fi
+	done
 
 	# no busybox
 	return 1
@@ -3327,7 +3351,7 @@
 {
 	local feature="$1"
 	local retval
-	
+
 	case "${feature}" in
 		autosvc|!autosvc) retval=0 ;;
 		buildlog|!buildlog) retval=0 ;;
@@ -3336,6 +3360,7 @@
 		compressdoc|!compressdoc) retval=0 ;;
 		debug|!debug) retval=0 ;;
 		distcc|!distcc) retval=0 ;;
+		icecc|!icecc) retval=0 ;;
 		kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
 		libtool|!libtool) retval=0 ;;
 		linuxsymlink|!linuxsymlink) retval=0 ;;
@@ -3441,7 +3466,7 @@
 
 mprintfeatures()
 {
-	echo "Global features:  ${MAGE_FEATURES_GLOBAL[*]}"
-	echo "Local features:   ${MAGE_FEATURES[*]}"
-	echo "Current features: ${MAGE_FEATURES_CURRENT[*]}"
+	echo -e "${COLRED}Global features:${COLDEFAULT} ${MAGE_FEATURES_GLOBAL[*]}"
+	echo -e "${COLYELLOW}Local features:${COLDEFAULT} ${MAGE_FEATURES[*]}"
+	echo -e "${COLGREEN}Current features:${COLDEFAULT} ${MAGE_FEATURES_CURRENT[*]}"
 }