--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/22 00:07:32	204
+++ trunk/mage/usr/lib/mage/smage2.sh	2009/06/29 19:17:22	883
@@ -4,91 +4,119 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 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}
 
-showversion() {
+# set PKGDIR and BUILDDIR and BINDIR to MROOT
+if [[ -n ${MROOT} ]]
+then
+	export PKGDIR=${MROOT}/${PKGDIR}
+	export BUILDDIR=${MROOT}/${BUILDDIR}
+	export BINDIR=${MROOT}/${BINDIR}
+fi
+
+showversion()
+{
 	echo -en "Magellan Source Install v${SMAGEVERSION} "
 	echo -e  "-- Niels Rogalla (niro@magellan-linux.de)"
 }
 
-die() {
+die()
+{
 	xtitleclean
+	echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
 	echo "SMAGE failed: $@"
 	exit 1
 }
 
-xtitle() {
-	if [ ${TERM} == "xterm" ]
+xtitle()
+{
+	if [[ ${TERM} = xterm ]]
 	then
 		echo -ne "\033]0;[sMage: $@]\007"
 	fi
 	return 0
 }
 
-xtitleclean() {
-	if [ ${TERM} == "xterm" ]
+xtitleclean()
+{
+	if [[ ${TERM} = xterm ]]
 	then
 		echo -ne "\033]0;\007"
 	fi
 	return 0
 }
 
-syncsmage2() {
+syncsmage2()
+{
 	xtitle "Updating smage2-script tree ..."
 	local i
 	for i in ${SMAGE2RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${SMAGESCRIPTSDIR}
-			
-		if [ "$?" == "0" ]
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${SMAGESCRIPTSDIR}
+		if [[ $? = 0 ]]
 		then
 			break
 		else
 			continue
 		fi
-		
 	done
-	
-	#clean up backup files (foo~)
+
+	# clean up backup files (foo~)
 	find ${SMAGESCRIPTSDIR} -name *~ -exec rm '{}' ';'
-	
+
 	xtitleclean
 }
 
 # $1 filename
-get_db_md5_sum() {
+get_db_md5_sum()
+{
 	local DB_FILE
 	local MD5_FILE
 	local i
@@ -101,7 +129,8 @@
 	echo "${i}"
 }
 
-download_sources() {
+download_sources()
+{
 
 	[ -z "${SRC_URI}" ] && echo -e "\nNothing declared to download.\n" && return 0
 
@@ -113,21 +142,21 @@
 	local DB_MD5_SUM_FILE="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
 	local FETCHING
 	local i mirror
-	
 
-	#install SRCDIR/PNAME if not exist
+
+	# install SRCDIR/PNAME if not exist
 	[ ! -d ${SOURCEDIR}/${PNAME} ] && install -d ${SOURCEDIR}/${PNAME}
 
 	# check if FETCHING is needed
 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
-	if [[ $? == 0 ]]
+	if [[ $? = 0 ]]
 	then
-		# md5's ok, not fetching needed
+		# md5's ok, no fetching needed
 		FETCHING=false
 	else
 		FETCHING=true
 	fi
-	
+
 	for ((i=0; i < EOA; i++))
 	do
 		# url to file
@@ -145,24 +174,119 @@
 		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 ]]
+				if [[ ${FETCHING} = true ]]
+				then
+					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
+					wget \
+						--passive-ftp \
+						--tries 3 \
+						--continue \
+						--progress bar \
+						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
+						"${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 "==> 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}" \
+						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
-					if [ "$?" == "0" ]
+					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 \
+						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
+						"${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 \
+						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
+						"${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 \
+						--continue \
+						--progress bar \
+						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
+						"${my_SRC_URI_MIRROR}"
+					if [[ $? = 0 ]]
 					then
 						break
 					else
@@ -171,27 +295,19 @@
 				fi
 			done
 		else
-			#echo "DEBUG: ${SRC_URI[${i}]}"
-			if [[ ${FETCHING} == true ]]
+			if [[ ${FETCHING} = true ]]
 			then
-				echo "==> fetching ${my_SRC_URI}"
+				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
 				wget \
 					--passive-ftp \
 					--tries 3 \
 					--continue \
 					--progress bar \
-					--directory-prefix="${my_SOURCEDIR}" \
+					--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
 					"${my_SRC_URI}"
-# only needed to run through a list of mirrors
-# 				if [ "$?" == "0" ]
-# 				then
-# 					break
-# 				else
-# 					continue
-# 				fi
 			fi
 		fi
-		
+
 		# unset them to be shure
 		unset my_SRC_URI
 		unset my_SRC_URI_DEST
@@ -201,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
 
@@ -210,98 +326,142 @@
 }
 
 # dummy function, used if that not exist in smage file
-src_prepare() {
+src_prepare()
+{
 	echo "no src_prepare defined"
 	sleep 2
 	return 0
 }
 
 # dummy function, used if that not exist in smage file
-src_compile() {
+src_compile()
+{
 	echo "no src_compile defined"
 	sleep 2
 	return 0
 }
 
 # dummy function, used if that not exist in smage file
-src_install() {
+src_install()
+{
 	echo "no src_install defined"
 	sleep 2
 	return 0
 }
 
-mconfigure() {
+mlibdir()
+{
+	local libdir=lib
+	[[ ${ARCH} = x86_64 ]] && libdir=lib64
+
+	echo "${libdir}"
+}
+
+mconfigure()
+{
 	if [ -x ./configure ]
 	then
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		"$@" || die "mconfigure failed"
+		./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 ..."
 		exit 1
 	fi
 }
 
-minstall() {
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+minstall()
+{
+	if [ -f ./[mM]akefile -o -f ./GNUmakefile ]
+	then
 		make prefix=${BINDIR}/usr \
 			datadir=${BINDIR}/usr/share \
 			infodir=${BINDIR}/usr/share/info \
 			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"
         fi
 }
 
-mmake() {
+mmake()
+{
 	make ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
 }
 
-munpack() {
+munpack()
+{
 	local SRCFILE
 	local IFTAR
 	local DEST
 
 	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" ]
+			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)
 			IFTAR="$(basename $SRCFILE .gz)"
 			IFTAR="${IFTAR##*.}"
-			if [ "${IFTAR}" == "tar" ]
+			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"
@@ -309,27 +469,53 @@
 	esac
 }
 
-mpatch() {
+mpatch()
+{
 	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() {
+minstalldocs()
+{
 	local docfiles
-	
 	docfiles="$@"
-	
+
 	if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]
 	then
 		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
 	fi
-	
+
 	for i in ${docfiles}
 	do
 		cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
@@ -338,21 +524,24 @@
 	done
 }
 
-mstriplibs() {
+mstriplibs()
+{
 	local stripdir="$@"
 
 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
 	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 }
 
-mstripbins() {
+mstripbins()
+{
 	local stripdir="$@"
 
 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
 	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 }
 
-sminclude() {
+sminclude()
+{
 	local i
 
 	if [[ -n "$@" ]]
@@ -366,50 +555,35 @@
 	fi
 }
 
-setup_distcc_environment(){
+setup_distcc_environment()
+{
 	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
+		# creating distcc tempdir
 		install -o distcc -g daemon -d ${DISTCC_DIR}
 		chmod 1777 ${DISTCC_DIR}
 	fi
 }
 
-setup_ccache_environment(){
+setup_ccache_environment()
+{
 	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
 }
 
 
 # fixes given dependencies to match a MAGE_TARGET
 # fix_mage_deps -target s/depend # <-- note -target !
-fix_mage_deps() {
+fix_mage_deps()
+{
 	local target="$1"
 	local depend="$2"
 	local NDEPEND
@@ -424,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 ]]
@@ -476,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
@@ -504,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.34 2005-08-22 00:07:32 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
@@ -527,6 +704,11 @@
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
+
+	# echo MAGE_TARGETS ## note -target is needed !
+	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
+	echo >> ${dest}
+
 	# add special vars
 	if [ -n "${SPECIAL_VARS}" ]
 	then
@@ -538,6 +720,7 @@
 		done
 		echo  >> ${dest}
 	fi
+
 	# add at least all includes
 	if [ -n "${INHERITS}" ]
 	then
@@ -567,6 +750,7 @@
 		do
 			# add to mage (quotes needed !)
 			typeset -f "${i}" >> ${dest}
+			echo >> ${dest}
 			# unset to be safe (quotes needed !)
 			#unset "${i}" <-- later to get every target built
 		done
@@ -582,9 +766,6 @@
 	echo  >> ${dest}
 	typeset -f postremove >> ${dest}
 	echo  >> ${dest}
-
-	# echo MAGE_TARGETS ## note -target is needed !
-	echo "MAGE_TARGETS=\"${targets}\"" >> ${dest}
 }
 
 regen_mage_tree()
@@ -616,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
@@ -640,6 +821,135 @@
 	unset postremove
 }
 
+export_inherits()
+{
+	local include="$1"
+	shift
+
+	while [ "$1" ]
+	do
+		local functions="$1"
+
+		# sanity checks
+		[ -z "${include}" ] && die "export_inherits(): \$include not given."
+		[ -z "${functions}" ] && die "export_inherits(): \$functions not given."
+
+		eval "${functions}() { ${include}_${functions} ; }"
+
+		# debug
+		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+
+		shift
+	done
+}
+
+generate_package_md5sum()
+{
+	local dest
+	local pcat
+	local pname
+	local pver
+	local pbuild
+	local parch
+	local target
+	local pkgname
+
+	# very basic getops
+	for i in $*
+	do
+		case $1 in
+			--pcat|-c) shift; pcat="$1" ;;
+			--pname|-n) shift; pname="$1" ;;
+			--pver|-v) shift; pver="$1" ;;
+			--pbuild|-b) shift; pbuild="$1" ;;
+			--parch|a) shift; parch="$1" ;;
+			--target|t) shift; target="$1" ;;
+		esac
+		shift
+	done
+
+	# sanity checks; abort if not given
+	[ -z "${pcat}" ] && die "generate_package_md5sum() \$pcat not given."
+	[ -z "${pname}" ] && die "generate_package_md5sum() \$pname not given."
+	[ -z "${pver}" ] && die "generate_package_md5sum() \$pver not given."
+	[ -z "${pbuild}" ] && die "generate_package_md5sum() \$pbuild not given."
+	[ -z "${parch}" ] && die "generate_package_md5sum() \$parch not given."
+
+	# check needed global vars
+	[ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."
+	[ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."
+
+	# fix target as it may be empty !
+	[ -n "${target}" ] && target="-${target}"
+
+	# build pkgname
+	pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
+
+	# build pkg-md5-sum only if requested
+	if [[ ${REGEN_MAGE_TREE} = true ]]
+	then
+		echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
+
+		# abort if not exist
+		if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
+		then
+			echo -e "${COLRED}! exists${COLDEFAULT}"
+			return 0
+		fi
+
+		# if MAGE_TREE_DEST not set use BUILDDIR
+		: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
+
+		# setup md5 dir
+		dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"
+		install -d ${dest}
+
+		# gen md5sum
+		( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
+			> ${dest}/${pkgname}.md5
+		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
@@ -652,7 +962,7 @@
 fi
 
 # updating smage2-scripts
-if [ "$1" == "update" ]
+if [[ $1 = update ]]
 then
 	if [ ! -d ${SOURCEDIR} ]
 	then
@@ -663,7 +973,7 @@
 fi
 
 # creates md5sums for smages to given dir
-if [ "$1" == "calcmd5" ]
+if [[ $1 = calcmd5 ]]
 then
 	if [ $# -ge 3 ]
 	then
@@ -715,7 +1025,7 @@
 			unset my_SRC_URI_MIRROR
 			unset my_SOURCEDIR
 		done
-		
+
 		echo
 		echo "Calculating of md5 sums for '$(basename ${SMAGENAME} .${SMAGESUFFIX})' done."
 		echo
@@ -728,7 +1038,7 @@
 		echo
 		exit 1
 	fi
-	
+
 	exit 0
 fi
 
@@ -758,68 +1068,97 @@
 	source ${SMAGENAME} || die "regen: smage2 not found"
 
 	regen_mage_tree
+
+	# build md5sum for existing packages
+	generate_package_md5sum \
+		--pcat "${PCATEGORIE}" \
+		--pname "${PNAME}" \
+		--pver "${PVER}" \
+		--pbuild "${PBUILD}" \
+		--parch "${ARCH}" \
+		--target "${target}"
+
 	exit 0
 fi
 
-if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
+if [ "$1" == "--create-src-tarball" -a -n "$2" ]
 then
-	die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
-fi
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
 
-if [ -z "`basename ${SMAGENAME}|grep .${SMAGESUFFIX}`" ]
-then
-	die "File '`basename ${SMAGENAME}`' is not a sMage v${SMAGEVERSION} file. Aborting."
-fi
+	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
 
-if [ -z "${SOURCEDIR}" ]
-then
-	die "\$SOURCEDIR not found. Please setup your mage.rc correctly."
-fi
+	source ${SMAGENAME} || die "regen: smage2 not found"
 
-if [ -z "${SMAGESCRIPTSDIR}" ]
-then
-	die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly."
-fi
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PKGNAME}
+	fi
 
-if [ -z "${SMAGE2RSYNC}" ] 
-then
-	echo "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly."
-	exit 1
+	download_sources
+	source_pkg_build ${SMAGENAME}
+	exit 0
 fi
 
-if [ -z "${BINDIR}" ]
+if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
 then
-	die "no BINDIR variable found in /etc/mage.rc"
-fi
+	SRCPKGTARBALL="${2}"
+	USE_SRC_PKG_TARBALL=true
 
-if [ -z "${CHOST}" ]
-then
-	die "no CHOST variable found in /etc/mage.rc"
-fi
+	# abort if given file is not a source pkg
+	[[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
 
-if [ -z "${CFLAGS}" ]
-then
-	die "no CFLAGS variable found in /etc/mage.rc"
-fi
+	# set correct SMAGENAME; use the one that the src_pkg provide
+	# /path/to/SOURCEDIR/PNAME/SMAGENAME
+	SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
 
-if [ -z "${CXXFLAGS}" ]
-then
-	die "no CXXFLAGS variable found in /etc/mage.rc"
+	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 ${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}-${CHOST%%-*}-${PBUILD}"
+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"
@@ -835,33 +1174,15 @@
 
 
 # setup distcc
-# distcc mus be setup *before* ccache, as ccache need to be before distcc in path
-if [ "${SMAGE_USE_DISTCC}" == "true" ]
-then
-	setup_distcc_environment
-fi
+# setup for distcc goes *before* ccache, so ccache comes before distcc in path
+[[ ${SMAGE_USE_DISTCC} = true ]] && setup_distcc_environment
 
 # setup ccache
-if [ "${SMAGE_USE_CCACHE}" == "true" ]
-then
-	setup_ccache_environment
-fi
-
+[[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment
 
 # 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
@@ -894,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
 
@@ -918,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
@@ -931,7 +1259,7 @@
 		echo -e "NOPGKBUILD=true detected; Package will not be build ..."
 		;;
 	*)
-		# build serveral targets
+		# build several targets
 		if [ -n "${MAGE_TARGETS}" ]
 		then
 			for target in ${MAGE_TARGETS}
@@ -944,20 +1272,48 @@
 				fi
 				# now create the target package
 				${MLIBDIR}/pkgbuild_dir.sh \
-					"${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD}" \
+					"${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
 					${BINDIR} || die "target: ${target} package-build failed"
-				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD} successfully builded.\n"
+
+				# build pkg-md5-sum if requested
+				generate_package_md5sum \
+					--pcat "${PCATEGORIE}" \
+					--pname "${PNAME}" \
+					--pver "${PVER}" \
+					--pbuild "${PBUILD}" \
+					--parch "${ARCH}" \
+					--target "${target}"
+
+				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"
-			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+
+			# build pkg-md5-sum if requested
+			generate_package_md5sum \
+				--pcat "${PCATEGORIE}" \
+				--pname "${PNAME}" \
+				--pver "${PVER}" \
+				--pbuild "${PBUILD}" \
+				--parch "${ARCH}"
+
+			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"