--- trunk/mage/usr/lib/mage/smage2.sh	2007/06/07 13:16:03	497
+++ trunk/mage/usr/lib/mage/smage2.sh	2009/04/29 20:20:46	833
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.58 2007-06-07 13:16:03 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -362,6 +362,7 @@
 		./configure \
 			--prefix=/usr \
 			--host=${CHOST} \
+			--build=${CHOST} \
 			--mandir=/usr/share/man \
 			--infodir=/usr/share/info \
 			--datadir=/usr/share \
@@ -405,7 +406,7 @@
 
 	SRCFILE=$1
 
-	if [ -z "$2" ]
+	if [[ -z $2 ]]
 	then
 		DEST=${BUILDDIR}
 	else
@@ -420,7 +421,11 @@
 			IFTAR="${IFTAR##*.}"
 			if [[ ${IFTAR} = tar ]]
 			then
-				tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}
+				tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.bz2 unpack failed."
+			else
+				pushd ${DEST} > /dev/null
+				bzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .bz2) || die ".bz2 unpack failed."
+				popd > /dev/null
 			fi
 			;;
 		gz)
@@ -428,14 +433,33 @@
 			IFTAR="${IFTAR##*.}"
 			if [[ ${IFTAR} = tar ]]
 			then
-				tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}
+				tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.gz unpack failed."
+			else
+				pushd ${DEST} > /dev/null
+				zcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .gz) || die ".gz unpack failed."
+				popd > /dev/null
 			fi
 			;;
-		tbz2)
-			tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}
+		tbz2|mpks|mpk)
+			tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
 			;;
 		tgz)
-			tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}
+			tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."
+			;;
+		rar)
+			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
+			;;
+		zip|xpi)
+			unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
+			;;
+		rpm)
+			pushd ${DEST} > /dev/null
+			rpm2targz ${SOURCEDIR}/${PNAME}/${SRCFILE} || die "rpm2targz: .rpm unpack failed."
+			tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz} || die "tar: .rpm unpack failed."
+			if [[ -f ${DEST}/${SRCFILE/.rpm/.tar.gz} ]]
+			then
+				rm ${DEST}/${SRCFILE/.rpm/.tar.gz}
+			fi
 			;;
 		*)
 			die "munpack failed"
@@ -627,7 +651,7 @@
 # special tags:
 #   PKGTYPE               type of pkg
 #   INHERITS              which functions get included
-#   SPECIAL_FUNCTIONS     special functions wich should also be added
+#   SPECIAL_FUNCTIONS     special functions which should also be added
 #                         warning: they get killed before the build starts !
 #
 #   MAGE_TREE_DEST        target destination of the generated tree
@@ -663,7 +687,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.58 2007-06-07 13:16:03 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state