--- trunk/mage/usr/lib/mage/smage2.functions.sh	2013/08/14 07:55:29	2159
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:47:23	2362
@@ -318,9 +318,9 @@
 			sysconfdir=${BINDIR}/etc \
 			libdir=${BINDIR}/usr/$(mlibdir) \
 			"$@" install || die "minstall failed"
-        else
-                die "no Makefile found"
-        fi
+	else
+		die "no Makefile found"
+	fi
 }
 
 mmake()
@@ -609,9 +609,13 @@
 marchsrcdir()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCDIR"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
 		retval=0
 	else
 		retval=1
@@ -623,10 +627,13 @@
 marchdepend()
 {
 	local retval
+	local var="$1"
+
+	[[ -z ${var} ]] && var="DEPEND"
 
-	if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1
@@ -638,9 +645,13 @@
 marchsdepend()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SDEPEND"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1
@@ -677,7 +688,7 @@
 {
 	if [ -x /usr/bin/ccache ]
 	then
-		mqueryfeature "icecream" && export CCACHE_PREFIX=icecc
+		mqueryfeature "icecc" && export CCACHE_PREFIX=icecc
 
 		echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
 		export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
@@ -1045,7 +1056,7 @@
 	export DESCRIPTION="${SAVED_DESCRIPTION}"
 	export HOMEPAGE="${SAVED_HOMEPAGE}"
 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
-	export SPECIAL_VARS="${SAVED_SPECIAL_FUNCTIONS}"
+	export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
 	export STATE="${SAVED_STATE}"
 	export INHERITS="${SAVED_INHERITS}"
 	export DEPEND="${SAVED_DEPEND}"