mkbuild: adding --update-manifest and other changes (see CHANGELOG)

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

3 files changed, 18 insertions, 3 deletions

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index fbc7b4a..0036fa9 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -275,6 +275,7 @@ if [ -e "$CWD/Manifest" ]; then
 
     MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
     MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
 
     if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
       MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
@@ -286,7 +287,7 @@ if [ -e "$CWD/Manifest" ]; then
       continue
     fi
 
-    echo "Checking Manifest for $MANIFEST_FILE integrity..."
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
 
     SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
     SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
@@ -295,6 +296,8 @@ if [ -e "$CWD/Manifest" ]; then
     if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
       echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
       exit $ERROR_MANIFEST
+    else
+      echo "Size match."
     fi
 
     # Check source code integrity
@@ -309,6 +312,8 @@ if [ -e "$CWD/Manifest" ]; then
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
       fi
     done
 
diff --git a/trunk/mkbuild/kde4.mkSlackBuild b/trunk/mkbuild/kde4.mkSlackBuild
index f432ce9..204d2c6 100644
--- a/trunk/mkbuild/kde4.mkSlackBuild
+++ b/trunk/mkbuild/kde4.mkSlackBuild
@@ -262,6 +262,7 @@ if [ -e "$CWD/Manifest" ]; then
 
     MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
     MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
 
     if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
       MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
@@ -273,7 +274,7 @@ if [ -e "$CWD/Manifest" ]; then
       continue
     fi
 
-    echo "Checking Manifest for $MANIFEST_FILE integrity..."
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
 
     SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
     SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
@@ -282,6 +283,8 @@ if [ -e "$CWD/Manifest" ]; then
     if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
       echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
       exit $ERROR_MANIFEST
+    else
+      echo "Size match."
     fi
 
     # Check source code integrity
@@ -296,6 +299,8 @@ if [ -e "$CWD/Manifest" ]; then
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
       fi
     done
 
diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild
index 1862b25..de16b08 100644
--- a/trunk/mkbuild/perl.mkSlackBuild
+++ b/trunk/mkbuild/perl.mkSlackBuild
@@ -223,6 +223,7 @@ if [ -e "$CWD/Manifest" ]; then
 
     MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
     MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
 
     if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
       MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
@@ -234,7 +235,7 @@ if [ -e "$CWD/Manifest" ]; then
       continue
     fi
 
-    echo "Checking Manifest for $MANIFEST_FILE integrity..."
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
 
     SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
     SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
@@ -243,6 +244,8 @@ if [ -e "$CWD/Manifest" ]; then
     if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
       echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
       exit $ERROR_MANIFEST
+    else
+      echo "Size match."
     fi
 
     # Check source code integrity
@@ -257,6 +260,8 @@ if [ -e "$CWD/Manifest" ]; then
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
       fi
     done