--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/20 15:55:19	196
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/08/21 21:36:54	200
@@ -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.31 2005-08-21 21:36:54 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}${target}"
 			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.31 2005-08-21 21:36:54 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -523,29 +527,29 @@
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
-	if [ -n "${INHERITS}" ]
+	# add special vars
+	if [ -n "${SPECIAL_VARS}" ]
 	then
-		echo -n "minclude"  >> ${dest}
 		local i
-		for i in ${INHERITS}
+		for i in ${SPECIAL_VARS}
 		do
-			echo -n " ${i}"  >> ${dest}
+			# being tricky here :)
+			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
 		done
 		echo  >> ${dest}
 	fi
-	echo >> ${dest}
-
-	# add special vars
-	if [ -n "${SPECIAL_VARS}" ]
+	# add at least all includes
+	if [ -n "${INHERITS}" ]
 	then
+		echo -n "minclude"  >> ${dest}
 		local i
-		for i in ${SPECIAL_VARS}
+		for i in ${INHERITS}
 		do
-			# being tricky here :)
-			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
+			echo -n " ${i}"  >> ${dest}
 		done
 		echo  >> ${dest}
 	fi
+	echo >> ${dest}
 
 	# deps and provides
 	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}