--- trunk/mage/usr/lib/mage/smage2.sh	2006/03/04 23:29:45	347
+++ trunk/mage/usr/lib/mage/smage2.sh	2009/05/21 19:06:26	875
@@ -4,26 +4,54 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.41 2006-03-04 23:29:45 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
 #	added distcc support
 
+# set default user mage.rc
+: ${MAGERC="/etc/mage.rc"}
+
 ## setup ##
 PKGSUFFIX="mpk"
+SRCPKGSUFFIX="mpks"
 SMAGENAME="$1"
 SMAGESUFFIX="smage2"
-#SOURCEDIR="/bootstrap/sources"
-#SMAGESCRIPTSDIR="/bootstrap/smage2-install-scripts"
-#SMAGE2RSYNC="rsync://192.168.0.2/smage2-scripts"
 MLIBDIR=/usr/lib/mage
 SMAGEVERSION="$( < ${MLIBDIR}/version)"
+SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
+
+
+## only for tests -> normally in /etc/rc.d/init.d/functions
+COLRED="\033[1;6m\033[31m"
+COLGREEN="\033[1;6m\033[32m"
+COLYELLOW="\033[1;6m\033[33m"
+COLBLUE="\033[1;6m\033[34m"
+COLMAGENTA="\033[1;6m\033[35m"
+COLWHITE="\033[1;6m\033[37m"
+COLGRAY="\033[0;6m\033[37m"
+COLBOLD="\033[1m"
+COLDEFAULT="\033[0m"
+
+if [[ ${NOCOLORS} = true ]]
+then
+	COLRED=""
+	COLGREEN=""
+	COLYELLOW=""
+	COLBLUE=""
+	COLMAGENTA=""
+	COLWHITE=""
+	COLGRAY=""
+	COLBOLD=""
+	COLDEFAULT=""
+fi
 
 # export default C locale
 export LC_ALL=C
 
-source /etc/mage.rc
+source /etc/mage.rc.global
+source ${MAGERC}
 
 # set PKGDIR and BUILDDIR and BINDIR to MROOT
 if [[ -n ${MROOT} ]]
@@ -42,6 +70,7 @@
 die()
 {
 	xtitleclean
+	echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
 	echo "SMAGE failed: $@"
 	exit 1
 }
@@ -70,28 +99,13 @@
 	local i
 	for i in ${SMAGE2RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${SMAGESCRIPTSDIR}
-
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${SMAGESCRIPTSDIR}
 		if [[ $? = 0 ]]
 		then
 			break
 		else
 			continue
 		fi
-
 	done
 
 	# clean up backup files (foo~)
@@ -137,7 +151,7 @@
 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
 	if [[ $? = 0 ]]
 	then
-		# md5's ok, not fetching needed
+		# md5's ok, no fetching needed
 		FETCHING=false
 	else
 		FETCHING=true
@@ -160,16 +174,111 @@
 		fi
 
 		# if an mirrored file than replace first the mirror uri
-		if [ -n "$(echo ${my_SRC_URI} | grep 'mirror://')" ]
+		if [[ -n $(echo ${my_SRC_URI} | grep 'mirror://') ]]
 		then
 			for mirror in ${MIRRORS}
 			do
 				my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|mirror:/|${mirror}/sources|g")"
 
-				#echo "DEBUG: ${MY_SRC_URI}"
 				if [[ ${FETCHING} = true ]]
 				then
-					echo "==> fetching ${my_SRC_URI_MIRROR}"
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
+					wget \
+						--passive-ftp \
+						--tries 3 \
+						--continue \
+						--progress bar \
+						--directory-prefix="${my_SOURCEDIR}" \
+						"${my_SRC_URI_MIRROR}"
+					if [[ $? = 0 ]]
+					then
+						break
+					else
+						continue
+					fi
+				fi
+			done
+		elif [[ -n $(echo ${my_SRC_URI} | grep 'sourceforge://') ]]
+		then
+			for mirror in ${SOURCEFORGE_MIRRORS}
+			do
+				my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|sourceforge:/|${mirror}|g")"
+
+				if [[ ${FETCHING} = true ]]
+				then
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
+					wget \
+						--passive-ftp \
+						--tries 3 \
+						--continue \
+						--progress bar \
+						--directory-prefix="${my_SOURCEDIR}" \
+						"${my_SRC_URI_MIRROR}"
+					if [[ $? = 0 ]]
+					then
+						break
+					else
+						continue
+					fi
+				fi
+			done
+		elif [[ -n $(echo ${my_SRC_URI} | grep 'gnu://') ]]
+		then
+			for mirror in ${GNU_MIRRORS}
+			do
+				my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|gnu:/|${mirror}|g")"
+
+				if [[ ${FETCHING} = true ]]
+				then
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
+					wget \
+						--passive-ftp \
+						--tries 3 \
+						--continue \
+						--progress bar \
+						--directory-prefix="${my_SOURCEDIR}" \
+						"${my_SRC_URI_MIRROR}"
+					if [[ $? = 0 ]]
+					then
+						break
+					else
+						continue
+					fi
+				fi
+			done
+		elif [[ -n $(echo ${my_SRC_URI} | grep 'kde://') ]]
+		then
+			for mirror in ${KDE_MIRRORS}
+			do
+				my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|kde:/|${mirror}|g")"
+
+				if [[ ${FETCHING} = true ]]
+				then
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
+					wget \
+						--passive-ftp \
+						--tries 3 \
+						--continue \
+						--progress bar \
+						--directory-prefix="${my_SOURCEDIR}" \
+						"${my_SRC_URI_MIRROR}"
+					if [[ $? = 0 ]]
+					then
+						break
+					else
+						continue
+					fi
+				fi
+			done
+		elif [[ -n $(echo ${my_SRC_URI} | grep 'gnome://') ]]
+		then
+			for mirror in ${GNOME_MIRRORS}
+			do
+				my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|gnome:/|${mirror}|g")"
+
+				if [[ ${FETCHING} = true ]]
+				then
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
 						--passive-ftp \
 						--tries 3 \
@@ -186,10 +295,9 @@
 				fi
 			done
 		else
-			#echo "DEBUG: ${SRC_URI[${i}]}"
 			if [[ ${FETCHING} = true ]]
 			then
-				echo "==> fetching ${my_SRC_URI}"
+				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
 				wget \
 					--passive-ftp \
 					--tries 3 \
@@ -197,13 +305,6 @@
 					--progress bar \
 					--directory-prefix="${my_SOURCEDIR}" \
 					"${my_SRC_URI}"
-# only needed to run through a list of mirrors
-# 				if [ "$?" == "0" ]
-# 				then
-# 					break
-# 				else
-# 					continue
-# 				fi
 			fi
 		fi
 
@@ -216,7 +317,7 @@
 
 	# recheck md5 sums
 	echo
-	echo ">== Checking MD5 sums:"
+	echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
 	echo
 
@@ -248,6 +349,14 @@
 	return 0
 }
 
+mlibdir()
+{
+	local libdir=lib
+	[[ ${ARCH} = x86_64 ]] && libdir=lib64
+
+	echo "${libdir}"
+}
+
 mconfigure()
 {
 	if [ -x ./configure ]
@@ -255,11 +364,13 @@
 		./configure \
 			--prefix=/usr \
 			--host=${CHOST} \
+			--build=${CHOST} \
 			--mandir=/usr/share/man \
 			--infodir=/usr/share/info \
 			--datadir=/usr/share \
 			--sysconfdir=/etc \
 			--localstatedir=/var/lib \
+			--libdir=/usr/$(mlibdir) \
 			"$@" || die "mconfigure failed"
 	else
 		echo "configure is not an executable ..."
@@ -277,6 +388,7 @@
 			localstatedir=${BINDIR}/var/lib \
 			mandir=${BINDIR}/usr/share/man \
 			sysconfdir=${BINDIR}/etc \
+			libdir=${BINDIR}/usr/$(mlibdir) \
 			"$@" install || die "minstall failed"
         else
                 die "no Makefile found"
@@ -296,20 +408,26 @@
 
 	SRCFILE=$1
 
-	if [ -z "$2" ]
+	if [[ -z $2 ]]
 	then
 		DEST=${BUILDDIR}
 	else
 		DEST=$2
 	fi
 
+	[[ ! -d ${DEST} ]] && install -d ${DEST}
+
 	case "${SRCFILE##*.}" in
 		bz2)
 			IFTAR="$(basename $SRCFILE .bz2)"
 			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)
@@ -317,14 +435,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"
@@ -336,13 +473,38 @@
 {
 	local PATCHOPTS
 	local PATCHFILE
+	local i
 
 	PATCHOPTS=$1
 	PATCHFILE=$2
 
+	if [[ -z $2 ]]
+	then
+		PATCHFILE=$1
+
+		## patch level auto-detection, get patch level
+		for ((i=0; i < 10; i++))
+		do
+			patch --dry-run -Np${i} -i ${SOURCEDIR}/${PNAME}/${PATCHFILE} > /dev/null
+			if [[ $? = 0 ]]
+			then
+				PATCHOPTS="-Np${i}"
+				break
+			fi
+		done
+	fi
+
+	echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"
 	patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}
 }
 
+mlibtoolize()
+{
+	local opts="$@"
+	[[ -z ${opts} ]] && opts="--copy --force"
+
+	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
+}
 
 minstalldocs()
 {
@@ -397,27 +559,11 @@
 {
 	if [ -x /usr/bin/distcc ]
 	then
-		echo "Using DistCC for compilation ..."
-		export PATH=/usr/lib/distcc/bin:${PATH} || die "distcc: could not export new $PATH"
-
-		# export distcc as compiler
-#		export CC="distcc"
-#		export CXX=distcc
+		echo -e "${COLBLUE}---${COLGREEN} Using DistCC for compilation ...${COLDEFAULT}"
+		export PATH=/usr/$(mlibdir)/distcc/bin:${PATH} || die "distcc: could not export new $PATH"
 
 		export DISTCC_DIR="${DISTCC_DIR}" || die "distcc_dir export failed"
 
-		# ccache + distcc together
-		if [[ ${SMAGE_USE_CCACHE} = true ]]
-		then
-			if [ -x /usr/bin/ccache ]
-			then
-				echo "Preparing DistCC to work together with CCache ..."
-				#export CCACHE_PREFIX="distcc" || die "distcc: could not set ccach_prefix"
-#				export CC="ccache distcc"
-#				export CXX="ccache distcc"
-			fi
-		fi
-
 		# creating distcc tempdir
 		install -o distcc -g daemon -d ${DISTCC_DIR}
 		chmod 1777 ${DISTCC_DIR}
@@ -428,9 +574,8 @@
 {
 	if [ -x /usr/bin/ccache ]
 	then
-		echo "Using CCache for compilation ..."
-		export PATH=/usr/lib/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
-		#unset CC CXX
+		echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
+		export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
 	fi
 }
 
@@ -453,6 +598,9 @@
 		# fix DEPEND
 		while read sym dep
 		do
+			# ignore empty lines
+			[[ -z ${dep} ]] && continue
+
 			cat="$(dirname ${dep})"
 			# change if not virtual
 			if [[ ${cat} = virtual ]]
@@ -505,7 +653,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
@@ -533,15 +681,15 @@
 	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
 
 	# show what we are doing
-	echo "Generating Mage file:"
-	echo "  ${dest}"
+	echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
+	echo "${dest}"
 
 	install -d "$(dirname ${dest})"
 	# now build the mage file
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.41 2006-03-04 23:29:45 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
@@ -649,15 +797,15 @@
 	# now unset all uneeded vars to be safe
 	# unset PKGNAME <-- don't do that; smage needs this var
 	# unset to be safe (quotes needed !)
-	for i in ${SPECIAL_FUNCTIONS}
-	do
-		unset "${i}"
-	done
+#	for i in ${SPECIAL_FUNCTIONS}
+#	do
+#		unset "${i}"
+#	done
 	unset SPECIAL_FUNCTIONS
-	for i in ${SPECIAL_VARS}
-	do
-		unset "${i}"
-	done
+#	for i in ${SPECIAL_VARS}
+#	do
+#		unset "${i}"
+#	done
 	unset SPECIAL_VARS
 	unset STATE
 	unset DESCRIPTION
@@ -740,12 +888,12 @@
 	# build pkg-md5-sum only if requested
 	if [[ ${REGEN_MAGE_TREE} = true ]]
 	then
-		echo -n "Generating a md5sum for ${pkgname}.${PKGSUFFIX} ... "
+		echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
 
 		# abort if not exist
 		if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
 		then
-			echo "! exists"
+			echo -e "${COLRED}! exists${COLDEFAULT}"
 			return 0
 		fi
 
@@ -759,10 +907,49 @@
 		# gen md5sum
 		( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
 			> ${dest}/${pkgname}.md5
-		echo "done"
+		echo -e "${COLGREEN}done${COLDEFAULT}"
 	fi
 }
 
+source_pkg_build()
+{
+	if [[ ${PKGTYPE} = virtual ]]
+	then
+		echo "Virtual package detected; src-pkg-tarball not necessary ..."
+		return 0
+	fi
+
+	if [[ ! -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo "No SRC_URI defined; src-pkg-tarball not necessary ..."
+		return 0
+	fi
+
+	[ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."
+
+	echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
+
+	# include the smage2 file
+	cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
+
+	( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
+	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
+	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
+
+	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
+}
+
+step_by_step()
+{
+	if [[ ${STEP_BY_STEP} = true ]]
+	then
+		echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
+		echo "Press [enter] to continue"
+		read
+	fi
+}
+
+
 # print out our version
 showversion
 echo
@@ -894,29 +1081,84 @@
 	exit 0
 fi
 
+if [ "$1" == "--create-src-tarball" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
+
+	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
+
+	source ${SMAGENAME} || die "regen: smage2 not found"
+
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PKGNAME}
+	fi
+
+	download_sources
+	source_pkg_build ${SMAGENAME}
+	exit 0
+fi
+
+if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
+then
+	SRCPKGTARBALL="${2}"
+	USE_SRC_PKG_TARBALL=true
+
+	# abort if given file is not a source pkg
+	[[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
+
+	# set correct SMAGENAME; use the one that the src_pkg provide
+	# /path/to/SOURCEDIR/PNAME/SMAGENAME
+	SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
+
+	echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
+
+	[[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
+
+	# unpack srctarball
+	[[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."	
+
+	tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
+
+	[[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
+fi
+
+
 [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
 [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
 	die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
-[ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your mage.rc correctly."
-[ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly."
-[ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly."
-[ -z "${BINDIR}" ] && die "no BINDIR variable found in /etc/mage.rc"
-[ -z "${CHOST}" ] && die "no CHOST variable found in /etc/mage.rc"
-[ -z "${CFLAGS}" ] && die "no CFLAGS variable found in /etc/mage.rc"
-[ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in /etc/mage.rc"
+[ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
+[ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your ${MAGERC} correctly."
+[ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your ${MAGERC} correctly."
+[ -z "${BINDIR}" ] && die "no BINDIR variable found in ${MAGERC}"
+[ -z "${CHOST}" ] && die "no CHOST variable found in ${MAGERC}"
+[ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
+[ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
 
 source ${SMAGENAME} || die "source failed"
 PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
 MD5DIR="$(dirname ${SMAGENAME})/md5"
 
 xtitle "Compiling ${PKGNAME}"
-echo "Compiling ${PKGNAME}"
+echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
 
 # auto regen mage tree if requested
 regen_mage_tree
 
+if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]
+then
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLBLUE}===${COLGREEN} deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PNAME}
+	fi
+fi
+
 # download sources
-download_sources
+[[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources
 
 # fixes some issues with these functions
 export -f src_prepare || die "src_prepare export failed"
@@ -932,7 +1174,7 @@
 
 
 # setup distcc
-# distcc mus be setup *before* ccache, as ccache need to be before distcc in path
+# setup for distcc goes *before* ccache, so ccache comes before distcc in path
 [[ ${SMAGE_USE_DISTCC} = true ]] && setup_distcc_environment
 
 # setup ccache
@@ -941,17 +1183,6 @@
 # small sleep to show our settings
 sleep 1
 
-#debug
-#echo "CC=${CC}"
-#echo "CXX=${CXX}"
-#echo "DISTCC_DIR=${DISTCC_DIR}"
-#echo "PATH: ${PATH}"
-#echo "--------------------------------------"
-#env
-#echo "--------------------------------------"
-#read
-#debug end
-
 # cleans up build if a previously one exists
 if [ -d ${BUILDDIR} ]
 then
@@ -984,21 +1215,28 @@
 	mage rmstamp
 fi
 
-src_prepare || die "src_prepare failed"
-src_compile || die "src_compile failed"
-src_install || die "src_install failed"
+# setup build loggins
+[[ ! -d /var/log/smage ]] && install -d /var/log/smage
+echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
+
+( src_prepare || die "src_prepare failed" ) | ${SMAGE_LOG_CMD}
+step_by_step $_
+( src_compile || die "src_compile failed" ) | ${SMAGE_LOG_CMD}
+step_by_step $_
+( src_install || die "src_install failed" ) | ${SMAGE_LOG_CMD}
+step_by_step $_
 
 
 # compressing doc, info & man files
-echo -e "Compressing man-pages ..."
 if [ -d ${BUILDDIR}/builded/usr/share/man ]
 then
+	echo -e "${COLBLUE}===${COLGREEN} compressing man-pages ...${COLDEFAULT}"
 	${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man
 fi
 
-echo -e "Compressing info-pages ..."
 if [ -d ${BUILDDIR}/builded/usr/share/info ]
 then
+	echo -e "${COLBLUE}===${COLGREEN} compressing info-pages ...${COLDEFAULT}"
 	${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info
 fi
 
@@ -1008,9 +1246,9 @@
 		echo -e "NOSTRIP=true detected; Package will not be stripped ..."
 		;;
 	*)
-		echo -e "Stripping binaries ..."
+		echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
 		mstripbins ${BINDIR}
-		echo -e "Stripping libraries ..."
+		echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
 		mstriplibs ${BINDIR}
 		;;
 esac
@@ -1046,7 +1284,7 @@
 					--parch "${ARCH}" \
 					--target "${target}"
 
-				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n"
+				echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
 			done
 		else
 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
@@ -1059,14 +1297,23 @@
 				--pbuild "${PBUILD}" \
 				--parch "${ARCH}"
 
-			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+			echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
 		fi
+
+		# build src-pkg-tarball if requested
+		[[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME}
 		;;
 esac
 
+if [[ ${SMAGE_BUILD_LOGGING} != false ]]
+then
+	bzip2 -9f /var/log/smage/${PKGNAME}.log
+else
+	[[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log
+fi
+
 # for sure
 unset NOPKGBUILD
 unset NOSTRIP
-		
+
 xtitleclean
-#echo -e "\nPackage ${PKGNAME} successfully builded.\n"