--- trunk/mage/usr/lib/mage/smage2.sh	2009/11/24 01:48:17	953
+++ trunk/mage/usr/lib/mage/smage2.sh	2011/07/25 11:01:48	1435
@@ -50,6 +50,7 @@
 
 source /etc/mage.rc.global
 source ${MAGERC}
+source ${MLIBDIR}/mage4.functions.sh
 
 # set PKGDIR and BUILDDIR and BINDIR to MROOT
 if [[ -n ${MROOT} ]]
@@ -59,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} "
@@ -153,13 +181,16 @@
 	local DB_MD5_SUM_FILE="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
 	local FETCHING
 	local i mirror
+	local wget_opts
 
+	# filter wget command if busybox was found
+	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
 
 	# 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 )
+	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} &> /dev/null )
 	if [[ $? = 0 ]]
 	then
 		# md5's ok, no fetching needed
@@ -198,10 +229,7 @@
 				then
 					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
-						--passive-ftp \
-						--tries 3 \
-						--continue \
-						--progress bar \
+						${wget_opts} \
 						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
 					if [[ $? = 0 ]]
@@ -222,10 +250,7 @@
 				then
 					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
-						--passive-ftp \
-						--tries 3 \
-						--continue \
-						--progress bar \
+						${wget_opts} \
 						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
 					if [[ $? = 0 ]]
@@ -246,10 +271,7 @@
 				then
 					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
-						--passive-ftp \
-						--tries 3 \
-						--continue \
-						--progress bar \
+						${wget_opts} \
 						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
 					if [[ $? = 0 ]]
@@ -270,10 +292,7 @@
 				then
 					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
-						--passive-ftp \
-						--tries 3 \
-						--continue \
-						--progress bar \
+						${wget_opts} \
 						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
 					if [[ $? = 0 ]]
@@ -294,10 +313,7 @@
 				then
 					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
 					wget \
-						--passive-ftp \
-						--tries 3 \
-						--continue \
-						--progress bar \
+						${wget_opts} \
 						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
 						"${my_SRC_URI_MIRROR}"
 					if [[ $? = 0 ]]
@@ -313,10 +329,7 @@
 			then
 				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
 				wget \
-					--passive-ftp \
-					--tries 3 \
-					--continue \
-					--progress bar \
+					${wget_opts} \
 					--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
 					"${my_SRC_URI}"
 			fi
@@ -332,7 +345,7 @@
 	# recheck md5 sums
 	echo
 	echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
-	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
+	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} ) || die "md5 failed"
 	echo
 
 	# not needed anymore
@@ -456,12 +469,27 @@
 				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."
 			;;
@@ -515,11 +543,19 @@
 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
@@ -730,30 +766,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}" ]
@@ -764,7 +792,6 @@
 			# being tricky here :)
 			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
 		done
-		echo  >> ${dest}
 	fi
 
 	# add at least all includes
@@ -776,17 +803,14 @@
 		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}" ]
@@ -796,22 +820,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()
@@ -1188,11 +1206,13 @@
 # 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}"}"
@@ -1244,7 +1264,7 @@
 		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."
@@ -1266,7 +1286,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
@@ -1278,7 +1298,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
 
@@ -1301,7 +1321,7 @@
 	elif [[ -n ${SPLIT_PACKAGES} ]]
 	then
 		split_save_variables
-		for subpackage in ${SPLIT_PACKAGE}
+		for subpackage in ${SPLIT_PACKAGES}
 		do
 			# get the right variables for the split
 			export PNAME="${subpackage}"
@@ -1340,7 +1360,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
@@ -1389,7 +1409,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"
@@ -1519,7 +1539,7 @@
 # compressing doc, info & man files
 if [[ -n ${SPLIT_PACKAGES} ]]
 then
-	for subpackage in ${SPLIT_PACKAGE}
+	for subpackage in ${SPLIT_PACKAGES}
 	do
 		mcompressdocs ${BINDIR}_${subpackage}
 	done
@@ -1536,11 +1556,11 @@
 	*)
 		if [[ -n ${SPLIT_PACKAGES} ]]
 		then
-			for subpackage in ${SPLIT_PACKAGE}
+			for subpackage in ${SPLIT_PACKAGES}
 			do
-				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
 				mstripbins ${BINDIR}_${subpackage}
-				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
 				mstriplibs ${BINDIR}_${subpackage}
 			done
 		else