--- branches/mage-next/src/smage2.in	2014/08/12 21:56:54	2743
+++ branches/mage-next/src/smage2.in	2014/08/13 07:10:41	2745
@@ -318,7 +318,7 @@
 mqueryfeature "srcpkgtarball" || download_sources
 
 # fixes some issues with these functions
-export -f src_setup || die "src_setup export failed"
+export -f pkg_setup || die "pkg_setup export failed"
 export -f src_prepare || die "src_prepare export failed"
 export -f src_compile || die "src_compile export failed"
 export -f src_check || die "src_check export failed"
@@ -404,10 +404,10 @@
 	# automatically set !pkgbuild here too
 	msetfeature "!pkgbuild"
 else
-	( run_resume src_setup || src_setup ) | ${SMAGE_LOG_CMD}
-	die_pipestatus 0 "src_setup failed"
-	resume_stamp src_setup
-	step_by_step src_setup
+	( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}
+	die_pipestatus 0 "pkg_setup failed"
+	resume_stamp pkg_setup
+	step_by_step pkg_setup
 
 	( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
 	die_pipestatus 0 "src_prepare failed"