--- trunk/mage/usr/lib/mage/mage4.functions.sh	2007/06/07 13:16:04	498
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2007/06/30 15:31:46	499
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.31 2007-04-10 09:21:55 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.32 2007-06-30 15:31:46 niro Exp $
 
 mage_setup()
 {
@@ -2340,7 +2340,7 @@
 	echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 	echo -ne "${COLBOLD}${can_pcat}/${can_pname}:${COLDEFAULT}"
 	echo -e "${COLRED} ${can_ver_list} ${COLDEFAULT}"
-	echo
+	echo        [04] app-emulation/virtualbox-1.4.0-r3
 	if [ ${MAGE_UNINSTALL_TIMEOUT} -gt 0 ]
 	then
 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
@@ -2406,19 +2406,19 @@
 	for i in $*
 	do
 		case $1 in
-			--pcat|-c) shift; pcat="$1" ;;
+			--pcat|-c) shift; pcat="$1" ;;        [04] app-emulation/virtualbox-1.4.0-r3
 			--pname|-n) shift; pname="$1" ;;
 			--pver|-v) shift; pver="$1" ;;
-			--pbuild|-b) shift; pbuild="$1" ;;
+			--pbuild|-b) shift; pbuild="$1" ;;        [04] app-emulation/virtualbox-1.4.0-r3
 		esac
 		shift
-	done
+	done        [04] app-emulation/virtualbox-1.4.0-r3
 
 	# sanity checks; abort if not given
-	[ -z "${pcat}" ] && die "mage_uninstall() \$pcat not given."
+	[ -z "${pcat}" ] && die "mage_uninstall() \$pcat not given."        [04] app-emulation/virtualbox-1.4.0-r3
 	[ -z "${pname}" ] && die "mage_uninstall() \$pname not given."
 	[ -z "${pver}" ] && die "mage_uninstall() \$pver not given."
-	[ -z "${pbuild}" ] && die "mage_uninstall() \$pbuild not given."
+	[ -z "${pbuild}" ] && die "mage_uninstall() \$pbuild not given."        [04] app-emulation/virtualbox-1.4.0-r3
 
 	# check needed global vars
 	[ -z "${MAGEDIR}" ] && die "mage_uninstall() \$MAGEDIR not set."
@@ -2431,7 +2431,7 @@
 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
 	echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
 
-	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
+	magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
 	source ${magefile}
 
 	## preremove scripts