--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/21 21:23:48	199
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/10/02 14:23:11	253
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -426,23 +426,26 @@
 		do
 			cat="$(dirname ${dep})"
 			# change if not virtual
-			if [[ ${cat} != virtual ]]
+			if [[ ${cat} = virtual ]]
 			then
+				pname="$(basename ${dep})"
+			else
 				# fix pver to target-pver
 				# to get pname-target-pver
 
 				# doing it backwards !
 				pver="${dep##*-}"
-				pname=$(basename ${dep/-${pver}/})
+				# full pver
+				pname="$(basename ${dep/-${pver}/})${target}-${pver}"
 			fi
 
 			# do not add empty lines
 			if [ -z "${NDEPEND}" ]
 			then
-				NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"
+				NDEPEND="${sym} ${cat}/${pname}"
 			else
 				NDEPEND="${NDEPEND}
-	${sym} ${cat}/${pname}${target}-${pver}"
+	${sym} ${cat}/${pname}"
 			fi
 
 			unset cat pname pver
@@ -509,7 +512,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -524,6 +527,11 @@
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
+
+	# echo MAGE_TARGETS ## note -target is needed !
+	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
+	echo >> ${dest}
+
 	# add special vars
 	if [ -n "${SPECIAL_VARS}" ]
 	then
@@ -535,6 +543,7 @@
 		done
 		echo  >> ${dest}
 	fi
+
 	# add at least all includes
 	if [ -n "${INHERITS}" ]
 	then
@@ -564,6 +573,7 @@
 		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
@@ -634,6 +644,28 @@
 	unset postremove
 }
 
+export_inherits()
+{
+	local include="$1"
+	shift
+
+	while [ "$1" ]
+	do
+		local functions="$1"
+
+		# sanity checks
+		[ -z "${include}" ] && die "export_inherits(): \$include not given."
+		[ -z "${functions}" ] && die "export_inherits(): \$functions not given."
+
+		eval "${functions}() { ${include}_${functions} ; }"
+
+		# debug
+		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+
+		shift
+	done
+}
+
 # print out our version
 showversion
 echo
@@ -743,6 +775,18 @@
 	exit 0
 fi
 
+# regen-mage-tree
+if [ "$1" == "only-regen-tree" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
+	source ${SMAGENAME} || die "regen: smage2 not found"
+
+	regen_mage_tree
+	exit 0
+fi
+
 if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
 then
 	die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."