merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@514 04377dda-e619-0410-9926-eae83683ac58

1 files changed, 33 insertions, 12 deletions

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index d961a53..d356d23 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -19,7 +19,7 @@
 # Based in model generic.SlackBuild of Luiz
 #
 # Version:
-PROG_VERSION=1.2.7
+PROG_VERSION=1.2.8
 PROG_NAME=`basename $0`
 
 #--------------------------------------------------------------------
@@ -263,7 +263,7 @@ function set_parameters {
     shift
   done
 
-  [ ! -e $MKBUILD_NAME -a $ACTION == "build" ] && ACTION='new'
+  [ ! -e "$MKBUILD_NAME" -a "$ACTION" == "build" ] && ACTION='new'
 
 }
 
@@ -367,6 +367,13 @@ function get_status {
 
 }
 
+function get_mkbuild_status {
+
+    # Get status from mkbuild file
+    # $1 section
+    eval "sed '/^#>>/,/<</ ! d; /^#/ d; /: *$1$/! d; s/^ *\(.*\):.*$/\1/' $MKBUILD_NAME"
+}
+
 function activate_sections {
 
   # Enable and desable sections
@@ -377,14 +384,14 @@ function activate_sections {
     set_status $SECTION $STATUS $SLACKBUILD_TEMP
   done
 
-  if [ $SVN_MOD -eq $on -o $URL == "" ]; then
-    LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source"
-    [ $VERBOSE -eq $on ] && echo -e "\nSubversion or empty URL changes:"
-    for i in $LIST_OFF; do
-      set_status $i "off" $SLACKBUILD_TEMP
-    done
-    [ $SVN_MOD -eq $on ] && set_status svn_source "on" $SLACKBUILD_TEMP
-  fi
+  #if [ $SVN_MOD -eq $on -o $URL == "" ]; then
+  #  LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source"
+  #  [ $VERBOSE -eq $on ] && echo -e "\nSubversion or empty URL changes:"
+  #  for i in $LIST_OFF; do
+  #    set_status $i "off" $SLACKBUILD_TEMP
+  #  done
+  #  [ $SVN_MOD -eq $on ] && set_status svn_source "on" $SLACKBUILD_TEMP
+  #fi
 
 }
 
@@ -778,7 +785,21 @@ if [ ! -z $MKBUILD_NAME ]; then
       # URL program
       URL=`validate_parameter "$URL" "DOWNLOAD FOLDER URL" ""` || handle_error $ERROR_MKBUILD_CONSTRUCTION "URL"
       [ $VERBOSE -eq $on ] && echo "[[URL]]=\"$URL\""
-      [ $URL == "" ] || echo $URL | grep '^svn:\/\/' >/dev/null && SVN_MOD=$on
+
+      AUX=`get_mkbuild_status "svn_source"`
+      SVN_MOD=`convert_boolean "$AUX"`
+      # Check sections
+      if [ $SVN_MOD -eq $on -o $URL == "" ]; then
+        LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source"
+        [ $VERBOSE -eq $on ] && echo -e "\nCheck subversion or empty URL"
+        for i in $LIST_OFF; do
+          if [ `get_mkbuild_status "$i"` != "off" ]; then
+            handle_error $ERROR_MKBUILD_SVN
+          else
+            [ $VERBOSE -eq $on ] && echo -e "off: $i is ok."
+          fi
+        done
+      fi
 
       STR_MOUNT="`echo $URL | sed 's/.*\.\([a-z0-9]\+\)$/\1/'`"
       if [ $STR_MOUNT = "gz" -o $STR_MOUNT = "tgz" -o $STR_MOUNT = "bz2" -o $STR_MOUNT = "zip" ]; then
@@ -789,7 +810,7 @@ if [ ! -z $MKBUILD_NAME ]; then
       fi
       [ $VERBOSE -eq $on ] && echo "[[DOWNLOAD FOLDER URL]]=\"$URL_BASE\""
 
-      if [ $SVN_MOD -ne $on ]; then
+      if [ $SVN_MOD -eq $off ]; then
         # Extension
         EXTENSION=`validate_parameter "$EXTENSION" "EXTENSION" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "EXTENSION"
          [ $VERBOSE -eq $on ] && echo "[[EXTENSION]]=\"$EXTENSION\""