/[magellan-source]/branches/mage-next/src/smage2.in

Diff of /branches/mage-next/src/smage2.in

Parent Directory | Revision Log | View Patch Patch

-revision 1081 by niro,
Mon Jun 28 17:47:38 2010 UTC
+revision 1631 by niro,
Fri Jan 13 13:20:22 2012 UTC
 Line 1
  #!/bin/bash
+ # $Id$
  # compiles/installs .smage2 source install scripts
  # needs pkgbuild_dir (mage)
- # SMAGE2
+ # TODO: record dynlib, gz | xz database
- # $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"
- MLIBDIR=/usr/lib/mage
- SMAGEVERSION="$( < ${MLIBDIR}/version)"
- ## 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.global
  source ${MAGERC}
+ source ${MLIBDIR}/mage4.functions.sh
+ ## setup ##
+ SMAGENAME="$1"
+ SMAGEVERSION="$(< ${MLIBDIR}/version)"
  # set PKGDIR and BUILDDIR and BINDIR to MROOT
  if [[ -n ${MROOT} ]]
-Line 59 
 then
+Line 29 
 then
  	export BINDIR=${MROOT}/${BINDIR}
  fi
+ # sources the smage file and uses state from distribution file if exist
+ # may helpful for repository support later on
+ smagesource()
+ {
+ 	local file="$1"
+ 	local mystate
+ 	local mycodename
+ 	source ${file}
+ 	[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	# do not overide if local state was broken or disabled!
+ 	case ${STATE} in
+ 		broken) return ;;
+ 		disabled) return ;;
+ 	esac
+ 	if [ -f ${SMAGESCRIPTSDIR}/distribution ]
+ 	then
+ 		source ${SMAGESCRIPTSDIR}/distribution
+ 		[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	fi
+ 	# now switch state and export it
+ 	STATE="${mystate}"
+ }
  showversion()
  {
  	echo -en "Magellan Source Install v${SMAGEVERSION} "
-Line 142 
 get_db_md5_sum()
+Line 139 
 get_db_md5_sum()
  download_sources()
  {
  	[ -z "${SRC_URI}" ] && echo -e "\nNothing declared to download.\n" && return 0
- 	local EOA=${#SRC_URI[*]}
+ 	local count=${#SRC_URI[*]}
- 	local my_SRC_URI
+ 	local uri
- 	local my_SRC_URI_DEST
+ 	local subdir
- 	local my_SRC_URI_MIRROR
+ 	local outputdir
- 	local my_SOURCEDIR
+ 	local db_md5_file="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
- 	local DB_MD5_SUM_FILE="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
+ 	local fetching
- 	local FETCHING
+ 	local i
- 	local i mirror
- 	# 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 mchecksum --rundir "${SOURCEDIR}/${PNAME}" --file "${db_md5_file}" --method md5
- 	if [[ $? = 0 ]]
  	then
  		# md5's ok, no fetching needed
- 		FETCHING=false
+ 		fetching=false
  	else
- 		FETCHING=true
+ 		fetching=true
  	fi
- 	for ((i=0; i < EOA; i++))
+ 	if [[ ${fetching} = true ]]
- 	do
+ 	then
- 		# url to file
+ 		for ((i=0; i < count; i++))
- 		my_SRC_URI="$(echo ${SRC_URI[${i}]} | cut -d' ' -f1)"
+ 		do
+ 			# url to file
- 		# subdir in sources dir; the my_SRCI_URI file goes to there
+ 			uri="${SRC_URI[${i}]%%' '*}"
- 		my_SRC_URI_DEST="$(echo ${SRC_URI[${i}]} | cut -d' ' -f2)"
- 		# if my_src_uri_dest is not equal my_src_uri; than an other dir is used
- 		if [[ ${my_SRC_URI_DEST} != ${my_SRC_URI} ]]
- 		then
- 			my_SOURCEDIR="${SOURCEDIR}/${PNAME}/${my_SRC_URI_DEST}"
- 		else
- 			my_SOURCEDIR="${SOURCEDIR}/${PNAME}"
- 		fi
- 		# create the SOURCEDIR
- 		install -d ${my_SOURCEDIR}
- 		# if an mirrored file than replace first the mirror uri
- 		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")"
- 				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 -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 '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 ]]
+ 			# subdir in sources dir; the my_SRCI_URI file goes to there
- 				then
+ 			subdir="${SRC_URI[${i}]##*' '}"
- 					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 ]]
+ 			# if $subdir is not equal with $uri then an other dir is used
- 				then
+ 			if [[ ${uri} != ${subdir} ]]
- 					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
- 		else
- 			if [[ ${FETCHING} = true ]]
  			then
- 				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
+ 				outputdir="${SOURCEDIR}/${PNAME}/${subdir}"
- 				wget \
+ 			else
- 					--passive-ftp \
+ 				outputdir="${SOURCEDIR}/${PNAME}"
- 					--tries 3 \
- 					--continue \
- 					--progress bar \
- 					--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
- 					"${my_SRC_URI}"
  			fi
- 		fi
- 		# unset them to be shure
+ 			echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
- 		unset my_SRC_URI
+ 			# always use verbose mode for source downloads
- 		unset my_SRC_URI_DEST
+ 			FVERBOSE=off msetfeature "verbose"
- 		unset my_SRC_URI_MIRROR
+ 			# do not die here, mchecksum catches download errors
- 		unset my_SOURCEDIR
+ 			mdownload --uri "${uri}" --dir "${outputdir}"
- 	done
+ 			# unset them to be sure
+ 			unset uri
+ 			unset subdir
+ 			unset outputdir
+ 		done
- 	# recheck md5 sums
+ 		# recheck md5 sums after download
- 	echo
+ 		echo
- 	echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
+ 		echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
- 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
+ 		mchecksum --rundir "${SOURCEDIR}/${PNAME}" --file "${db_md5_file}" --method md5 || die "md5 failed"
- 	echo
+ 		echo
+ 	else
+ 		echo -e "${COLBLUE}===${COLGREEN} All sources already fetched, nothing to do${COLDEFAULT}"
+ 	fi
  	# not needed anymore
  	unset SRC_URI
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
  src_prepare()
  {
- 	echo "no src_prepare defined"
+ 	echo "no src_prepare defined; doing nothing ..."
- 	sleep 2
  	return 0
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
  src_compile()
  {
- 	echo "no src_compile defined"
+ 	echo "no src_compile defined; doing nothing ..."
- 	sleep 2
+ 	return 0
+ }
+ # dummy function, used if that does not exist in smage file
+ src_check()
+ {
+ 	echo "no src_check defined; doing nothing ..."
  	return 0
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
  src_install()
  {
- 	echo "no src_install defined"
+ 	echo "no src_install defined; doing nothing ..."
- 	sleep 2
  	return 0
  }
-Line 373 
 mlibdir()
+Line 239 
 mlibdir()
  mconfigure()
  {
+ 	local myopts
+ 	if [[ ! -z ${CTARGET} ]]
+ 	then
+ 		myopts+=" --target=${CTARGET}"
+ 	fi
+ 		# if requested disable-static
+ 		if [[ ! -z $(./configure --help | grep -- '--.*able-static') ]]
+ 		then
+ 			if mqueryfeature '!static'
+ 			then
+ 				myopts+=" --disable-static"
+ 			else
+ 				myopts+=" --enable-static"
+ 			fi
+ 		fi
+ 		# always enable shared by default
+ 		if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
+ 		then
+ 			myopts+=" --enable-shared"
+ 		fi
  	if [ -x ./configure ]
  	then
  		./configure \
-Line 385 
 mconfigure()
+Line 273 
 mconfigure()
  			--sysconfdir=/etc \
  			--localstatedir=/var/lib \
  			--libdir=/usr/$(mlibdir) \
+ 			${myopts} \
  			"$@" || die "mconfigure failed"
  	else
  		echo "configure is not an executable ..."
-Line 456 
 munpack()
+Line 345 
 munpack()
  				popd > /dev/null
  			fi
  			;;
+ 		xz)
+ 			IFTAR="$(basename $SRCFILE .xz)"
+ 			IFTAR="${IFTAR##*.}"
+ 			if [[ ${IFTAR} = tar ]]
+ 			then
+ 				tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.xz unpack failed."
+ 			else
+ 				pushd ${DEST} > /dev/null
+ 				xzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".xz unpack failed."
+ 				popd > /dev/null
+ 			fi
+ 			;;
  		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} || die ".tgz unpack failed."
  			;;
+ 		txz|mpkzs|mpkz)
+ 			tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
+ 			;;
  		rar)
  			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
  			;;
- 		zip|xpi)
+ 		zip|xpi|jar)
  			unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
  			;;
  		rpm)
-Line 515 
 mpatch()
+Line 419 
 mpatch()
  mlibtoolize()
  {
  	local opts="$@"
- 	[[ -z ${opts} ]] && opts="--copy --force"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
  	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
  }
+ mautoreconf()
+ {
+ 	local opts="$@"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
+ 	autoreconf ${opts} || die "running: mautoreconf ${opts}"
+ }
  minstalldocs()
  {
  	local docfiles
+ 	local doc
  	docfiles="$@"
  	if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]
-Line 530 
 minstalldocs()
+Line 443 
 minstalldocs()
  		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
  	fi
- 	local i
+ 	for doc in ${docfiles}
- 	for i in ${docfiles}
  	do
- 		if [ -f ${i} ]
+ 		if [ -f ${doc} ]
  		then
- 			cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+ 			if mqueryfeature "compressdoc"
- 			install -m 0644 ${SRCDIR}/${i}.gz \
+ 			then
- 				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+ 				cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
+ 				chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
+ 			else
+ 				install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
+ 			fi
  		fi
  	done
  }
-Line 546 
 mstriplibs()
+Line 462 
 mstriplibs()
  {
  	local stripdir="$@"
- 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
+ 	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"
- 	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ 	[[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"
+ 	find ${stripdir} ! -type d | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null
  }
  mstripbins()
  {
  	local stripdir="$@"
- 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
+ 	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"
- 	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ 	[[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"
+ 	find ${stripdir} ! -type d | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null
+ }
+ mstripstatic()
+ {
+ 	local stripdir="$@"
+ 	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"
+ 	[[ -z ${STRIP_STATIC_LIB} ]] && STRIP_STATIC_LIB="--strip-debug"
+ 	find ${stripdir} ! -type d | xargs file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_STATIC_LIB} 2> /dev/null
+ }
+ mstriplibtoolarchive()
+ {
+ 	local stripdir="$@"
+ 	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"
+ 	find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null
+ }
+ mpurgetargets()
+ {
+ 	local stripdir="$@"
+ 	local target
+ 	[[ -z ${stripdir} ]] && stripdir=${BINDIR}
+ 	# nothing to do in this case
+ 	[[ -z ${PURGE_TARGETS[*]} ]] && return
+ 	for target in ${PURGE_TARGETS[*]}
+ 	do
+ 		# check if target is a regex pattern without any slashes
+ 		if [[ ${target} = ${target//\/} ]]
+ 		then
+ 			find ${BINDIR} -type f -name "${target}" | xargs --no-run-if-empty rm -f -- 2> /dev/null
+ 		else
+ 			rm -f -- ${target} 2> /dev/null
+ 		fi
+ 	done
  }
  mcompressdocs()
-Line 614 
 setup_ccache_environment()
+Line 570 
 setup_ccache_environment()
  	fi
  }
  # fixes given dependencies to match a MAGE_TARGET
  # fix_mage_deps -target s/depend # <-- note -target !
  fix_mage_deps()
-Line 730 
 build_mage_script()
+Line 685 
 build_mage_script()
  	# now build the mage file
  	> ${dest}
- 	# header
- 	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
  	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
- 	echo >> ${dest}
  	# description and homepage
  	echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
  	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
- 	echo >> ${dest}
  	# special tags and vars
  	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
  	# echo MAGE_TARGETS ## note -target is needed !
  	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
- 	echo >> ${dest}
  	# split package base
  	echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
- 	echo >> ${dest}
  	# add special vars
  	if [ -n "${SPECIAL_VARS}" ]
-Line 764 
 build_mage_script()
+Line 711 
 build_mage_script()
  			# being tricky here :)
  			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
  		done
- 		echo  >> ${dest}
  	fi
  	# add at least all includes
-Line 776 
 build_mage_script()
+Line 722 
 build_mage_script()
  		do
  			echo -n " ${i}"  >> ${dest}
  		done
- 		echo  >> ${dest}
+ 		# a CRLF is needed here!
+ 		echo >> ${dest}
  	fi
- 	echo >> ${dest}
  	# deps and provides
  	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
- 	echo >> ${dest}
  	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
- 	echo >> ${dest}
  	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
- 	echo >> ${dest}
  	# add special functions
  	if [ -n "${SPECIAL_FUNCTIONS}" ]
-Line 796 
 build_mage_script()
+Line 739 
 build_mage_script()
  		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
- 		echo  >> ${dest}
  	fi
  	# pre|post-install|removes
  	typeset -f preinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f preremove >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postremove >> ${dest}
- 	echo  >> ${dest}
  }
  regen_mage_tree()
  {
- 	local i
+ 	local subpackage
  	# build them only if requested
- 	if [[ ${REGEN_MAGE_TREE} = true ]]
+ 	if mqueryfeature regentree
  	then
  		# run it without targets
  		if [[ -n ${MAGE_TARGETS} ]]
-Line 827 
 regen_mage_tree()
+Line 764 
 regen_mage_tree()
  			# build for each target a mage file
  			# run it with several targets
  			echo
- 			for i in ${MAGE_TARGETS}
+ 			for subpackage in ${MAGE_TARGETS}
  			do
- 				build_mage_script --target "${i}"
+ 				build_mage_script --target "${subpackage}"
  			done
  			echo
-Line 842 
 regen_mage_tree()
+Line 779 
 regen_mage_tree()
  			# build for each subpackage a mage file
  			# run it with several targets
  			echo
- 			for i in ${SPLIT_PACKAGES}
+ 			for subpackage in ${SPLIT_PACKAGES}
  			do
  				# get the right variables for the split
- 				export PNAME="${i}"
+ 				export PNAME="${subpackage}"
- 				split_info_${i}
+ 				split_info_${subpackage}
+ 				# get the preinstall etc
+ 				split_export_inherits ${subpackage}
  				build_mage_script --split-pkg-base "${split_pkg_base}"
+ 				# delete split preinstall etc
+ 				split_delete_inherits ${subpackage}
  				# restore smage environment
  				split_restore_variables
  			done
-Line 878 
 regen_mage_tree()
+Line 819 
 regen_mage_tree()
  	unset STATE
  	unset DESCRIPTION
  	unset HOMEPAGE
- 	unset PKGTYPE
+ 	# unset PKGTYPE <-- don't do that either; smage needs this var
  	unset INHERITS
  	unset DEPEND
  	unset SDEPEND
-Line 904 
 split_save_variables()
+Line 845 
 split_save_variables()
  	export SAVED_DEPEND="${DEPEND}"
  	export SAVED_SDEPEND="${SDEPEND}"
  	export SAVED_PROVIDE="${PROVIDE}"
- 	export SAVED_NOPKGBUILD="${NOPKGBUILD}"
+ 	export SAVED_PKGTYPE="${PKGTYPE}"
+ 	# special handling needed for mage features
+ 	# pkgbuild
+ 	mqueryfeature "pkgbuild" && export SAVED_FEATURE_PKGBUILD="pkgbuild"
+ 	mqueryfeature "!pkgbuild" && export SAVED_FEATURE_PKGBUILD="!pkgbuild"
+ 	# strip
+ 	mqueryfeature "strip" && export SAVED_FEATURE_STRIP="strip"
+ 	mqueryfeature "!strip" && export SAVED_FEATURE_STRIP="!strip"
+ 	# libtool
+ 	mqueryfeature "libtool" && export SAVED_FEATURE_LIBTOOL="libtool"
+ 	mqueryfeature "!libtool" && export SAVED_FEATURE_LIBTOOL="!libtool"
+ 	# compressdoc
+ 	mqueryfeature "compressdoc" && export SAVED_FEATURE_COMPRESSDOC="compressdoc"
+ 	mqueryfeature "!compressdoc" && export SAVED_FEATURE_COMPRESSDOC="!compressdoc"
  	# bindir too
  	export SAVED_BINDIR="${BINDIR}"
-Line 965 
 split_restore_variables()
+Line 920 
 split_restore_variables()
  	export DEPEND="${SAVED_DEPEND}"
  	export SDEPEND="${SAVED_SDEPEND}"
  	export PROVIDE="${SAVED_PROVIDE}"
- 	export NOPKGBUILD="${SAVED_NOPKGBUILD}"
+ 	export PKGTYPE="${SAVED_PKGTYPE}"
+ 	# special handling needed for mage features
+ 	# pkgbuild
+ 	FVERBOSE=off msetfeature "${SAVED_FEATURE_PKGBUILD}"
+ 	# strip
+ 	FVERBOSE=off msetfeature "${SAVED_FEATURE_STRIP}"
+ 	# libtool
+ 	FVERBOSE=off msetfeature "${SAVED_FEATURE_LIBTOOL}"
+ 	# compressdoc
+ 	FVERBOSE=off msetfeature "${SAVED_FEATURE_COMPRESSDOC}"
  	# bindir too
  	export BINDIR="${SAVED_BINDIR}"
-Line 1025 
 split_unset_variables()
+Line 990 
 split_unset_variables()
  	unset SAVED_SDEPEND
  	unset SAVED_PROVIDE
  	unset SAVED_BINDIR
- 	unset SAVED_NOPKGBUILD
+ 	unset SAVED_PKGTYPE
+ 	unset SAVED_FEATURE_PKGBUILD
+ 	unset SAVED_FEATURE_STRIP
+ 	unset SAVED_FEATURE_LIBTOOL
+ 	unset SAVED_FEATURE_COMPRESSDOC
  	unset SPLIT_PACKAGE_BASE
  	unset -f SAVED_preinstall
  	unset -f SAVED_postinstall
-Line 1033 
 split_unset_variables()
+Line 1002 
 split_unset_variables()
  	unset -f SAVED_postremove
  }
+ split_export_inherits()
+ {
+ 	local subpackage="$1"
+ 	local func
+ 	local newfunc
+ 	for func in preinstall postinstall preremove postremove
+ 	do
+ 		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+ 		then
+ 			newfunc=$(typeset -f ${func}_${subpackage})
+ 			newfunc="${newfunc/_${subpackage} (/ (}"
+ 			eval "${newfunc}"
+ 		fi
+ 	done
+ }
+ split_delete_inherits()
+ {
+ 	 local subpackage="$1"
+ 	 local func
+ 	for func in preinstall postinstall preremove postremove
+ 	do
+ 		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+ 		then
+ 			unset -f ${func}
+ 		fi
+ 	done
+  }
  export_inherits()
  {
  	local include="$1"
 Line 1094 
 generate_package_md5sum()
  	# 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 ]]
+ 	if mqueryfeature regentree
  	then
  		echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
-Line 1154 
 source_pkg_build()
+Line 1153 
 source_pkg_build()
  step_by_step()
  {
- 	if [[ ${STEP_BY_STEP} = true ]]
+ 	if mqueryfeature stepbystep
  	then
  		echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
  		echo "Press [enter] to continue"
-Line 1162 
 step_by_step()
+Line 1161 
 step_by_step()
  	fi
  }
+ resume_stamp()
+ {
+ 	local step="$1"
+ 	[[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
+ 	touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
+ }
+ run_resume()
+ {
+ 	local step="$1"
+ 	if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
+ 	then
+ 		echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
+ 		return 0
+ 	else
+ 		return 1
+ 	fi
+ }
  # print out our version
  showversion
-Line 1174 
 then
+Line 1192 
 then
  	exit 1
  fi
+ # load supported mage features
+ load_mage_features
  # updating smage2-scripts
  if [[ $1 = update ]]
  then
-Line 1188 
 fi
+Line 1209 
 fi
  # creates md5sums for smages to given dir
  if [[ $1 = calcmd5 ]]
  then
- 	if [ $# -ge 3 ]
+ 	if [ $# -ge 2 ]
  	then
  		SMAGENAME="$2"
  		MD5DIR="$3"
- 		source ${SMAGENAME} || die "download source failed"
+ 		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
+ 		smagesource ${SMAGENAME} || die "download source failed"
  		# overridable sourcedir; must be declared after source of the smage2
  		CALC_SOURCEDIR="${CALC_SOURCEDIR:="${SOURCEDIR}/${PNAME}"}"
-Line 1244 
 then
+Line 1267 
 then
  		echo
  	else
  		echo "Usage: Calculating MD5 Sums:"
- 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME /path/to/MD5DIR"
+ 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME [/path/to/MD5DIR]"
  		echo
  		echo
  		echo "Export the CALC_SOURCEDIR variable to override current SOURCEDIRs."
-Line 1266 
 then
+Line 1289 
 then
  	# get smage
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	source ${SMAGENAME} || die "download source failed"
+ 	smagesource ${SMAGENAME} || die "download source failed"
  	download_sources
  	exit 0
-Line 1278 
 then
+Line 1301 
 then
  	# set correct SMAGENAME
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	source ${SMAGENAME} || die "regen: smage2 not found"
+ 	smagesource ${SMAGENAME} || die "regen: smage2 not found"
  	regen_mage_tree
-Line 1340 
 then
+Line 1363 
 then
  	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
- 	source ${SMAGENAME} || die "regen: smage2 not found"
+ 	smagesource ${SMAGENAME} || die "regen: smage2 not found"
  	if [[ -d ${SOURCEDIR}/${PNAME} ]]
  	then
-Line 1356 
 fi
+Line 1379 
 fi
  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
  then
  	SRCPKGTARBALL="${2}"
- 	USE_SRC_PKG_TARBALL=true
+ 	msetfeature "srcpkgtarball"
  	# abort if given file is not a source pkg
  	[[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
-Line 1377 
 then
+Line 1400 
 then
  	[[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
  fi
+ if [ "$1" == "--resume" -a -n "$2" ]
+ then
+ 	msetfeature "resume"
+ 	SMAGENAME="$2"
+ fi
  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
-Line 1389 
 fi
+Line 1417 
 fi
  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
- source ${SMAGENAME} || die "source failed"
+ smagesource ${SMAGENAME} || die "source failed"
  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
  MD5DIR="$(dirname ${SMAGENAME})/md5"
  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
-Line 1400 
 echo -e "${COLGREEN}Compiling ${PKGNAME}
+Line 1428 
 echo -e "${COLGREEN}Compiling ${PKGNAME}
  # auto regen mage tree if requested
  regen_mage_tree
- if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]
+ if mqueryfeature "srcpkg"
  then
  	if [[ -d ${SOURCEDIR}/${PNAME} ]]
  	then
-Line 1410 
 then
+Line 1438 
 then
  fi
  # download sources
- [[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources
+ mqueryfeature "srcpkgtarball" || download_sources
  # fixes some issues with these functions
  export -f src_prepare || die "src_prepare export failed"
  export -f src_compile || die "src_compile export failed"
+ export -f src_check || die "src_check export failed"
  export -f src_install || die "src_install export failed"
  # fixes some compile issues
  export CHOST="${CHOST}" || die "CHOST export failed"
  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
- export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
+ if [[ -z ${CXXFLAGS} ]]
+ then
+ 	export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
+ else
+ 	export CXXFLAGS="${CXXFLAGS}" || die "CXXFLAGS export failed"
+ fi
+ export LDFLAGS="${LDFLAGS}" || die "LDFLAGS export failed"
  export BINDIR="${BINDIR}" || die "BINDIR export failed"
  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
  # setup distcc
  # setup for distcc goes *before* ccache, so ccache comes before distcc in path
- [[ ${SMAGE_USE_DISTCC} = true ]] && setup_distcc_environment
+ mqueryfeature "distcc" && setup_distcc_environment
  # setup ccache
- [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment
+ mqueryfeature "ccache" && setup_ccache_environment
- # small sleep to show our settings
+ if mqueryfeature "resume"
- sleep 1
- # cleans up build if a previously one exists
- if [ -d ${BUILDDIR} ]
  then
- 	rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
+ 	echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
- fi
- install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
- # cleans up srcdir if a previously unpacked one exists
+ 	# setup build logging
- if [ -d ${SRCDIR} ]
+ 	[[ ! -d /var/log/smage ]] && install -d /var/log/smage
- then
+ 	if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]
- 	rm -rf ${SRCDIR}
+ 	then
- fi
+ 		bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2
+ 	fi
+ 	echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log
- # cleans up bindir if a previous build exists or creates a new one
+ else
- if [ -d ${BINDIR} ]
+ 	# clean up builddir if a previously one exist
- then
+ 	if [ -d ${BUILDDIR} ]
- 	rm -rf ${BINDIR}
+ 	then
- fi
+ 		rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
- install -d ${BINDIR} || die "couldn't create \$BINDIR."
+ 	fi
+ 	install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
- # cleans up package temp dir if a previous build exists
+ 	# clean up srcdir if a previously unpacked one exist
- if [ -d ${BUILDDIR}/${PKGNAME} ]
+ 	if [ -d ${SRCDIR} ]
- then
+ 	then
- 	rm -rf ${BUILDDIR}/${PKGNAME}
+ 		rm -rf ${SRCDIR}
+ 	fi
+ 	# clean up bindir if a previous build exist or create a new one
+ 	if [ -d ${BINDIR} ]
+ 	then
+ 		rm -rf ${BINDIR}
+ 	fi
+ 	install -d ${BINDIR} || die "couldn't create \$BINDIR."
+ 	# clean up package temp dir if a previous build exist
+ 	if [ -d ${BUILDDIR}/${PKGNAME} ]
+ 	then
+ 		rm -rf ${BUILDDIR}/${PKGNAME}
+ 	fi
+ 	# clean up stamps dir
+ 	if [ -d ${BUILDDIR}/.stamps ]
+ 	then
+ 		rm -rf ${BUILDDIR}/.stamps
+ 	fi
+ 	# setup build logging
+ 	[[ ! -d /var/log/smage ]] && install -d /var/log/smage
+ 	echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
  fi
- # cleans up timestamp if one exists
+ if [[ ${PKGTYPE} = virtual ]]
- if [ -f /var/tmp/timestamp ]
  then
- 	mage rmstamp
+ 	echo "virtual package detected; nothing will be build ..."
- fi
+ 	# automatically set !pkgbuild here too
+ 	msetfeature "!pkgbuild"
+ else
+ 	( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
+ 	die_pipestatus 0 "src_prepare failed"
+ 	resume_stamp src_prepare
+ 	step_by_step src_prepare
+ 	( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}
+ 	die_pipestatus 0 "src_compile failed"
+ 	resume_stamp src_compile
+ 	step_by_step src_compile
- # setup build loggins
+ 	# only run checks if requested
- [[ ! -d /var/log/smage ]] && install -d /var/log/smage
+ 	if mqueryfeature "!check"
- echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
+ 	then
+ 		echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
- src_prepare | ${SMAGE_LOG_CMD}
+ 	else
- die_pipestatus 0 "src_prepare failed"
+ 		( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}
- step_by_step $_
+ 		die_pipestatus 0 "src_check failed"
+ 		resume_stamp src_check
- src_compile | ${SMAGE_LOG_CMD}
+ 	fi
- die_pipestatus 0 "src_compile failed"
+ 	step_by_step src_check
- step_by_step $_
- # build several subpackages
+ 	# build several subpackages
- if [[ -n ${SPLIT_PACKAGES} ]]
+ 	if [[ -n ${SPLIT_PACKAGES} ]]
- then
+ 	then
- 	# save bindir & pname
+ 		# save bindir & pname
- 	split_save_variables
+ 		split_save_variables
- 	export SAVED_BINDIR="${BINDIR}"
+ 		export SAVED_BINDIR="${BINDIR}"
- 	for subpackage in ${SPLIT_PACKAGES}
+ 		for subpackage in ${SPLIT_PACKAGES}
- 	do
+ 		do
- 		if typeset -f src_install_${subpackage} > /dev/null
+ 			if typeset -f src_install_${subpackage} > /dev/null
- 		then
+ 			then
- 			# export subpackage bindir
+ 				# export subpackage bindir
- 			export BINDIR="${SAVED_BINDIR}_${subpackage}"
+ 				export BINDIR="${SAVED_BINDIR}_${subpackage}"
- 			# export PNAME, several internal function and include
+ 				# export PNAME, several internal function and include
- 			# rely on this variable
+ 				# rely on this variable
- 			export PNAME="${subpackage}"
+ 				export PNAME="${subpackage}"
- 			echo
+ 				echo
- 			echo -en "${COLBLUE}*** ${COLDEFAULT}"
+ 				echo -en "${COLBLUE}*** ${COLDEFAULT}"
- 			echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
+ 				echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
- 			echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
+ 				echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
- 			echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
+ 				echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
- 			src_install_${subpackage} | ${SMAGE_LOG_CMD}
+ 				( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
- 			die_pipestatus 0 "src_install_${subpackage} failed"
+ 				die_pipestatus 0 "src_install_${subpackage} failed"
- 			step_by_step $_
+ 				resume_stamp src_install_${subpackage}
- 		fi
+ 				step_by_step src_install_${subpackage}
- 	done
+ 			fi
- 	# restore bindir & pname
+ 		done
- 	split_restore_variables
+ 		# restore bindir & pname
- 	# unset all saved smage variables
+ 		split_restore_variables
- 	split_unset_variables
+ 		# unset all saved smage variables
- else
+ 		split_unset_variables
- 	src_install | ${SMAGE_LOG_CMD}
+ 	else
- 	die_pipestatus 0 "src_install failed"
+ 		( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}
- 	step_by_step $_
+ 		die_pipestatus 0 "src_install failed"
+ 		resume_stamp src_install
+ 		step_by_step src_install
+ 	fi
  fi
- # compressing doc, info & man files
+ # echo for sake of good-looking
- if [[ -n ${SPLIT_PACKAGES} ]]
+ echo
+ if mqueryfeature "!compressdoc"
  then
- 	for subpackage in ${SPLIT_PACKAGES}
+ 	echo -e "!compressdoc detected; documentation will not be compressed ..."
- 	do
+ elif mqueryfeature "!pkgbuild"
- 		mcompressdocs ${BINDIR}_${subpackage}
+ then
- 	done
+ 		echo "!pkgbuild detected; skipping documentation compression..."
  else
- 	mcompressdocs ${BINDIR}
+ 	# compressing doc, info & man files
+ 	if [[ -n ${SPLIT_PACKAGES} ]]
+ 	then
+ 		for subpackage in ${SPLIT_PACKAGES}
+ 		do
+ 			run_resume mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
+ 			resume_stamp mcompressdoc_${subpackage}
+ 		done
+ 	else
+ 		run_resume mcompressdoc || mcompressdocs ${BINDIR}
+ 		resume_stamp mcompressdoc
+ 	fi
  fi
+ if mqueryfeature "!libtool"
+ then
+ 	if mqueryfeature "!pkgbuild"
+ 	then
+ 		echo "!pkgbuild detected; skipping libtool archive stripping ..."
+ 	else
+ 		if [[ -n ${SPLIT_PACKAGES} ]]
+ 		then
+ 			for subpackage in ${SPLIT_PACKAGES}
+ 			do
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
+ 				run_resume mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
+ 				resume_stamp mstriplibtoolarchive_${subpackage}
+ 			done
+ 		else
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
+ 			run_resume mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
+ 			resume_stamp mstriplibtoolarchive
+ 		fi
+ 	fi
+ fi
- # stripping all bins and libs
+ if mqueryfeature "purge"
- case ${NOSTRIP} in
+ then
- 	true|TRUE|yes|y)
+ 	if mqueryfeature "!pkgbuild"
- 		echo -e "NOSTRIP=true detected; Package will not be stripped ..."
+ 	then
- 		;;
+ 		echo "!pkgbuild detected; skipping file purgation..."
- 	*)
+ 	else
  		if [[ -n ${SPLIT_PACKAGES} ]]
  		then
  			for subpackage in ${SPLIT_PACKAGES}
  			do
- 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
+ 				echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
- 				mstripbins ${BINDIR}_${subpackage}
+ 				run_resume mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
- 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
+ 				resume_stamp mpurgetargets_${subpackage}
- 				mstriplibs ${BINDIR}_${subpackage}
  			done
  		else
- 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+ 			echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
- 				mstripbins ${BINDIR}
+ 			run_resume mpurgetargets || mpurgetargets ${BINDIR}
- 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+ 			resume_stamp mpurgetargets
- 				mstriplibs ${BINDIR}
  		fi
- 		;;
+ 	fi
- esac
+ fi
- # the new buildpkg command
+ # stripping all bins and libs
- case ${NOPKGBUILD} in
+ if mqueryfeature "!strip"
- 	true|TRUE|yes|y)
+ then
- 		echo -e "NOPGKBUILD=true detected; Package will not be build ..."
+ 	echo -e "!strip detected; Package will not be stripped ..."
- 		;;
+ elif mqueryfeature "!pkgbuild"
- 	*)
+ then
+ 	echo "!pkgbuild detected; skipping stripping of the package ..."
+ else
+ 	if [[ -n ${SPLIT_PACKAGES} ]]
+ 	then
+ 		for subpackage in ${SPLIT_PACKAGES}
+ 		do
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
+ 			run_resume mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
+ 			resume_stamp mstripbins_${subpackage}
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
+ 			run_resume mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
+ 			resume_stamp mstriplibs_${subpackage}
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
+ 			run_resume mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
+ 			resume_stamp mstripstatic_${subpackage}
+ 		done
+ 	else
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+ 			run_resume mstripbins || mstripbins ${BINDIR}
+ 			resume_stamp mstripbins
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
+ 			run_resume mstriplibs || mstriplibs ${BINDIR}
+ 			resume_stamp mstriplibs
+ 			echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
+ 			run_resume mstripstatic || mstripstatic ${BINDIR}
+ 			resume_stamp mstripstatic
+ 	fi
+ fi
+ if mqueryfeature "!pkgbuild"
+ then
+ 		echo -e "!pkgbuild detected; Package will not be build ..."
+ else
  		# build several targets
  		if [[ -n ${MAGE_TARGETS} ]]
  		then
  			for target in ${MAGE_TARGETS}
  			do
- 				# check if an special target_pkgbuild exists
+ 				# check if a special target_pkgbuild exists
  				if typeset -f ${target}_pkgbuild > /dev/null
  				then
  					# run it
- 					${target}_pkgbuild
+ 					run_resume ${target}_pkgbuild || ${target}_pkgbuild
+ 					resume_stamp ${target}_pkgbuild
  				fi
  				# now create the target package
- 				${MLIBDIR}/pkgbuild_dir.sh \
+ 				run_resume pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
  					"${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
  					${BINDIR} || die "target: ${target} package-build failed"
+ 				resume_stamp pkg_builddir_${target}
  				# build pkg-md5-sum if requested
- 				generate_package_md5sum \
+ 				run_resume md5sum_${target} || generate_package_md5sum \
  					--pcat "${PCATEGORIE}" \
  					--pname "${PNAME}" \
  					--pver "${PVER}" \
  					--pbuild "${PBUILD}" \
  					--parch "${ARCH}" \
  					--target "${target}"
+ 				resume_stamp md5sum_${target}
  				echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
  			done
-Line 1596 
 case ${NOPKGBUILD} in
+Line 1731 
 case ${NOPKGBUILD} in
  				export PNAME="${subpackage}"
  				split_info_${PNAME}
- 				# jump to next one if NOPKGBUILD is set in split_info
+ 				# jump to next one if !pkgbuild is set in split_info
- 				case ${NOPKGBUILD} in
+ 				mqueryfeature "!pkgbuild" && continue
- 					true|TRUE|yes|y) continue ;;
- 				esac
  				# check if an special subpackage_pkgbuild exists
  				if typeset -f ${PNAME}_pkgbuild > /dev/null
  				then
  					# run it
- 					${PNAME}_pkgbuild
+ 					run_resume ${PNAME}_pkgbuild || ${PNAME}_pkgbuild
+ 					resume_stamp ${PNAME}_pkgbuild
  				fi
  				# now create the target package
- 				${MLIBDIR}/pkgbuild_dir.sh \
+ 				run_resume pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
  					"${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
  					"${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
+ 				resume_stamp pkg_builddir_${PNAME}
  				# build pkg-md5-sum if requested
- 				generate_package_md5sum \
+ 				run_resume md5sum_${PNAME} || generate_package_md5sum \
  					--pcat "${PCATEGORIE}" \
  					--pname "${PNAME}" \
  					--pver "${PVER}" \
  					--pbuild "${PBUILD}" \
  					--parch "${ARCH}"
+ 				resume_stamp md5sum_${PNAME}
  				echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
-Line 1629 
 case ${NOPKGBUILD} in
+Line 1765 
 case ${NOPKGBUILD} in
  			split_unset_variables
  		else
- 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+ 			run_resume pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+ 			resume_stamp pkg_builddir
  			# build pkg-md5-sum if requested
- 			generate_package_md5sum \
+ 			run_resume md5sum || generate_package_md5sum \
  				--pcat "${PCATEGORIE}" \
  				--pname "${PNAME}" \
  				--pver "${PVER}" \
  				--pbuild "${PBUILD}" \
  				--parch "${ARCH}"
+ 			resume_stamp md5sum
  			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}
+ 		if mqueryfeature "srcpkg"
- 		;;
+ 		then
- esac
+ 			run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}
+ 			resume_stamp srcpkgbuild
+ 		fi
+ fi
- if [[ ${SMAGE_BUILD_LOGGING} != false ]]
+ if mqueryfeature "buildlog"
  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

 Legend:



Removed from v.1081
 


changed lines


 
Added in v.1631
 Legend:



Removed from v.1081
 


changed lines


 
Added in v.1631
-Removed from v.1081
+Added in v.1631