--- trunk/mage/usr/lib/mage/smage2.sh	2011/04/27 09:45:07	1273
+++ trunk/mage/usr/lib/mage/smage2.sh	2011/06/04 09:45:04	1349
@@ -60,6 +60,33 @@
 	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} "
@@ -506,6 +533,14 @@
 	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
 }
 
+mautoreconf()
+{
+	local opts="$@"
+	[[ -z ${opts} ]] && opts="--verbose --install --force"
+
+	autoreconf ${opts} || die "running: mautoreconf ${opts}"
+}
+
 minstalldocs()
 {
 	local docfiles
@@ -716,30 +751,22 @@
 	# 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}" ]
@@ -750,7 +777,6 @@
 			# being tricky here :)
 			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
 		done
-		echo  >> ${dest}
 	fi
 
 	# add at least all includes
@@ -762,17 +788,12 @@
 		do
 			echo -n " ${i}"  >> ${dest}
 		done
-		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}" ]
@@ -782,22 +803,16 @@
 		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()
@@ -1180,7 +1195,7 @@
 		MD5DIR="$3"
 		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
 
-		source ${SMAGENAME} || die "download source failed"
+		smagesource ${SMAGENAME} || die "download source failed"
 
 		# overridable sourcedir; must be declared after source of the smage2
 		CALC_SOURCEDIR="${CALC_SOURCEDIR:="${SOURCEDIR}/${PNAME}"}"
@@ -1254,7 +1269,7 @@
 	# get smage
 	SMAGENAME="$2"
 	MD5DIR="$(dirname ${SMAGENAME})/md5"
-	source ${SMAGENAME} || die "download source failed"
+	smagesource ${SMAGENAME} || die "download source failed"
 
 	download_sources
 	exit 0
@@ -1266,7 +1281,7 @@
 	# 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
 
@@ -1328,7 +1343,7 @@
 
 	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
@@ -1377,7 +1392,7 @@
 [ -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"