--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/20 15:55:19	196
+++ 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.27 2005-08-20 15:55:19 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
@@ -408,7 +408,7 @@
 
 
 # fixes given dependencies to match a MAGE_TARGET
-# fix_mage_deps target s/depend
+# fix_mage_deps -target s/depend # <-- note -target !
 fix_mage_deps() {
 	local target="$1"
 	local depend="$2"
@@ -425,23 +425,27 @@
 		while read sym dep
 		do
 			cat="$(dirname ${dep})"
-			# abort on virtual
-			[[ ${cat} = virtual ]] && continue
-
-			# fix pver to target-pver
-			# to get pname-target-pver
+			# change if not 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}/})
+				# doing it backwards !
+				pver="${dep##*-}"
+				# 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
@@ -508,7 +512,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 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
@@ -523,16 +527,9 @@
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
-	if [ -n "${INHERITS}" ]
-	then
-		echo -n "minclude"  >> ${dest}
-		local i
-		for i in ${INHERITS}
-		do
-			echo -n " ${i}"  >> ${dest}
-		done
-		echo  >> ${dest}
-	fi
+
+	# echo MAGE_TARGETS ## note -target is needed !
+	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
 	echo >> ${dest}
 
 	# add special vars
@@ -547,6 +544,19 @@
 		echo  >> ${dest}
 	fi
 
+	# add at least all includes
+	if [ -n "${INHERITS}" ]
+	then
+		echo -n "minclude"  >> ${dest}
+		local i
+		for i in ${INHERITS}
+		do
+			echo -n " ${i}"  >> ${dest}
+		done
+		echo  >> ${dest}
+	fi
+	echo >> ${dest}
+
 	# deps and provides
 	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
 	echo >> ${dest}
@@ -563,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
@@ -633,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
@@ -742,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."