--- trunk/mage/usr/lib/mage/smage2.functions.sh	2012/01/13 18:29:52	1640
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2012/01/13 18:31:48	1641
@@ -12,6 +12,22 @@
 
 	source ${file}
 
+	# if PCAT was not set and PCATEGORIE was found
+	# inform the user and use PCATEGORIE as PCAT
+	if [[ -z ${PCAT} ]]
+	then
+		if [[ -n ${PCATEGORIE} ]]
+		then
+			PCAT="${PCATEGORIE}"
+			# print a warning
+			echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"
+			echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"
+			echo
+		else
+			die "Neither PCAT nor PCATEGORIE are defined!"
+		fi
+	fi
+
 	[[ -n ${STATE} ]] && mystate="${STATE}"
 
 	# do not overide if local state was broken or disabled!
@@ -606,7 +622,8 @@
 #   PNAME                 name of pkg
 #   PVER                  version
 #   PBUILD                revision
-#   PCATEGORIE            category of the pkg
+#   PCAT                  category of the pkg
+#   PCATEGORIE            category of the pkg (deprecated, use PCAT!)
 #   STATE                 state of pkg stable|unstable|old
 #   DESCRIPTION           a short description (opt)
 #   HOMEPAGE              homepage (opt)
@@ -649,7 +666,7 @@
 	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
 
 	# destination to magefile
-	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
+	dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}${target}/${magefile}"
 
 	# show what we are doing
 	echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
@@ -809,7 +826,7 @@
 	export SAVED_PNAME="${PNAME}"
 	export SAVED_PVER="${PVER}"
 	export SAVED_PBUILD="${PBUILD}"
-	export SAVED_PCATEGORIE="${PCATEGORIE}"
+	export SAVED_PCAT="${PCAT}"
 	export SAVED_DESCRIPTION="${DESCRIPTION}"
 	export SAVED_HOMEPAGE="${HOMEPAGE}"
 	export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
@@ -884,7 +901,7 @@
 	export PNAME="${SAVED_PNAME}"
 	export PVER="${SAVED_PVER}"
 	export PBUILD="${SAVED_PBUILD}"
-	export PCATEGORIE="${SAVED_PCATEGORIE}"
+	export PCAT="${SAVED_PCAT}"
 	export DESCRIPTION="${SAVED_DESCRIPTION}"
 	export HOMEPAGE="${SAVED_HOMEPAGE}"
 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
@@ -953,7 +970,7 @@
 	unset SAVED_PNAME
 	unset SAVED_PVER
 	unset SAVED_PBUILD
-	unset SAVED_PCATEGORIE
+	unset SAVED_PCAT
 	unset SAVED_DESCRIPTION
 	unset SAVED_HOMEPAGE
 	unset SAVED_SPECIAL_VARS