--- trunk/mage/usr/lib/mage/convert_databases_meta.sh	2007/05/02 14:54:21	491
+++ trunk/mage/usr/lib/mage/convert_databases_meta.sh	2012/01/13 18:37:52	1642
@@ -1,17 +1,16 @@
 #!/bin/bash
 
-source /etc/mage.rc.global
-source /etc/mage.rc
+: ${MAGERC="/etc/mage.rc"}
 
+source /etc/mage.rc.global
+source ${MAGERC}
+source ${MLIBDIR}/mage4.functions.sh
+source ${MLIBDIR}/smage2.functions.sh
 
 #### fixups ####
-#MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage
-MLIBDIR=/home/rogalla/cvsroot/magellan-src/mage/usr/lib/mage
-INSTALLDB=/var/db/mage
 METADIR=/var/cache/mage/meta
 #################
 
-source ${MLIBDIR}/mage4.functions.sh
 source ${MLIBDIR}/sql_functions.sh
 
 die()
@@ -319,7 +318,7 @@
 		# substitute r from pbuild
 		pbuild="${pbuild/r/}"
 
-		source ${magefile}
+		smagesource ${magefile}
 
 		pcatid=$(sql "select id from categories where pcat='${pcat}'")
 		sql "insert into packages(