--- trunk/mage/usr/lib/mage/smage2.sh	2006/03/22 17:45:49	351
+++ trunk/mage/usr/lib/mage/smage2.sh	2006/12/29 23:37:56	406
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -12,6 +12,7 @@
 
 ## setup ##
 PKGSUFFIX="mpk"
+SRCPKGSUFFIX="mpks"
 SMAGENAME="$1"
 SMAGESUFFIX="smage2"
 MLIBDIR=/usr/lib/mage
@@ -91,28 +92,13 @@
 	local i
 	for i in ${SMAGE2RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${SMAGESCRIPTSDIR}
-
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${SMAGESCRIPTSDIR}
 		if [[ $? = 0 ]]
 		then
 			break
 		else
 			continue
 		fi
-
 	done
 
 	# clean up backup files (foo~)
@@ -362,6 +348,7 @@
 	PATCHOPTS=$1
 	PATCHFILE=$2
 
+	echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"
 	patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}
 }
 
@@ -546,7 +533,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -768,6 +755,31 @@
 	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 mage.rc correctly."
+
+	echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
+	( 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}"
+}
+
+
 # print out our version
 showversion
 echo
@@ -899,6 +911,45 @@
 	exit 0
 fi
 
+if [ "$1" == "only-src-pkg" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
+
+	echo -e "${COLGREEN}only-src-pkg called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
+
+	source ${SMAGENAME} || die "regen: smage2 not found"
+
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PKGNAME}
+	fi
+
+	download_sources
+	source_pkg_build ${SMAGENAME}
+	exit 0
+fi
+
+if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"
+	USE_SRC_PKG_TARBALL=true
+
+	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}"
+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."
@@ -920,8 +971,17 @@
 # auto regen mage tree if requested
 regen_mage_tree
 
+if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]
+then
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PKGNAME}
+	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"
@@ -1055,6 +1115,9 @@
 
 			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
 		fi
+
+		# build src-pkg-tarball if requested
+		[[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME}
 		;;
 esac