--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/20 15:51:14	195
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/08/20 15:55:19	196
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.26 2005-08-20 15:51:14 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -508,7 +508,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.26 2005-08-20 15:51:14 niro Exp $' >> ${dest}
+	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  >> ${dest}
 
 	# pgkname and state
@@ -521,7 +521,7 @@
 	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
 	echo >> ${dest}
 
-	# special tags
+	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
 	if [ -n "${INHERITS}" ]
 	then
@@ -535,9 +535,23 @@
 	fi
 	echo >> ${dest}
 
+	# add special vars
+	if [ -n "${SPECIAL_VARS}" ]
+	then
+		local i
+		for i in ${SPECIAL_VARS}
+		do
+			# being tricky here :)
+			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
+		done
+		echo  >> ${dest}
+	fi
+
 	# deps and provides
 	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
+	echo >> ${dest}
 	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
+	echo >> ${dest}
 	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
 	echo >> ${dest}
 
@@ -552,17 +566,7 @@
 			# unset to be safe (quotes needed !)
 			#unset "${i}" <-- later to get every target built
 		done
-	fi
-
-	# add special vars
-	if [ -n "${SPECIAL_VARS}" ]
-	then
-		local i
-		for i in ${SPECIAL_VARS}
-		do
-			# being tricky here :)
-			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
-		done
+		echo  >> ${dest}
 	fi
 
 	# pre|post-install|removes