--- branches/mage-next/src/smage2.in	2014/03/04 15:41:15	2619
+++ branches/mage-next/src/smage2.in	2014/03/10 12:15:30	2631
@@ -24,6 +24,41 @@
 # export default path
 export PATH="${PATH}:${MLIBDIR}"
 
+print_usage()
+{
+	echo "Usage: $(basename $0) [option] pkgname ..."
+	echo "Options:"
+	echo "--smage"
+	echo "--src-tarball"
+	echo "--calc"
+	echo "--update"
+	echo "--download"
+	echo "--regen"
+	echo "--create-src-tarball"
+	echo "--resume"
+	echo
+	echo "Environment variables::"
+	echo " NOCOLORS=true $(basename $0) [src]install PACKAGE"
+	echo " Disables all colors in the messages."
+	echo
+}
+
+# very basic getops
+for i in $*
+do
+	case $1 in
+		--smage|*.${SMAGESUFFIX}) shift; SMAGENAME="$1" ;;
+		--src-tarball) shift; SRCPKGTARBALL="$1" ;;
+		--calc) shift; SMAGENAME="$1" ;;
+		--update) ;;
+		--download) shift; SMAGENAME="$1" ;;
+		--regen) shift; SMAGENAME="$1" ;;
+		--create-src-tarball) shift; SMAGENAME="$1" ;;
+		--resume) ;;
+	esac
+	shift
+done
+
 ## setup ##
 SMAGENAME="$1"
 
@@ -251,7 +286,7 @@
 	SMAGENAME="$2"
 fi
 
-[ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
+[ ! -e ${MLIBDIR}/pkgbuild_dir ] && die "Error: ${MLIBDIR}/pkgbuild_dir not found. Aborting."
 [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
 	die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
 [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
@@ -473,10 +508,10 @@
 				echo -e "!compressdoc detected; documentation of '${subpackage}' will not be compressed ..."
 			elif mqueryfeature "!pkgbuild"
 			then
-					echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
+				echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
 			else
-						run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
-						resume_stamp post-mcompressdoc_${subpackage}
+				run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
+				resume_stamp post-mcompressdoc_${subpackage}
 			fi
 			# restore smage environment
 			split_restore_variables
@@ -721,7 +756,7 @@
 					resume_stamp post-${PNAME}_pkgbuild
 				fi
 				# now create the target package
-				run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
+				run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir \
 					"${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
 					"${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
 				resume_stamp post-pkg_builddir_${PNAME}
@@ -744,7 +779,7 @@
 			split_unset_variables
 
 		else
-			run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+			run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir ${PKGNAME} ${BINDIR} || die "package-build failed"
 			resume_stamp post-pkg_builddir
 
 			# build pkg-md5-sum if requested