--- trunk/mage/usr/lib/mage/smage2.functions.sh	2012/02/16 11:58:12	1689
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2013/02/01 09:45:47	2040
@@ -343,6 +343,8 @@
 		DEST=$2
 	fi
 
+	echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
+
 	[[ ! -d ${DEST} ]] && install -d ${DEST}
 
 	case "${SRCFILE##*.}" in
@@ -589,9 +591,13 @@
 marchsrcfile()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCFILE"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
 		retval=0
 	else
 		retval=1
@@ -948,7 +954,6 @@
 	export SAVED_HOMEPAGE="${HOMEPAGE}"
 	export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
 	export SAVED_STATE="${STATE}"
-	export SAVED_PKGTYPE="${PKGTYPE}"
 	export SAVED_INHERITS="${INHERITS}"
 	export SAVED_DEPEND="${DEPEND}"
 	export SAVED_SDEPEND="${SDEPEND}"
@@ -1023,7 +1028,6 @@
 	export HOMEPAGE="${SAVED_HOMEPAGE}"
 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
 	export STATE="${SAVED_STATE}"
-	export PKGTYPE="${SAVED_PKGTYPE}"
 	export INHERITS="${SAVED_INHERITS}"
 	export DEPEND="${SAVED_DEPEND}"
 	export SDEPEND="${SAVED_SDEPEND}"