--- trunk/mage/usr/lib/mage/smage2.sh	2009/11/21 01:44:27	947
+++ trunk/mage/usr/lib/mage/smage2.sh	2011/05/27 12:54:34	1291
@@ -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} ]]
@@ -153,13 +154,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 +202,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 +223,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 +244,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 +265,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 +286,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 +302,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 +318,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
@@ -520,6 +506,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
@@ -530,11 +524,15 @@
 		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
 	fi
 
+	local i
 	for i in ${docfiles}
 	do
-		cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
-		install -m 0644 ${SRCDIR}/${i}.gz \
-			${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+		if [ -f ${i} ]
+		then
+			cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+			install -m 0644 ${SRCDIR}/${i}.gz \
+				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+		fi
 	done
 }
 
@@ -844,10 +842,12 @@
 				export PNAME="${i}"
 				split_info_${i}
 				build_mage_script --split-pkg-base "${split_pkg_base}"
+				# restore smage environment
+				split_restore_variables
 			done
 			echo
-			# restore smage environment
-			split_restore_variables
+			# unset all saved smage variables
+			split_unset_variables
 
 		else
 			echo
@@ -1000,7 +1000,10 @@
 		eval "${saved_postremove/SAVED_/}"
 		export -f postremove
 	fi
+}
 
+split_unset_variables()
+{
 	# unset saved vars; not needed anymore
 	unset SAVED_PNAME
 	unset SAVED_PVER
@@ -1179,10 +1182,12 @@
 # creates md5sums for smages to given dir
 if [[ $1 = calcmd5 ]]
 then
-	if [ $# -ge 3 ]
+	if [ $# -ge 2 ]
 	then
 		SMAGENAME="$2"
 		MD5DIR="$3"
+		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
+
 		source ${SMAGENAME} || die "download source failed"
 
 		# overridable sourcedir; must be declared after source of the smage2
@@ -1235,7 +1240,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."
@@ -1292,7 +1297,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}"
@@ -1304,8 +1309,11 @@
 				--pver "${PVER}" \
 				--pbuild "${PBUILD}" \
 				--parch "${ARCH}"
+			# restore smage environment
+			split_restore_variables
 		done
-		split_restore_variables
+		# unset all saved smage variables
+		split_unset_variables
 
 	else
 		# build md5sum for existing packages
@@ -1496,6 +1504,8 @@
 	done
 	# restore bindir & pname
 	split_restore_variables
+	# unset all saved smage variables
+	split_unset_variables
 else
 	src_install | ${SMAGE_LOG_CMD}
 	die_pipestatus 0 "src_install failed"
@@ -1505,7 +1515,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
@@ -1522,11 +1532,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
@@ -1607,8 +1617,12 @@
 					--parch "${ARCH}"
 
 				echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
+
+				# restore smage environment
+				split_restore_variables
 			done
-			split_restore_variables
+			# unset all saved smage variables
+			split_unset_variables
 
 		else
 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"