1 files changed, 20 insertions, 2 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index cddfa5d..e11d2da 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -19,7 +19,7 @@
 # Based in model generic.SlackBuild of Luiz
 #
 # Version:
-PROG_VERSION=1.1.11
+PROG_VERSION=1.1.12
 PROG_NAME=`basename $0`
 
 #--------------------------------------------------------------------
@@ -317,6 +317,7 @@ function clear_files {
     # Remove temporary files
     rm $AUX_TMP 2>/dev/null
     rm $SLACKBUILD_TEMP 2>/dev/null
+    rm $DIFF_FILE 2>/dev/null
     chmod 755 *.SlackBuild 2>/dev/null
 }
 
@@ -483,6 +484,18 @@ function get_slackbuild_path {
     echo $AUX_PATH | tr [A-Z] [a-z]
 }
 
+function apply_mkpatch {
+
+    # Apply mkpatch if exist
+    sed -n '/#p>/,/#p</ { /^#/ b; p }' $MKBUILD_NAME > $DIFF_FILE
+    if [ -s $DIFF_FILE ]; then
+        mkpatch $DIFF_FILE $SLACKBUILD_TEMP > $AUX_TMP || handle_error $?
+        [ ! -s $AUX_TMP ] && handle_error 1
+        cp $AUX_TMP $SLACKBUILD_TEMP
+        [ $VERBOSE -eq $on ] && ( echo -e "\nApply mkpath ..."; cat $DIFF_FILE )
+    fi
+}
+
 # ----------------------------------------------------------------
 # ------------------- svn functions ------------------------------
 function commit_slackbuild {
@@ -642,7 +655,7 @@ LANG=en_US
 if [ -f "$COMMON_SH" ]; then
   source $COMMON_SH
 else
-  handle_error $ERROR_COMMON_NOT_FOUND
+  echo $error "$BASENAME: file $COMMON_SH not found. Check your $BASENAME installation"
 fi
 
 # Start constants
@@ -662,6 +675,7 @@ color_select $COLOR_MODE
 
 # Auxiliar file
 AUX_TMP=/tmp/mkbuild_tmp.$RANDOM
+DIFF_FILE=/tmp/mkbuild.diff.$RANDOM
 # Derectory to SlackBuild models
 MODEL_DIR=${MODEL_DIR:="/etc/simplepkg/defaults/mkbuild"}
 # SlackDesk line length
@@ -821,6 +835,10 @@ case $ACTION in
         SLACKBUILD_TEMP=$SLACKBUILD.tmp
         cp $MODEL_DIR/$MODEL $SLACKBUILD_TEMP
 
+        # Apply mkpatch
+        [ $VERBOSE -eq $on ] && echo -e "\nMkpatch section ..."
+        apply_mkpatch
+
         # On/Off sections
         [ $VERBOSE -eq $on ] && echo -e "\nEnable/desable sections ..."
         activate_sections